Eliminated <input type

[Rakka.git] / Rakka / Environment.hs

diff --git a/Rakka/Environment.hs b/Rakka/Environment.hs
index 480fcf2acc5212359fc486b8d0afa68e8a4b9205..1af20d1cc58b68206d9f9523ad0a9be23369f546 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,7 +19,7 @@ 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 qualified Rakka.Wiki.Interpreter.Outline   as Outline
 import           Subversion.Repository
 import           System.Directory


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

+    , envAuthDB        :: !AuthDB

     }
 
 
     }
 
 


@@ -60,6 +62,7 @@ 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 {
                       envLocalStateDir = lsdir
 
          return $ Environment {
                       envLocalStateDir = lsdir


@@ -68,6 +71,7 @@ setupEnv lsdir portNum
                     , envSysConf       = sysConf
                     , envStorage       = storage
                     , envInterpTable   = interpTable
                     , envSysConf       = sysConf
                     , envStorage       = storage
                     , envInterpTable   = interpTable

+                    , envAuthDB        = authDB

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


@@ -88,7 +92,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