From add72bd0cf686a34f8712ce120b3eda794f46503 Mon Sep 17 00:00:00 2001 From: Andreas Gerstenberg Date: Tue, 22 Aug 2017 10:07:29 +0200 Subject: [PATCH] spk-spar-checker update --- customer/spk-spar-checker/production.yaml | 9 ++++++--- customer/spk-spar-checker/test.yaml | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/customer/spk-spar-checker/production.yaml b/customer/spk-spar-checker/production.yaml index 68d745b4..d215ec60 100644 --- a/customer/spk-spar-checker/production.yaml +++ b/customer/spk-spar-checker/production.yaml @@ -38,8 +38,6 @@ infra::profile::apache::pp_vhosts: directories: - provider: directory path: '/var/www/spar-checker/sparchecker-frontend/' - addhandlers: - - { handler: "proxy:unix:/var/run/php5-fpm-sparchecker.sock|fcgi://./" , extensions: '.php' } options: - FollowSymLinks - MultiViews @@ -60,6 +58,11 @@ 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 @@ -67,7 +70,7 @@ infra::profile::apache::pp_vhosts: auth_user_file: '/etc/httpd/spk.managed.htdigest' require: - 'valid-user' - - 'ip 80.146.239.2/32 109.86.229.215/32 195.69.134.114/32 88.99.67.38/32' + - 'env admin_ip_range' error_documents: - { error_code: 401 , document: "/401.html" } diff --git a/customer/spk-spar-checker/test.yaml b/customer/spk-spar-checker/test.yaml index 8e970d8a..2ed11244 100644 --- a/customer/spk-spar-checker/test.yaml +++ b/customer/spk-spar-checker/test.yaml @@ -36,8 +36,6 @@ infra::profile::apache::pp_vhosts: directories: - provider: directory path: '/var/www/spar-checker/sparchecker-frontend/' - addhandlers: - - { handler: "proxy:unix:/var/run/php5-fpm-sparchecker.sock|fcgi://./" , extensions: '.php' } options: - FollowSymLinks - MultiViews @@ -58,6 +56,11 @@ 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 @@ -65,7 +68,7 @@ infra::profile::apache::pp_vhosts: # auth_user_file: '/etc/httpd/spk.managed.htdigest' require: # - 'valid-user' - - 'ip 80.146.239.2/32 109.86.229.215/32 195.69.134.114/32 88.99.67.38/32' + - 'env admin_ip_range' error_documents: - { error_code: 401 , document: "/401.html" } -- 2.39.5