diff options
| author | Seth Mos <seth.mos@dds.nl> | 2010-11-04 16:14:07 +0100 |
|---|---|---|
| committer | Seth Mos <seth.mos@dds.nl> | 2010-11-04 16:14:07 +0100 |
| commit | f09ce147d6f791ac0f3a2a3348edd03a24b147cc (patch) | |
| tree | fb29ca350c34564a091466b48cbbe0b003989084 /etc/inc/system.inc | |
| parent | 0996a81ed6a12826ccc1dd98e0dbbf8a83bef777 (diff) | |
| parent | 3339c56f9558cf564ce7a2ebbeacaf7adc8482c4 (diff) | |
| download | pfsense-f09ce147d6f791ac0f3a2a3348edd03a24b147cc.zip pfsense-f09ce147d6f791ac0f3a2a3348edd03a24b147cc.tar.gz | |
Merge remote branch 'upstream/master'
Conflicts:
etc/inc/services.inc
Diffstat (limited to 'etc/inc/system.inc')
| -rw-r--r-- | etc/inc/system.inc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/etc/inc/system.inc b/etc/inc/system.inc index 6f6ad6e..4bcc9e0 100644 --- a/etc/inc/system.inc +++ b/etc/inc/system.inc @@ -1054,6 +1054,14 @@ url.access-deny = ( "~", ".inc" ) ######### Options that are good to be but not neccesary to be changed ####### ## bind to port (default: 80) + +EOD; + + if($captive_portal == true) + $lighty_config .= "server.bind = \"127.0.0.1\"\n"; + + $lighty_config .= <<<EOD + server.port = {$lighty_port} ## error-handler for status 404 |
