merge branch origin/master

[Rakka.git] / Main.hs

diff --git a/Main.hs b/Main.hs
index 8ea4e9930e16feb5fca472c4df1696fd1245c6b7..3df4d8b23a910a86ce895238dac27e26c0e9cf4d 100644 (file)
--- a/Main.hs
+++ b/Main.hs
@@ -1,10 +1,14 @@
-{-# LANGUAGE CPP #-}
+{-# LANGUAGE
+    CPP
+  , UnicodeSyntax
+  #-}
 import           Control.Exception
 import           Control.Monad
 import           Data.List
 import           Data.Maybe
-import           Network.Socket
+import Network.Socket
 import           Network.HTTP.Lucu
+import OpenSSL
 import           Rakka.Environment
 import           Rakka.Resource.CheckAuth
 import           Rakka.Resource.DumpRepos
@@ -49,7 +53,7 @@ data CmdOpt
     deriving (Eq, Show)
 
 
-defaultPort :: ServiceName
+defaultPort ∷ ServiceName
 defaultPort = "8080"
 
 defaultLocalStateDir :: FilePath
@@ -141,7 +145,7 @@ main = withOpenSSL $
           withSystemLock (lsdir </> "lock") $
             withPidFile (lsdir </> "pid") $
               do setupLogger opts
-                 env <- setupEnv lsdir portNum
+                 env ← setupEnv lsdir portNum
 
                  rebuildIndexIfRequested env opts
 
@@ -161,21 +165,18 @@ resTree env
                 , (["search.html" ], resSearch       env)
                 , (["search.xml"  ], resSearch       env)
                 , (["systemConfig"], resSystemConfig env)
-                -- , (["trackback"   ], resTrackBack    env)
                , (["users"       ], resUsers        env)
                 ]
 
-
-getPortNum :: [CmdOpt] -> IO ServiceName
+getPortNum ∷ [CmdOpt] → IO ServiceName
 getPortNum opts
-    = do let xs = mapMaybe (\ x -> case x of
-                                     OptPortNum n -> Just n
-                                     _            -> Nothing) opts
+    = do let xs = mapMaybe (\x → case x of
+                                   OptPortNum n → Just n
+                                   _            → Nothing) opts
          case xs of
-           []     -> return defaultPort
-           (x:[]) -> return x
-           _      -> error "too many --port options."
-
+           []     → return defaultPort
+           (x:[]) → return x
+           _      → error "too many --port options."
 
 getUserID :: [CmdOpt] -> IO UserID
 getUserID opts