Resurrection from slight bitrot.

[Rakka.git] / Rakka / Environment.hs

diff --git a/Rakka/Environment.hs b/Rakka/Environment.hs
index d40294ae44c27f224908291509c3f735478c40e6..ea82209885001648f23c2853750c9451ba7364fe 100644 (file)
--- a/Rakka/Environment.hs
+++ b/Rakka/Environment.hs
@@ -10,6 +10,7 @@ import           Control.Arrow.ArrowList
 import qualified Data.Map as M
 import           Network
 import qualified Network.HTTP.Lucu.Config as LC
 import qualified Data.Map as M
 import           Network
 import qualified Network.HTTP.Lucu.Config as LC

+import           Rakka.Authorization

 import           Rakka.Page
 import           Rakka.Storage
 import           Rakka.SystemConfig
 import           Rakka.Page
 import           Rakka.Storage
 import           Rakka.SystemConfig


@@ -18,17 +19,17 @@ 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.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.Trackback as Trackback

 import qualified Rakka.Wiki.Interpreter.Outline   as Outline
 import           Subversion.Repository
 import           System.Directory
 import           System.FilePath
 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
 
 
 import           System.Log.Logger
 import           Text.HyperEstraier
 import           Text.XML.HXT.Arrow.XmlIOStateArrow
 
 

+logger :: String

 logger = "Rakka.Environment"
 
 
 logger = "Rakka.Environment"
 
 


@@ -39,6 +40,7 @@ data Environment = Environment {
     , envSysConf       :: !SystemConfig
     , envStorage       :: !Storage
     , envInterpTable   :: !InterpTable
     , envSysConf       :: !SystemConfig
     , envStorage       :: !Storage
     , envInterpTable   :: !InterpTable

+    , envAuthDB        :: !AuthDB

     }
 
 
     }
 
 


@@ -59,14 +61,16 @@ setupEnv lsdir portNum
                                createRepository reposPath [] []
          sysConf     <- mkSystemConfig lucuConf repos
          storage     <- mkStorage lsdir repos (makeDraft' interpTable)
                                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
                       envLocalStateDir = lsdir
                     , envLucuConf      = lucuConf
                     , envRepository    = repos
                     , envSysConf       = sysConf
                     , envStorage       = storage
                     , envInterpTable   = interpTable

+                    , envAuthDB        = authDB

                     }
     where
       makeDraft' :: InterpTable -> Page -> IO Document
                     }
     where
       makeDraft' :: InterpTable -> Page -> IO Document


@@ -87,7 +91,7 @@ mkInterpTable = listToTable $
                 foldl (++) [] [ Base.interpreters
                               , Image.interpreters
                               , PageList.interpreters
                 foldl (++) [] [ Base.interpreters
                               , Image.interpreters
                               , PageList.interpreters

-                              , Trackback.interpreters
+                              --, Trackback.interpreters

                               , Outline.interpreters
                               ]
     where
                               , Outline.interpreters
                               ]
     where