X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Main.hs;h=46eb3e2ad4867ef7361cb8c681a7ac2ac10d7f41;hb=43113f26d3e61c96d896724c5509abe67b6a99e7;hp=b3313d68fd29ffb456b05d627e500e903d4a2f0d;hpb=71f2db55513679098869de2122b5d5989dbc2be2;p=Rakka.git

diff --git a/Main.hs b/Main.hs
index b3313d6..46eb3e2 100644
--- a/Main.hs
+++ b/Main.hs
@@ -4,12 +4,19 @@ import           Data.List
 import           Data.Maybe
 import           Network
 import           Network.HTTP.Lucu
+import           OpenSSL
 import           Rakka.Environment
+import           Rakka.Resource.CheckAuth
+import           Rakka.Resource.DumpRepos
 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.Resource.Users
 import           Rakka.Storage
 import           Subversion
 import           System.Console.GetOpt
@@ -80,11 +87,11 @@ options = [ Option ['p'] ["port"]
 
           , Option [] ["disable-stderr-log"]
                    (NoArg OptDisableStderrLog)
-                   ("Disable logging to stderr.")
+                   "Disable logging to stderr."
 
           , Option [] ["rebuild-index"]
                    (NoArg OptRebuildIndex)
-                   ("Rebuild the index database.")
+                   "Rebuild the index database."
 
           , Option ['h'] ["help"]
                    (NoArg OptHelp)
@@ -100,10 +107,11 @@ printUsage = do putStrLn "Usage:"
 
 
 main :: IO ()
-main = withSubversion $
+main = withOpenSSL $
+       withSubversion $
        do (opts, nonOpts, errors) <- return . getOpt Permute options =<< getArgs
 
-          when (not $ null errors)
+          unless (null errors)
                    $ do mapM_ putStr errors
                         exitWith $ ExitFailure 1
 
@@ -111,7 +119,7 @@ main = withSubversion $
                    $ do printUsage
                         exitWith ExitSuccess
 
-          when (not $ null nonOpts)
+          unless (null nonOpts)
                    $ do printUsage
                         exitWith $ ExitFailure 1
 
@@ -136,10 +144,18 @@ main = withSubversion $
           
 resTree :: Environment -> ResTree
 resTree env
-    = mkResTree [ ([]        , resIndex  env)
-                , (["js"    ], javaScript   )
-                , (["object"], resObject env)
-                , (["render"], resRender env)
+    = mkResTree [ ([]              , resIndex        env)
+                , (["checkAuth"   ], resCheckAuth    env)
+                , (["dumpRepos"   ], resDumpRepos    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)
+		, (["users"       ], resUsers        env)
                 ]
 
 
@@ -224,4 +240,4 @@ rebuildIndexIfRequested env opts
                                                OptRebuildIndex -> True
                                                _               -> False) opts
          when rebuild
-                  $ rebuildIndex (envStorage env)
\ No newline at end of file
+                  $ rebuildIndex (envStorage env)