aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlgcosta <lgcosta@pfsense.org>2011-08-26 02:17:54 -0300
committerlgcosta <lgcosta@pfsense.org>2011-08-26 02:17:54 -0300
commit0a12b0c187dfd965f42037efc77fbc4b971109e5 (patch)
treef88217681a9e66f348ff46c82943662456dc3412
parent86e16ec35449a2925eae53dc88ee67dbe519c54a (diff)
downloadpfsense-packages-0a12b0c187dfd965f42037efc77fbc4b971109e5.tar.gz
pfsense-packages-0a12b0c187dfd965f42037efc77fbc4b971109e5.tar.bz2
pfsense-packages-0a12b0c187dfd965f42037efc77fbc4b971109e5.zip
Custom Options should be before the options of general allow and any other blocks
-rw-r--r--config/squid/squid.inc17
1 files changed, 9 insertions, 8 deletions
diff --git a/config/squid/squid.inc b/config/squid/squid.inc
index 8a4de81e..7a31f750 100644
--- a/config/squid/squid.inc
+++ b/config/squid/squid.inc
@@ -944,6 +944,15 @@ function squid_resync_auth() {
$settingsconfig = $config['installedpackages']['squid']['config'][0];
$conf = '';
+ // Custom Options
+ if(!empty($config['installedpackages']['squid']['config'][0]['custom_options'])) {
+ $custopts = explode(";", ($config['installedpackages']['squid']['config'][0]['custom_options']));
+ $conf .= "# Custom options\n";
+ foreach ($custopts as $custopt) {
+ $conf .= $custopt."\n";
+ }
+ }
+
// Deny the banned guys before allowing the good guys
if(! empty($settingsnac['banned_hosts'])) {
if (squid_is_valid_acl('banned_hosts')) {
@@ -1058,14 +1067,6 @@ EOD;
$conf .= "http_access allow password $acl\n";
}
- if(!empty($config['installedpackages']['squid']['config'][0]['custom_options'])) {
- $custopts = explode(";", ($config['installedpackages']['squid']['config'][0]['custom_options']));
- $conf .= "# Custom options\n";
- foreach ($custopts as $custopt) {
- $conf .= $custopt."\n";
- }
- }
-
$conf .= "# Default block all to be sure\n";
$conf .= "http_access deny all\n";