From f99a64e37202fdd3d7e10bdd96595d66980f7396 Mon Sep 17 00:00:00 2001
From: patrick brisbin <pbrisbin@gmail.com>
Date: Sat, 10 Sep 2011 20:43:33 -0400
Subject: [PATCH] Import more from Settings

---
 yesod/scaffold/main.hs.cg | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/yesod/scaffold/main.hs.cg b/yesod/scaffold/main.hs.cg
index fba61277..274829d8 100644
--- a/yesod/scaffold/main.hs.cg
+++ b/yesod/scaffold/main.hs.cg
@@ -1,6 +1,5 @@
 {-# LANGUAGE CPP, DeriveDataTypeable #-}
-import qualified Settings as Settings
-import Settings (AppConfig(..))
+import Settings (AppEnvironment(..), AppConfig(..), loadConfig)
 import Application (with~sitearg~)
 import Network.Wai.Handler.Warp (run)
 import System.Console.CmdArgs hiding (args)
@@ -18,7 +17,7 @@ main = do
     logger <- makeLogger
     args <- cmdArgs argConfig
     env <- getAppEnv args
-    config <- Settings.loadConfig env
+    config <- loadConfig env
     let c = if (port args) /= 0 then config {appPort = (port args) } else config
 #if PRODUCTION
     with~sitearg~ c logger $ run (appPort c)
@@ -41,10 +40,10 @@ argConfig = ArgConfig{ environment = def
 }
 
 environments :: [String]
-environments = map ((map toLower) . show) ([minBound..maxBound] :: [Settings.AppEnvironment])
+environments = map ((map toLower) . show) ([minBound..maxBound] :: [AppEnvironment])
 
 -- | retrieve the -e environment option
-getAppEnv :: ArgConfig ->  IO Settings.AppEnvironment
+getAppEnv :: ArgConfig ->  IO AppEnvironment
 getAppEnv cfg = do
     let e = if (environment cfg) /= "" then (environment cfg)
             else