diff options
author | serg dvoriancev <dv_serg@mail.ru> | 2010-04-12 21:52:00 +0400 |
---|---|---|
committer | serg dvoriancev <dv_serg@mail.ru> | 2010-04-12 21:52:00 +0400 |
commit | 312f6a4827d742869daba0ebb186b6de5483379a (patch) | |
tree | 9285758224d8a53d519f7fab142629397e1ef13d /config/vhosts | |
parent | 8d8c3e1278c35aaf235710d07cbe6583337700d5 (diff) | |
parent | e8fa9505ad3c402bf4a5b5143842c0028382a658 (diff) | |
download | pfsense-packages-312f6a4827d742869daba0ebb186b6de5483379a.tar.gz pfsense-packages-312f6a4827d742869daba0ebb186b6de5483379a.tar.bz2 pfsense-packages-312f6a4827d742869daba0ebb186b6de5483379a.zip |
Merge branch 'master' of http://gitweb.pfsense.org/pfsense-packages/mainline
Diffstat (limited to 'config/vhosts')
-rw-r--r-- | config/vhosts/vhosts.inc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/config/vhosts/vhosts.inc b/config/vhosts/vhosts.inc index 3602b40a..9f394fb0 100644 --- a/config/vhosts/vhosts.inc +++ b/config/vhosts/vhosts.inc @@ -136,6 +136,7 @@ function vhosts_sync_package_php() $vhostarray_http[$x]['privatekey'] = ''; $vhostarray_http[$x]['enabled'] = $rowhelper['enabled']; $vhostarray_http[$x]['description'] = $rowhelper['description']; + $server_port = $rowhelper['port']; } $x++; } @@ -267,7 +268,7 @@ function vhosts_sync_package_php() $tmp .= "######### Options that are good to be but not neccesary to be changed #######\n"; $tmp .= "\n"; $tmp .= "## bind to port (default: 80)\n"; - $tmp .= "#server.port = 8001\n"; + $tmp .= "server.port = $server_port\n"; $tmp .= "\n"; $tmp .= "#the regex method isn't working\n"; $tmp .= "#\$HTTP[\"host\"] =~ \"(^|\\.)host01\\.com\$\" {\n"; @@ -321,9 +322,6 @@ function vhosts_sync_package_php() $tmp .= "\$SERVER[\"socket\"] == \"".$ipaddress.":".$port."\" {\n"; } - if (strlen($rowhelper['description']) > 0) { - $tmp .= "# ".$rowhelper['description']." \n\n"; - } $tmp .= " \$HTTP[\"host\"] == \"".$host."\" {\n"; $tmp .= " server.document-root = \"/usr/local/vhosts/".$directory."\"\n"; |