diff --git a/ipasserelle-base.spec b/ipasserelle-base.spec index 72566be..8df6adc 100644 --- a/ipasserelle-base.spec +++ b/ipasserelle-base.spec @@ -1,4 +1,4 @@ -%define version 0.2.3 +%define version 0.2.2 %define release 1 %define name ipasserelle-base @@ -45,9 +45,6 @@ Based on SMEServer, iPasserelle is a specially configured SME Server, with some additionnal modules %changelog -* Mon Apr 16 2012 Daniel Berteaud 0.2.3-1.sme -- Don't hide X_Forwarded_For headers in squid if havp is enabled - * Fri Apr 13 2012 Daniel Berteaud 0.2.2-1.sme - Revert previous commit, bootstrap.min.css will go in webapps diff --git a/root/etc/e-smith/templates/etc/squid/squid.conf/96xForwardedFor b/root/etc/e-smith/templates/etc/squid/squid.conf/96xForwardedFor index ceeaa58..3d856af 100644 --- a/root/etc/e-smith/templates/etc/squid/squid.conf/96xForwardedFor +++ b/root/etc/e-smith/templates/etc/squid/squid.conf/96xForwardedFor @@ -1,18 +1,6 @@ -{ - -if (($havp{'status'} || 'disabled') ne 'enabled'){ - $OUT .=<<"EOF"; acl localhost src 127.0.0.1 follow_x_forwarded_for allow localhost forwarded_for off header_access X-Forwarded-For deny all -EOF - -} -else{ - $OUT .= ''; -} - -}