X-Git-Url: https://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Rakka%2FEnvironment.hs;h=367b67365b896d03a2053bcf4ec20ce6f7ce9ca4;hb=5b25efa958eac431edbcd97194ac51bb05a7c69b;hp=d40294ae44c27f224908291509c3f735478c40e6;hpb=656fdb2772ab4de5cd083cbe9e7c1610cccef73b;p=Rakka.git diff --git a/Rakka/Environment.hs b/Rakka/Environment.hs index d40294a..367b673 100644 --- 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 Rakka.Authorization import Rakka.Page import Rakka.Storage import Rakka.SystemConfig @@ -29,6 +30,7 @@ import Text.HyperEstraier import Text.XML.HXT.Arrow.XmlIOStateArrow +logger :: String logger = "Rakka.Environment" @@ -39,6 +41,7 @@ data Environment = Environment { , envSysConf :: !SystemConfig , envStorage :: !Storage , envInterpTable :: !InterpTable + , envAuthDB :: !AuthDB } @@ -59,6 +62,7 @@ setupEnv lsdir portNum createRepository reposPath [] [] sysConf <- mkSystemConfig lucuConf repos storage <- mkStorage lsdir repos (makeDraft' interpTable) + authDB <- mkAuthDB lsdir return $ Environment { envLocalStateDir = lsdir @@ -67,6 +71,7 @@ setupEnv lsdir portNum , envSysConf = sysConf , envStorage = storage , envInterpTable = interpTable + , envAuthDB = authDB } where makeDraft' :: InterpTable -> Page -> IO Document