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

diff --git a/src/Configuration.hs b/src/Configuration.hs
index 68751d6..042cddb 100644
--- a/src/Configuration.hs
+++ b/src/Configuration.hs
@@ -13,8 +13,10 @@ import System.Log ( Priority( INFO ) )
 import qualified OptionalConfiguration as OC (
   OptionalConfiguration(..),
   merge_maybes )
-import TSN.FeedHosts (FeedHosts(..))
+import FeedHosts (FeedHosts(..))
 
+-- | The main configuration data type. This will be passed to most of
+--   the important functions once it has been created.
 data Configuration =
   Configuration {
     daemonize        :: Bool,
@@ -40,16 +42,16 @@ instance Default Configuration where
           log_level        = INFO,
           output_directory = ".",
           password         = def,
-          pidfile          = "/run/htsn.pid",
+          pidfile          = "/run/htsn/htsn.pid",
           run_as_group     = def,
           run_as_user      = def,
           syslog           = def,
           username         = def }
 
 
--- | Merge a Configuration with an OptionalConfiguration. This is more
---   or less the Monoid instance for OptionalConfiguration, but since
---   the two types are different, we have to repeat ourselves.
+-- | Merge a 'Configuration' with an 'OptionalConfiguration'. This is
+--   more or less the Monoid instance for 'OptionalConfiguration', but
+--   since the two types are different, we have to repeat ourselves.
 merge_optional :: Configuration
                -> OC.OptionalConfiguration
                -> Configuration