FBBKERNSERV-305 htaccess test

diff --git a/customer/fbb-www/test.yaml b/customer/fbb-www/test.yaml
index 9a98e003019a0bec61d167cad224ffc37940b313..a4b0284d08e6360d122b0944fb5ec93c13ab7e81 100644 (file)
--- a/customer/fbb-www/test.yaml
+++ b/customer/fbb-www/test.yaml
@@ -413,6 +413,32 @@ infra::profile::apache::pp_vhosts:
     setenvif:
       - 'HTTPS on X-Forwarded-Proto=https'
       - 'HTTPS on HTTPS=on'
+      #ADSL
+      # 82.145.10.128/29
+      - 'Client-IP "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'
+      # 194.174.73.0/24
+      - 'Client-IP "194\.174\.73\.\d+" AdslZugriffErlaubt'
+      # 194.174.78.0/24
+      - 'Client-IP "194\.174\.78\.\d+" AdslZugriffErlaubt'
+      # 172.18.49.24 und  172.18.39.22
+      - 'Client-IP "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'
+      # 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'
     headers:
       - 'set X-Content-Type-Options: nosniff'
       - 'set X-XSS-Protection: "1; mode=block"'
@@ -541,6 +567,14 @@ infra::profile::apache::pp_vhosts:
         options:
           - FollowSymLinks
           - Indexes
+      - provider: location
+        path: /de/global/ADSL-info
+        require:
+          #Pixelpark Admin Nat Pool
+          - ip 10.90.14.0
+          - 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/ }
       - { alias: /securitastxl , path: /var/data/flugdat/securitastxl/ }