From 2972b8475172e5d2fbf60faac3ac9f256e6a85ee Mon Sep 17 00:00:00 2001 From: Philipp Dallig Date: Mon, 7 Aug 2017 11:08:35 +0200 Subject: [PATCH] fbb-www - correct adsl --- customer/fbb-www/test.yaml | 52 +++++++++++++++++++++++--------------- 1 file changed, 32 insertions(+), 20 deletions(-) diff --git a/customer/fbb-www/test.yaml b/customer/fbb-www/test.yaml index 0d0e477c..3b120f52 100644 --- a/customer/fbb-www/test.yaml +++ b/customer/fbb-www/test.yaml @@ -421,30 +421,44 @@ infra::profile::apache::pp_vhosts: - 'HTTPS on HTTPS=on' #ADSL # 82.145.10.128/29 - - 'Client-IP "82\.145\.10\.(129|130|131|132|133|134)" AdslZugriffErlaubt' + - 'Remote_Addr "82\.145\.10\.(129|130|131|132|133|134)" AdslZugriffErlaubt' # 82.145.10.136/29 - - 'Client-IP "82\.145\.10\.(137|138|139|140|141|142)" AdslZugriffErlaubt' + - 'Remote_Addr "82\.145\.10\.(137|138|139|140|141|142)" AdslZugriffErlaubt' # 194.174.73.0/24 - - 'Client-IP "194\.174\.73\.\d+" AdslZugriffErlaubt' + - 'Remote_Addr "194\.174\.73\.\d+" AdslZugriffErlaubt' # 194.174.78.0/24 - - 'Client-IP "194\.174\.78\.\d+" AdslZugriffErlaubt' + - 'Remote_Addr "194\.174\.78\.\d+" AdslZugriffErlaubt' + # Provider Versatel + - 'Remote_Addr "62\.220\.27\.106" AdslZugriffErlaubt' # 172.18.49.24 und 172.18.39.22 - - 'Client-IP "172\.18\.[3-4]9\.2(2|4)" AdslZugriffErlaubt' + - 'Remote_Addr "172\.18\.[3-4]9\.2(2|4)" AdslZugriffErlaubt' # 82.144.58.192/26 - - 'Client-IP "82\.144\.58\.(19[3-9]|2\d\d)" AdslZugriffErlaubt' - - 'Client-IP "89\.247\.134\.34" AdslZugriffErlaubt' - - 'Client-IP "89\.247\.134\.67" AdslZugriffErlaubt' + - 'Remote_Addr "82\.144\.58\.(19[3-9]|2\d\d)" AdslZugriffErlaubt' + - 'Remote_Addr "89\.247\.134\.34" AdslZugriffErlaubt' + - 'Remote_Addr "89\.247\.134\.67" AdslZugriffErlaubt' + # Nat pool FBB - 172.17.85.0/24 + - 'Remote_Addr "172\.17\.85\.d+" AdslZugriffErlaubt' # Provider Vodafone - - 'Client-IP "89\.27\.163\.1(37|38|39|40|41|42)" AdslZugriffErlaubt' - - 'Client-IP "217\.66\.51\.\d+" AdslZugriffErlaubt' - - 'Client-IP "89\.27\.163\.\d+" AdslZugriffErlaubt' - - 'Client-IP "89\.27\.134\.\d+" AdslZugriffErlaubt' - - 'Client-IP "89\.27\.67\.\d+" AdslZugriffErlaubt' - - 'Client-IP "194\.174\.73\.\d+" AdslZugriffErlaubt' - - 'Client-IP "194\.174\.80\.\d+" AdslZugriffErlaubt' - - 'Client-IP "194\.174\.76\.\d+" AdslZugriffErlaubt' - - 'Client-IP "178\.8\.96\.\d+" AdslZugriffErlaubt' - - 'Client-IP "89\.\d+\.\d+\.\d+" AdslZugriffErlaubt' + - 'Remote_Addr "89\.27\.163\.1(37|38|39|40|41|42)" AdslZugriffErlaubt' + - 'Remote_Addr "217\.66\.51\.\d+" AdslZugriffErlaubt' + - 'Remote_Addr "89\.27\.163\.\d+" AdslZugriffErlaubt' + - 'Remote_Addr "89\.27\.134\.\d+" AdslZugriffErlaubt' + - 'Remote_Addr "89\.27\.67\.\d+" AdslZugriffErlaubt' + - 'Remote_Addr "194\.174\.73\.\d+" AdslZugriffErlaubt' + - 'Remote_Addr "194\.174\.80\.\d+" AdslZugriffErlaubt' + - 'Remote_Addr "194\.174\.76\.\d+" AdslZugriffErlaubt' + - 'Remote_Addr "178\.8\.96\.\d+" AdslZugriffErlaubt' + - 'Remote_Addr "89\.\d+\.\d+\.\d+" AdslZugriffErlaubt' + # From Location + - 'Remote_Addr "172\.18\.39\.22" AdslZugriffErlaubt' + - 'Remote_Addr "172\.18\.49\.24" AdslZugriffErlaubt' + - 'Remote_Addr "194\.174\.73\.\d+" AdslZugriffErlaubt' + - 'Remote_Addr "194\.174\.78\.\d+" AdslZugriffErlaubt' + - 'Remote_Addr "217\.66\.51\.\d+" AdslZugriffErlaubt' + - 'Remote_Addr "10\.99\.1\.10" AdslZugriffErlaubt' + - 'Remote_Addr "194\.174\.73\.\d+" AdslZugriffErlaubt' + - 'Remote_Addr "194\.174\.80\.\d+" AdslZugriffErlaubt' + - 'Remote_Addr "194\.174\.76\.\d+" AdslZugriffErlaubt' headers: - 'set X-Content-Type-Options: nosniff' - 'set X-XSS-Protection: "1; mode=block"' @@ -576,8 +590,6 @@ infra::profile::apache::pp_vhosts: - provider: location path: /de/global/ADSL-info require: - - ip 172.18.39.22 172.18.49.24 194.174.73 194.174.78 217.66.51 10.99.1.10 - - ip 89.27.163.36/29 89.27.134.34/24 89.27.134.67/24 194.174.73.0/24 194.174.80.0/24 194.174.76.0/24 - env AdslZugriffErlaubt aliases: - { alias: /starsberlin , path: /var/data/flugdat/starsBerlin/ } -- 2.39.5