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

diff --git a/Rakka/Environment.hs b/Rakka/Environment.hs
index 1af20d1..9a6df3a 100644
--- a/Rakka/Environment.hs
+++ b/Rakka/Environment.hs
@@ -8,7 +8,7 @@ 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
@@ -19,15 +19,12 @@ 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
@@ -45,10 +42,10 @@ data Environment = Environment {
     }
 
 
-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
@@ -64,7 +61,7 @@ setupEnv lsdir portNum
          storage     <- mkStorage lsdir repos (makeDraft' interpTable)
          authDB      <- mkAuthDB lsdir
 
-         return $ Environment {
+         return Environment {
                       envLocalStateDir = lsdir
                     , envLucuConf      = lucuConf
                     , envRepository    = repos