Update NEWS and Lucu.cabal

[Lucu.git] / Network / HTTP / Lucu / Config.hs

diff --git a/Network/HTTP/Lucu/Config.hs b/Network/HTTP/Lucu/Config.hs
index 847b737ad200e0ef42a7740e608eed5caba9207d..cb3f4a8b4b5e68f6e9e105ed9d0e4624ceb209ae 100644 (file)
--- a/Network/HTTP/Lucu/Config.hs
+++ b/Network/HTTP/Lucu/Config.hs
@@ -26,19 +26,19 @@ data Config = Config {
     -- built-in pages like \"404 Not Found\".
     , cnfServerHost :: !Strict.ByteString
 
-    -- |A port ID to listen to HTTP clients.
-    , cnfServerPort :: !PortID
+    -- |A port number (or service name) to listen to HTTP clients.
+    , cnfServerPort :: !ServiceName
 
-    -- |Local IPv4 address to listen to HTTP clients. Set this to
-    -- @('Just' "0.0.0.0")@ if you want to accept any IPv4
-    -- connections. Set this to 'Nothing' to disable IPv4.
+    -- |Local IPv4 address to listen to both HTTP and HTTPS
+    -- clients. Set this to @('Just' "0.0.0.0")@ if you want to accept
+    -- any IPv4 connections. Set this to 'Nothing' to disable IPv4.
     , cnfServerV4Addr :: !(Maybe HostName)
 
-    -- |Local IPv6 address to listen to HTTP clients. Set this to
-    -- @('Just' "::")@ if you want to accept any IPv6 connections. Set
-    -- this to 'Nothing' to disable IPv6. Note that there is currently
-    -- no way to assign separate ports to IPv4 and IPv6 server
-    -- sockets.
+    -- |Local IPv6 address to listen to both HTTP and HTTPS
+    -- clients. Set this to @('Just' "::")@ if you want to accept any
+    -- IPv6 connections. Set this to 'Nothing' to disable IPv6. Note
+    -- that there is currently no way to assign separate ports to IPv4
+    -- and IPv6 server sockets.
     , cnfServerV6Addr :: !(Maybe HostName)
 
     -- |Configuration for HTTPS connections. Set this 'Nothing' to
@@ -88,7 +88,7 @@ data SSLConfig
         -- |A port ID to listen to HTTPS clients. Local addresses
         -- (both for IPv4 and IPv6) will be derived from the parent
         -- 'Config'.
-        sslServerPort :: !PortID
+        sslServerPort :: !ServiceName
 
         -- |An SSL context for accepting connections.
       , sslContext    :: !SSLContext
@@ -101,7 +101,7 @@ defaultConfig :: Config
 defaultConfig = Config {
                   cnfServerSoftware              = C8.pack "Lucu/1.0"
                 , cnfServerHost                  = C8.pack (unsafePerformIO getHostName)
-                , cnfServerPort                  = Service "http"
+                , cnfServerPort                  = "http"
                 , cnfServerV4Addr                = Just "0.0.0.0"
                 , cnfServerV6Addr                = Just "::"
                 , cnfSSLConfig                   = Nothing