diff --git a/Build.hs b/Build.hs
--- a/Build.hs
+++ b/Build.hs
@@ -75,8 +75,8 @@
contents <- getDirectoryContents path
fmap concat $ mapM go contents
where
- go ('.':_) = return []
- go "dist" = return []
+ go ('.':_) = return []
+ go ('d':"ist") = return []
go x = do
let y = path ++ '/' : x
d <- doesDirectoryExist y
@@ -141,7 +141,7 @@
getFolderContents fp = do
cs <- getDirectoryContents fp
let notHidden ('.':_) = False
- notHidden "tmp" = False
+ notHidden ('t':"mp") = False
notHidden _ = True
fmap concat $ forM (filter notHidden cs) $ \c -> do
let f = fp ++ '/' : c
diff --git a/scaffold/Foundation.hs.cg b/scaffold/Foundation.hs.cg
--- a/scaffold/Foundation.hs.cg
+++ b/scaffold/Foundation.hs.cg
@@ -84,8 +84,8 @@
mmsg <- getMessage
pc <- widgetToPageContent $ do
widget
- addCassius $(Settings.cassiusFile "default-layout")
- hamletToRepHtml $(Settings.hamletFile "default-layout")
+ addCassius $(cassiusFile "default-layout")
+ hamletToRepHtml $(hamletFile "default-layout")
-- This is done to provide an optimization for serving static files from
-- a separate domain. Please see the staticRoot setting in Settings.hs
diff --git a/scaffold/Settings.hs.cg b/scaffold/Settings.hs.cg
--- a/scaffold/Settings.hs.cg
+++ b/scaffold/Settings.hs.cg
@@ -85,15 +85,22 @@
loadConfig env = do
allSettings <- (join $ YAML.decodeFile ("config/settings.yml" :: String)) >>= fromMapping
settings <- lookupMapping (show env) allSettings
- portS <- lookupScalar "port" settings
hostS <- lookupScalar "host" settings
+ port <- fmap read $ lookupScalar "port" settings
connectionPoolSizeS <- lookupScalar "connectionPoolSize" settings
return $ AppConfig {
appEnv = env
- , appPort = read portS
- , appRoot = pack (hostS ++ ":" ++ portS)
+ , appPort = port
+ , appRoot = pack $ hostS ++ addPort port
, connectionPoolSize = read connectionPoolSizeS
}
+ where
+ addPort :: Int -> String
+#ifdef PRODUCTION
+ addPort _ = ""
+#else
+ addPort p = ":" ++ (show p)
+#endif
-- Static setting below. Changing these requires a recompile
diff --git a/scaffold/hamlet/boilerplate-layout.hamlet.cg b/scaffold/hamlet/boilerplate-layout.hamlet.cg
--- a/scaffold/hamlet/boilerplate-layout.hamlet.cg
+++ b/scaffold/hamlet/boilerplate-layout.hamlet.cg
@@ -1,10 +1,10 @@
-\M
-\^M
-\^M
-\^M
-\^M
+\
+\
+\
+\
+\
\
-^M
+
@@ -20,7 +20,7 @@
^M
+