diff options
author | Martin Fuchs <martin.fuchs@trendchiller.com> | 2011-09-27 23:03:51 +0200 |
---|---|---|
committer | Martin Fuchs <martin.fuchs@trendchiller.com> | 2011-09-27 23:03:51 +0200 |
commit | e1d40c40e30883031d3565d305c09b91781d15aa (patch) | |
tree | 1c2b7304d55648bcc16af85e9bbfc4ef20b584dc | |
parent | 2b6a30287a6ec1c2ac1f2e59edf8afbff565f80f (diff) | |
download | pfsense-packages-e1d40c40e30883031d3565d305c09b91781d15aa.tar.gz pfsense-packages-e1d40c40e30883031d3565d305c09b91781d15aa.tar.bz2 pfsense-packages-e1d40c40e30883031d3565d305c09b91781d15aa.zip |
few options beginning to work
-rw-r--r-- | config/squid-reverse/squid.inc | 12 | ||||
-rw-r--r-- | config/squid-reverse/squid_reverse.xml | 7 |
2 files changed, 8 insertions, 11 deletions
diff --git a/config/squid-reverse/squid.inc b/config/squid-reverse/squid.inc index d0dad31d..cbd18b68 100644 --- a/config/squid-reverse/squid.inc +++ b/config/squid-reverse/squid.inc @@ -489,6 +489,7 @@ function squid_validate_traffic($post, $input_errors) { function squid_validate_reverse($post, $input_errors) { +// CONF } @@ -595,7 +596,7 @@ function squid_resync_general() { $settings = $config['installedpackages']['squid']['config'][0]; $conf = "# This file is automatically generated by pfSense\n"; - $conf = "# Do not edit manually !\n"; + $conf .= "# Do not edit manually !\n"; $port = ($settings['proxy_port'] ? $settings['proxy_port'] : 3128); $ifaces = ($settings['active_interface'] ? $settings['active_interface'] : 'lan'); @@ -946,9 +947,12 @@ function squid_resync_reverse() { return; $settings = $config['installedpackages']['squidreverse']['config'][0]; $conf = ''; - - - + +// CONF + $conf .= "# Reverse Proxy settings\n"; + if (!empty($settings['extension_methods'])) $conf .= "extension_methods {$settings['extension_methods']}\n"; + if (!empty($settings['deny_info_tcp_reset'])) $conf .= "deny_info TCP_RESET all\n"; + return $conf; } diff --git a/config/squid-reverse/squid_reverse.xml b/config/squid-reverse/squid_reverse.xml index 93e1c595..240cd26e 100644 --- a/config/squid-reverse/squid_reverse.xml +++ b/config/squid-reverse/squid_reverse.xml @@ -114,7 +114,6 @@ <description>This is the port the HTTP reverse-proxy will listen on.</description> <type>input</type> <size>5</size> - <required/> <default_value>80</default_value> </field> <field> @@ -123,7 +122,6 @@ <description>This is the HTTP reverse default site.</description> <type>input</type> <size>60</size> - <required/> <default_value>localhost</default_value> </field> @@ -142,7 +140,6 @@ <description>This is the port the HTTPS reverse-proxy will listen on.</description> <type>input</type> <size>5</size> - <required/> <default_value>443</default_value> </field> <field> @@ -151,7 +148,6 @@ <description>This is the HTTPS reverse default site.</description> <type>input</type> <size>60</size> - <required/> <default_value>localhost</default_value> </field> @@ -195,7 +191,6 @@ <description>This is the internal published server peer IP.</description> <type>input</type> <size>15</size> - <required/> <default_value>internalhost</default_value> </field> @@ -205,7 +200,6 @@ <description>This is the internal published server peer port.</description> <type>input</type> <size>5</size> - <required/> <default_value>80</default_value> </field> @@ -215,7 +209,6 @@ <description>This is the URL to publish.</description> <type>input</type> <size>60</size> - <required/> </field> </fields> |