diff options
author | Derek Jennings <djennings@mageia.org> | 2013-08-27 15:40:30 +0100 |
---|---|---|
committer | Derek Jennings <djennings@mageia.org> | 2013-08-27 15:40:30 +0100 |
commit | 5ae5cea053497aca8cdc744c04d6007b33b1f161 (patch) | |
tree | f0c1428b2a025da5c8d0d8fc4fa9080d13957b54 | |
parent | 12a16ebd4b02755c733fb68af58c219283da3f9f (diff) | |
download | drakwizard-5ae5cea053497aca8cdc744c04d6007b33b1f161.tar drakwizard-5ae5cea053497aca8cdc744c04d6007b33b1f161.tar.gz drakwizard-5ae5cea053497aca8cdc744c04d6007b33b1f161.tar.bz2 drakwizard-5ae5cea053497aca8cdc744c04d6007b33b1f161.tar.xz drakwizard-5ae5cea053497aca8cdc744c04d6007b33b1f161.zip |
fix parameter format in proxy wizard
-rw-r--r-- | NEWS | 1 | ||||
-rwxr-xr-x | proxy_wizard/Squid.pm | 6 |
2 files changed, 4 insertions, 3 deletions
@@ -1,3 +1,4 @@ +- fix parameter format in proxy wizard - fix race condition checking service status (mga#10934) Version 3.9 - 21 Apr 2013, by Thierry Vignaud diff --git a/proxy_wizard/Squid.pm b/proxy_wizard/Squid.pm index f46091af..375f795e 100755 --- a/proxy_wizard/Squid.pm +++ b/proxy_wizard/Squid.pm @@ -235,7 +235,7 @@ sub do_it { MDK::Common::cp_af("__WIZ_HOME__/proxy_wizard/scripts/squid.conf.default", $file); substInFile { s|^\s*#?\s*cache_dir ufs /var/spool/squid 100 16 256.*|cache_dir ufs $o->{var}{wiz_squid_defdir} $o->{var}{wiz_squid_disk} 16 256|; - s|^\s*#?\s*acl\s*mynetwork\s*src.*|acl mynetwork src $o->{var}{wiz_squid_mynetw}|; + s|^\s*#?\s*acl\s*localnet\s*src.*|acl localnet src $o->{var}{wiz_squid_mynetw}|; s|^\s*#?\s*(cache_mem\s*)\d+(\s*MB.*)|$1$o->{var}{wiz_squid_mem} MB|; s|^\s*#?\s*(http_port\s*)\d+(.*)|$1$o->{var}{wiz_squid_port}|; } $file; @@ -249,12 +249,12 @@ level = $o->{var}{wiz_squid_level}"); } elsif ($o->{var}{wiz_squid_level} == 2) { substInFile { s|^\s*#?\s*(http_access\s*)allow(\s*all.*)|#$&\n$1deny$2|; - s|^\s*#?\s*(http_access\s*allow\s*)localhost|#$&\n$1mynetwork|; + s|^\s*#?\s*(http_access\s*allow\s*)localhost|#$&\n$1localnet|; } $file; } elsif ($o->{var}{wiz_squid_level} == 3) { substInFile { s|^\s*#?\s*(http_access\s*)allow(\s*all.*)|#$&\n$1deny$2|; - s|^\s*#?\s*(http_access\s*allow\s*)mynetwork|#$&\n$1localhost|; + s|^\s*#?\s*(http_access\s*allow\s*)localnet|#$&\n$1localhost|; } $file; } else { # should not happen die "wiz_squid_level error"; |