summaryrefslogtreecommitdiffstats
path: root/bin/drakguard
diff options
context:
space:
mode:
Diffstat (limited to 'bin/drakguard')
-rwxr-xr-xbin/drakguard4
1 files changed, 3 insertions, 1 deletions
diff --git a/bin/drakguard b/bin/drakguard
index 42f8e90..5b34430 100755
--- a/bin/drakguard
+++ b/bin/drakguard
@@ -579,7 +579,9 @@ sub unblock_internet_dansguardian {
sub enable_transparent_proxy {
my ($port) = @_;
#- FIXME: use network::squid once it is rewritten to be more gentle with the config file
- subst_config_line($network::squid::squid_conf_file, "http_port $port transparent\n");
+ # Only use transparent proxy if squid version < 3.2. Handle upgrades nicely
+ substr(`rpm -q squid`, 6, 3) < 3.2 ? subst_config_line($network::squid::squid_conf_file, "http_port $port transparent\n") :
+ subst_config_line($network::squid::squid_conf_file, "http_port $port\n");
}
#- mostly duplicated for MDK::Common::System::getVarsFromSh