Bump to v0.1.1 and allow >= network-2.6.

[dead/htsn.git] / src / Configuration.hs

diff --git a/src/Configuration.hs b/src/Configuration.hs
index 0a657e2eeca508767c114d3b00c01aa9a2e836cf..042cddbe0a5f137d9ac8eb8f207e31f76da58142 100644 (file)
--- a/src/Configuration.hs
+++ b/src/Configuration.hs
@@ -13,7 +13,7 @@ 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.
@@ -42,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