X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Network%2FHTTP%2FLucu%2FConfig.hs;h=cb3f4a8b4b5e68f6e9e105ed9d0e4624ceb209ae;hb=511b688492a4ddc489f4d45366ff967e9ec1cb0a;hp=c5f3f3eb7edd4764283fcd888f9de3627209034a;hpb=73b5fba4907604681d778d3bd54cd65fd84b4454;p=Lucu.git

diff --git a/Network/HTTP/Lucu/Config.hs b/Network/HTTP/Lucu/Config.hs
index c5f3f3e..cb3f4a8 100644
--- a/Network/HTTP/Lucu/Config.hs
+++ b/Network/HTTP/Lucu/Config.hs
@@ -18,35 +18,56 @@ import           System.IO.Unsafe
 -- |Configuration record for the Lucu httpd. You need to use
 -- 'defaultConfig' or setup your own configuration to run the httpd.
 data Config = Config {
+
     -- |A string which will be sent to clients as \"Server\" field.
       cnfServerSoftware :: !Strict.ByteString
+
     -- |The host name of the server. This value will be used in
     -- 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 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 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
     -- disable HTTPS.
     , cnfSSLConfig :: !(Maybe SSLConfig)
+
     -- |The maximum number of requests to accept in one connection
     -- simultaneously. If a client exceeds this limitation, its last
     -- request won't be processed until a response for its earliest
     -- pending request is sent back to the client.
     , cnfMaxPipelineDepth :: !Int
+
     -- |The maximum length of request entity to accept in bytes. Note
     -- that this is nothing but the default value which is used when
     -- 'Network.HTTP.Lucu.Resource.input' and such like are applied to
     -- 'Network.HTTP.Lucu.Resource.defaultLimit', so there is no
     -- guarantee that this value always constrains all the requests.
     , cnfMaxEntityLength :: !Int
+
     -- |The maximum length of chunk to output. This value is used by
     -- 'Network.HTTP.Lucu.Resource.output' and such like to limit the
     -- chunk length so you can safely output an infinite string (like
     -- a lazy stream of \/dev\/random) using those actions.
     , cnfMaxOutputChunkLength :: !Int
+
     -- | Whether to dump too late abortion to the stderr or not. See
     -- 'Network.HTTP.Lucu.Abortion.abort'.
     , cnfDumpTooLateAbortionToStderr :: !Bool
+
     -- |A mapping from extension to MIME Type. This value is used by
     -- 'Network.HTTP.Lucu.StaticFile.staticFile' to guess the MIME
     -- Type of static files. Note that MIME Types are currently
@@ -64,8 +85,11 @@ data Config = Config {
 -- |Configuration record for HTTPS connections.
 data SSLConfig
     = SSLConfig {
-        -- |A port ID to listen to HTTPS clients.
-        sslServerPort :: !PortID
+        -- |A port ID to listen to HTTPS clients. Local addresses
+        -- (both for IPv4 and IPv6) will be derived from the parent
+        -- 'Config'.
+        sslServerPort :: !ServiceName
+
         -- |An SSL context for accepting connections.
       , sslContext    :: !SSLContext
       }
@@ -77,7 +101,9 @@ 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
                 , cnfMaxPipelineDepth            = 100
                 , cnfMaxEntityLength             = 16 * 1024 * 1024 -- 16 MiB