aboutsummaryrefslogtreecommitdiffstats
path: root/config/squid3
diff options
context:
space:
mode:
authordoktornotor <notordoktor@gmail.com>2015-10-06 06:49:18 +0200
committerdoktornotor <notordoktor@gmail.com>2015-10-06 06:49:18 +0200
commit36da794e0717db9d34483253ec7f7c9031816373 (patch)
treecbc58c7324b6fe16bc789ae39ac98c06dc8543f3 /config/squid3
parentec56ea65a4933ff30afb249e116e8a5d54f85cd5 (diff)
downloadpfsense-packages-36da794e0717db9d34483253ec7f7c9031816373.tar.gz
pfsense-packages-36da794e0717db9d34483253ec7f7c9031816373.tar.bz2
pfsense-packages-36da794e0717db9d34483253ec7f7c9031816373.zip
unset broken antivirus settings on upgrade
Diffstat (limited to 'config/squid3')
-rwxr-xr-xconfig/squid3/34/squid.inc8
1 files changed, 8 insertions, 0 deletions
diff --git a/config/squid3/34/squid.inc b/config/squid3/34/squid.inc
index bb1e46ec..1c4194b9 100755
--- a/config/squid3/34/squid.inc
+++ b/config/squid3/34/squid.inc
@@ -742,6 +742,14 @@ function squid_upgrade_config() {
}
}
}
+
+ /* unset broken antivirus settings */
+ if (is_array($config['installedpackages']['squidantivirus'])) {
+ unset($config['installedpackages']['squidantivirus']['config'][0]['squidclamav']);
+ unset($config['installedpackages']['squidantivirus']['config'][0]['c-icap_conf']);
+ unset($config['installedpackages']['squidantivirus']['config'][0]['c-icap_magic']);
+ unset($config['installedpackages']['squidantivirus']['config'][0]['freshclam_conf']);
+ }
update_output_window("Writing configuration... One moment please...");
write_config();