X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Main.hs;h=b3313d68fd29ffb456b05d627e500e903d4a2f0d;hb=71f2db55513679098869de2122b5d5989dbc2be2;hp=6621f58a11439ae334923349a75819ff8e042b64;hpb=656fdb2772ab4de5cd083cbe9e7c1610cccef73b;p=Rakka.git diff --git a/Main.hs b/Main.hs index 6621f58..b3313d6 100644 --- a/Main.hs +++ b/Main.hs @@ -9,6 +9,7 @@ import Rakka.Resource.Index import Rakka.Resource.JavaScript import Rakka.Resource.PageEntity import Rakka.Resource.Object +import Rakka.Resource.Render import Rakka.Storage import Subversion import System.Console.GetOpt @@ -22,6 +23,8 @@ import System.Posix.Files import System.Posix.Types import System.Posix.User + +logger :: String logger = "Main" @@ -38,7 +41,7 @@ data CmdOpt defaultPort :: PortNumber -defaultPort = fromIntegral 8080 +defaultPort = toEnum 8080 defaultLocalStateDir :: FilePath defaultLocalStateDir = LOCALSTATEDIR -- replaced by CPP @@ -56,7 +59,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"] @@ -134,8 +137,9 @@ main = withSubversion $ resTree :: Environment -> ResTree resTree env = mkResTree [ ([] , resIndex env) - , (["object"], resObject env) , (["js" ], javaScript ) + , (["object"], resObject env) + , (["render"], resRender env) ]