X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Main.hs;h=46eb3e2ad4867ef7361cb8c681a7ac2ac10d7f41;hb=a4b849476ee3a204ea91dee8f3fd235b0b33a10a;hp=02a4cf4702996013cfdcc6dc07c6646b1d707bb0;hpb=5b25efa958eac431edbcd97194ac51bb05a7c69b;p=Rakka.git diff --git a/Main.hs b/Main.hs index 02a4cf4..46eb3e2 100644 --- a/Main.hs +++ b/Main.hs @@ -7,6 +7,7 @@ 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 @@ -14,7 +15,8 @@ import Rakka.Resource.Object import Rakka.Resource.Render import Rakka.Resource.Search import Rakka.Resource.SystemConfig -import Rakka.Resource.TrackBack +-- import Rakka.Resource.TrackBack +import Rakka.Resource.Users import Rakka.Storage import Subversion import System.Console.GetOpt @@ -85,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) @@ -109,7 +111,7 @@ 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 @@ -117,7 +119,7 @@ main = withOpenSSL $ $ do printUsage exitWith ExitSuccess - when (not $ null nonOpts) + unless (null nonOpts) $ do printUsage exitWith $ ExitFailure 1 @@ -144,6 +146,7 @@ resTree :: Environment -> ResTree resTree env = mkResTree [ ([] , resIndex env) , (["checkAuth" ], resCheckAuth env) + , (["dumpRepos" ], resDumpRepos env) , (["js" ], javaScript ) , (["object" ], resObject env) , (["render" ], resRender env) @@ -151,7 +154,8 @@ resTree env , (["search.html" ], resSearch env) , (["search.xml" ], resSearch env) , (["systemConfig"], resSystemConfig env) - , (["trackback" ], resTrackBack env) + -- , (["trackback" ], resTrackBack env) + , (["users" ], resUsers env) ]