spk-spar-checker update setenvif block

diff --git a/customer/spk-spar-checker/production.yaml b/customer/spk-spar-checker/production.yaml
index 9653eefbe6181c0ef7af28669994150720265951..1f8c407cbe77c040ad2544dbf7cdd2cd42ab66d3 100644 (file)
--- a/customer/spk-spar-checker/production.yaml
+++ b/customer/spk-spar-checker/production.yaml
@@ -36,6 +36,11 @@ infra::profile::apache::pp_vhosts:
     docroot_group: apache
     docroot_mode: '0750'
     access_log_format: lb_combined
+    setenvif:
+      - 'X-Forwarded-For ^80.146.239.2 admin_ip_range'
+      - 'X-Forwarded-For ^109.86.229.215 admin_ip_range'
+      - 'X-Forwarded-For ^195.69.134.114 admin_ip_range'
+      - 'X-Forwarded-For ^88.99.67.38 admin_ip_range'
     directories:
       - provider: directory
         path: '/var/www/spar-checker/sparchecker-frontend/'
@@ -59,11 +64,6 @@ infra::profile::apache::pp_vhosts:
         path: '/api'
       - provider: location
         path: '/sfp'
-        setenvif:
-        - 'X-Forwarded-For ^80.146.239.2 admin_ip_range'
-        - 'X-Forwarded-For ^109.86.229.215 admin_ip_range'
-        - 'X-Forwarded-For ^195.69.134.114 admin_ip_range'
-        - 'X-Forwarded-For ^88.99.67.38 admin_ip_range'
         auth_type: Digest
         auth_name: 'Manager-Interface'
         auth_digest_provider: file

diff --git a/customer/spk-spar-checker/test.yaml b/customer/spk-spar-checker/test.yaml
index 20c9a23406b82d9bae6add0d9a291b432475d02c..ba493d243cf68eab120db82552df6eb229743ad8 100644 (file)
--- a/customer/spk-spar-checker/test.yaml
+++ b/customer/spk-spar-checker/test.yaml
@@ -34,6 +34,11 @@ infra::profile::apache::pp_vhosts:
     docroot_group: apache
     docroot_mode: '0750'
     access_log_format: lb_combined
+    setenvif:
+      - 'X-Forwarded-For ^80.146.239.2 admin_ip_range'
+      - 'X-Forwarded-For ^109.86.229.215 admin_ip_range'
+      - 'X-Forwarded-For ^195.69.134.114 admin_ip_range'
+      - 'X-Forwarded-For ^88.99.67.38 admin_ip_range'
     directories:
       - provider: directory
         path: '/var/www/spar-checker/sparchecker-frontend/'
@@ -57,11 +62,6 @@ infra::profile::apache::pp_vhosts:
         path: '/api'
       - provider: location
         path: '/sfp'
-        setenvif:
-        - 'X-Forwarded-For ^80.146.239.2 admin_ip_range'
-        - 'X-Forwarded-For ^109.86.229.215 admin_ip_range'
-        - 'X-Forwarded-For ^195.69.134.114 admin_ip_range'
-        - 'X-Forwarded-For ^88.99.67.38 admin_ip_range'
 #        auth_type: Digest
 #        auth_name: 'Manager-Interface'
 #        auth_digest_provider: file