diff options
| author | Seth Mos <seth.mos@dds.nl> | 2011-03-14 18:49:50 +0100 |
|---|---|---|
| committer | Seth Mos <seth.mos@dds.nl> | 2011-03-14 18:49:50 +0100 |
| commit | a41c5253e367dd0c8d215ff2098dd52b31a15fee (patch) | |
| tree | f59c9a7b4a7a83b1413a31a6f42f7b5c7698c5a6 /etc | |
| parent | 209620ea0356b057a7ff8a25c5be049e5878127d (diff) | |
| download | pfsense-a41c5253e367dd0c8d215ff2098dd52b31a15fee.zip pfsense-a41c5253e367dd0c8d215ff2098dd52b31a15fee.tar.gz | |
Properly configure lighty with the configured port when attached to the v6 socket. It was previously hardcoded to https
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/system.inc | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/etc/inc/system.inc b/etc/inc/system.inc index 535b4d8..25e82e6 100644 --- a/etc/inc/system.inc +++ b/etc/inc/system.inc @@ -966,10 +966,10 @@ server.network-backend = "writev" ## modules to load server.modules = ( - {$captive_portal_module} - "mod_access", "mod_accesslog", "mod_expire", "mod_compress", "mod_redirect", - {$module}{$captiveportal} - ) + {$captive_portal_module} + "mod_access", "mod_accesslog", "mod_expire", "mod_compress", "mod_redirect", + {$module}{$captiveportal} +) ## Unused modules # "mod_setenv", @@ -1082,9 +1082,8 @@ EOD; if($captive_portal == true) { $lighty_config .= "server.bind = \"127.0.0.1\"\n"; $lighty_config .= "server.port = {$lighty_port}\n"; - $lighty_config .= "\$SERVER[\"socket\"] == \"127.0.0.1:443\" { }\n"; - $lighty_config .= "\$SERVER[\"socket\"] == \"[::1]:443\" { \n"; - $lighty_config .= "\$SERVER[\"socket\"] == \"[::1]:443\" { \n"; + $lighty_config .= "\$SERVER[\"socket\"] == \"127.0.0.1:{$lighty_port}\" { }\n"; + $lighty_config .= "\$SERVER[\"socket\"] == \"[::1]:{$lighty_port}\" { \n"; if($cert <> "" and $key <> "") { $lighty_config .= "\n"; $lighty_config .= "## ssl configuration\n"; @@ -1097,8 +1096,8 @@ EOD; } else { $lighty_config .= "server.bind = \"0.0.0.0\"\n"; $lighty_config .= "server.port = {$lighty_port}\n"; - $lighty_config .= "\$SERVER[\"socket\"] == \"0.0.0.0:443\" { }\n"; - $lighty_config .= "\$SERVER[\"socket\"] == \"[::]:443\" { \n"; + $lighty_config .= "\$SERVER[\"socket\"] == \"0.0.0.0:{$lighty_port}\" { }\n"; + $lighty_config .= "\$SERVER[\"socket\"] == \"[::]:{$lighty_port}\" { \n"; if($cert <> "" and $key <> "") { $lighty_config .= "\n"; $lighty_config .= "## ssl configuration\n"; |
