X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Main.hs;h=02a4cf4702996013cfdcc6dc07c6646b1d707bb0;hb=abf2f6b430739710532b7bdfb6f20566f35f35b5;hp=8027c7ec0978a4caf2aec2cae6ed90cd2c2e3f59;hpb=859d4378c2e2a1ccc8028821a37eeaa43aaa23fb;p=Rakka.git

diff --git a/Main.hs b/Main.hs
index 8027c7e..02a4cf4 100644
--- a/Main.hs
+++ b/Main.hs
@@ -4,11 +4,17 @@ import           Data.List
 import           Data.Maybe
 import           Network
 import           Network.HTTP.Lucu
+import           OpenSSL
 import           Rakka.Environment
+import           Rakka.Resource.CheckAuth
 import           Rakka.Resource.Index
 import           Rakka.Resource.JavaScript
+import           Rakka.Resource.PageEntity
 import           Rakka.Resource.Object
 import           Rakka.Resource.Render
+import           Rakka.Resource.Search
+import           Rakka.Resource.SystemConfig
+import           Rakka.Resource.TrackBack
 import           Rakka.Storage
 import           Subversion
 import           System.Console.GetOpt
@@ -22,6 +28,8 @@ import           System.Posix.Files
 import           System.Posix.Types
 import           System.Posix.User
 
+
+logger :: String
 logger = "Main"
 
 
@@ -38,7 +46,7 @@ data CmdOpt
 
 
 defaultPort :: PortNumber
-defaultPort = fromIntegral 8080
+defaultPort = toEnum 8080
 
 defaultLocalStateDir :: FilePath
 defaultLocalStateDir = LOCALSTATEDIR -- replaced by CPP
@@ -56,7 +64,7 @@ defaultLogLevel = NOTICE
 
 options :: [OptDescr CmdOpt]
 options = [ Option ['p'] ["port"]
-                   (ReqArg (OptPortNum . fromIntegral . read) "NUM")
+                   (ReqArg (OptPortNum . toEnum . read) "NUM")
                    ("Port number to listen. (default: " ++ show defaultPort ++ ")")
 
           , Option ['d'] ["localstatedir"]
@@ -97,7 +105,8 @@ printUsage = do putStrLn "Usage:"
 
 
 main :: IO ()
-main = withSubversion $
+main = withOpenSSL $
+       withSubversion $
        do (opts, nonOpts, errors) <- return . getOpt Permute options =<< getArgs
 
           when (not $ null errors)
@@ -128,14 +137,21 @@ main = withSubversion $
           rebuildIndexIfRequested env opts
 
           infoM logger ("Listening to " ++ show portNum ++ "/tcp...")
-          runHttpd (envLucuConf env) (resTree env) [fallbackRender env]
+          runHttpd (envLucuConf env) (resTree env) [fallbackPageEntity env]
 
           
 resTree :: Environment -> ResTree
 resTree env
-    = mkResTree [ ([]        , resIndex  env)
-                , (["object"], resObject env)
-                , (["js"    ], javaScript   )
+    = mkResTree [ ([]              , resIndex        env)
+                , (["checkAuth"   ], resCheckAuth    env)
+                , (["js"          ], javaScript         )
+                , (["object"      ], resObject       env)
+                , (["render"      ], resRender       env)
+                , (["search"      ], resSearch       env)
+                , (["search.html" ], resSearch       env)
+                , (["search.xml"  ], resSearch       env)
+                , (["systemConfig"], resSystemConfig env)
+                , (["trackback"   ], resTrackBack    env)
                 ]
 
 
@@ -220,4 +236,4 @@ rebuildIndexIfRequested env opts
                                                OptRebuildIndex -> True
                                                _               -> False) opts
          when rebuild
-                  $ rebuildIndex (envStorage env)
\ No newline at end of file
+                  $ rebuildIndex (envStorage env)