X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Rakka%2FEnvironment.hs;h=9a6df3a396fd3276156178227adcfcc22bab926f;hb=88747f2463963ff2895a597b3054b12b2288530e;hp=d40294ae44c27f224908291509c3f735478c40e6;hpb=656fdb2772ab4de5cd083cbe9e7c1610cccef73b;p=Rakka.git

diff --git a/Rakka/Environment.hs b/Rakka/Environment.hs
index d40294a..9a6df3a 100644
--- a/Rakka/Environment.hs
+++ b/Rakka/Environment.hs
@@ -8,8 +8,9 @@ module Rakka.Environment
 import           Control.Arrow
 import           Control.Arrow.ArrowList
 import qualified Data.Map as M
-import           Network
+import           Network.Socket
 import qualified Network.HTTP.Lucu.Config as LC
+import           Rakka.Authorization
 import           Rakka.Page
 import           Rakka.Storage
 import           Rakka.SystemConfig
@@ -18,17 +19,15 @@ import           Rakka.Wiki.Interpreter
 import qualified Rakka.Wiki.Interpreter.Base      as Base
 import qualified Rakka.Wiki.Interpreter.Image     as Image
 import qualified Rakka.Wiki.Interpreter.PageList  as PageList
-import qualified Rakka.Wiki.Interpreter.Trackback as Trackback
 import qualified Rakka.Wiki.Interpreter.Outline   as Outline
 import           Subversion.Repository
 import           System.Directory
 import           System.FilePath
-import           System.IO
 import           System.Log.Logger
 import           Text.HyperEstraier
-import           Text.XML.HXT.Arrow.XmlIOStateArrow
 
 
+logger :: String
 logger = "Rakka.Environment"
 
 
@@ -39,13 +38,14 @@ data Environment = Environment {
     , envSysConf       :: !SystemConfig
     , envStorage       :: !Storage
     , envInterpTable   :: !InterpTable
+    , envAuthDB        :: !AuthDB
     }
 
 
-setupEnv :: FilePath -> PortNumber -> IO Environment
+setupEnv :: FilePath -> ServiceName -> IO Environment
 setupEnv lsdir portNum
     = do let lucuConf    = LC.defaultConfig {
-                             LC.cnfServerPort = PortNumber portNum
+                             LC.cnfServerPort = portNum
                            }
              reposPath   = lsdir </> "repos"
              interpTable = mkInterpTable
@@ -59,14 +59,16 @@ setupEnv lsdir portNum
                                createRepository reposPath [] []
          sysConf     <- mkSystemConfig lucuConf repos
          storage     <- mkStorage lsdir repos (makeDraft' interpTable)
+         authDB      <- mkAuthDB lsdir
 
-         return $ Environment {
+         return Environment {
                       envLocalStateDir = lsdir
                     , envLucuConf      = lucuConf
                     , envRepository    = repos
                     , envSysConf       = sysConf
                     , envStorage       = storage
                     , envInterpTable   = interpTable
+                    , envAuthDB        = authDB
                     }
     where
       makeDraft' :: InterpTable -> Page -> IO Document
@@ -87,7 +89,7 @@ mkInterpTable = listToTable $
                 foldl (++) [] [ Base.interpreters
                               , Image.interpreters
                               , PageList.interpreters
-                              , Trackback.interpreters
+                              --, Trackback.interpreters
                               , Outline.interpreters
                               ]
     where