wrote much code...

[Rakka.git] / Rakka / Environment.hs

diff --git a/Rakka/Environment.hs b/Rakka/Environment.hs
index e793d0001f401b7e07a1c0b4fd9c38bc10787a4b..015d37d43fda667574f42886fd7b9c2b8a3a4180 100644 (file)
--- a/Rakka/Environment.hs
+++ b/Rakka/Environment.hs
@@ -7,12 +7,14 @@ module Rakka.Environment
 import           Network
 import qualified Network.HTTP.Lucu.Config as LC
 import           Rakka.Storage
+import           Rakka.SystemConfig
 
 
 data Environment = Environment {
-      envLocalStateDir :: FilePath
-    , envLucuConf      :: LC.Config
-    , envStorage       :: Storage
+      envLocalStateDir :: !FilePath
+    , envLucuConf      :: !LC.Config
+    , envStorage       :: !Storage
+    , envSysConf       :: !SystemConfig
     }
 
 
@@ -21,9 +23,9 @@ setupEnv lsdir portNum
     = do let lucuConf = LC.defaultConfig {
                           LC.cnfServerPort = PortNumber portNum
                         }
-         storage <- mkStorage -- FIXME
          return $ Environment {
                       envLocalStateDir = lsdir
                     , envLucuConf      = lucuConf
-                    , envStorage       = storage
-                    }
\ No newline at end of file
+                    , envStorage       = mkStorage
+                    , envSysConf       = mkSystemConfig lucuConf
+                    }