X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FConfiguration.hs;h=68751d6015784242e7ecdb89fcf2ee568ef383da;hb=f6cb0ba712e06e52d080b86e9eba6c3585a7514b;hp=a9d5463f612885d4d831d04ee13db1dad6c67864;hpb=331f6dd53edd8af4cdd5fac8d7f2709d734b0ddc;p=dead%2Fhtsn.git

diff --git a/src/Configuration.hs b/src/Configuration.hs
index a9d5463..68751d6 100644
--- a/src/Configuration.hs
+++ b/src/Configuration.hs
@@ -10,16 +10,22 @@ where
 import System.Console.CmdArgs.Default ( Default(..) )
 import System.Log ( Priority( INFO ) )
 
-import qualified OptionalConfiguration as OC (OptionalConfiguration(..))
+import qualified OptionalConfiguration as OC (
+  OptionalConfiguration(..),
+  merge_maybes )
 import TSN.FeedHosts (FeedHosts(..))
 
 data Configuration =
   Configuration {
+    daemonize        :: Bool,
     feed_hosts       :: FeedHosts,
-    log_file         :: FilePath,
+    log_file         :: Maybe FilePath,
     log_level        :: Priority,
-    password         :: String,
     output_directory :: FilePath,
+    password         :: String,
+    pidfile          :: FilePath,
+    run_as_group     :: Maybe String,
+    run_as_user      :: Maybe String,
     syslog           :: Bool,
     username         :: String }
     deriving (Show)
@@ -27,7 +33,18 @@ data Configuration =
 -- | A Configuration with all of its fields set to their default
 --   values.
 instance Default Configuration where
-  def = Configuration def "htsn.log" INFO def "." True def
+  def = Configuration {
+          daemonize        = def,
+          feed_hosts       = def,
+          log_file         = def,
+          log_level        = INFO,
+          output_directory = ".",
+          password         = def,
+          pidfile          = "/run/htsn.pid",
+          run_as_group     = def,
+          run_as_user      = def,
+          syslog           = def,
+          username         = def }
 
 
 -- | Merge a Configuration with an OptionalConfiguration. This is more
@@ -38,14 +55,20 @@ merge_optional :: Configuration
                -> Configuration
 merge_optional cfg opt_cfg =
   Configuration
+    (merge (daemonize cfg) (OC.daemonize opt_cfg))
     all_feed_hosts
-    (merge (log_file cfg) (OC.log_file opt_cfg))
+    (OC.merge_maybes (log_file cfg) (OC.log_file opt_cfg))
     (merge (log_level cfg) (OC.log_level opt_cfg))
-    (merge (password cfg) (OC.password opt_cfg))
     (merge (output_directory cfg) (OC.output_directory opt_cfg))
+    (merge (password cfg) (OC.password opt_cfg))
+    (merge (pidfile cfg) (OC.pidfile opt_cfg))
+    (OC.merge_maybes (run_as_group cfg) (OC.run_as_group opt_cfg))
+    (OC.merge_maybes (run_as_user cfg) (OC.run_as_user opt_cfg))
     (merge (syslog cfg) (OC.syslog opt_cfg))
     (merge (username cfg) (OC.username opt_cfg))
   where
+    -- | If the thing on the right is Just something, return that
+    --   something, otherwise return the thing on the left.
     merge :: a -> Maybe a -> a
     merge x Nothing  = x
     merge _ (Just y) = y