From: Andreas Gerstenberg <gerstenberg@pixelpark.com>
Date: Thu, 14 Sep 2017 10:31:36 +0000 (+0200)
Subject: spk-spar-checker add error_documents and update auth for /sfp
X-Git-Tag: v0.1.0~2437^2~14
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=287b151432f2c5416173e422ef4290a4afa7e2e2;p=pixelpark%2Fhiera.git

spk-spar-checker add error_documents and update auth for /sfp
---

diff --git a/customer/spk-spar-checker/production.yaml b/customer/spk-spar-checker/production.yaml
index f4d6376b..8e77ebe5 100644
--- a/customer/spk-spar-checker/production.yaml
+++ b/customer/spk-spar-checker/production.yaml
@@ -50,9 +50,6 @@ infra::profile::apache::pp_vhosts:
       - 'HTTPS on X-Forwarded-Proto=https'
       - 'HTTPS on HTTPS=on'
       - '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/'
@@ -84,6 +81,9 @@ infra::profile::apache::pp_vhosts:
           - 'env admin_ip_range'
         error_documents:
           - { error_code: 401 , document: "/401.html" }
+          - { error_code: 403 , document: "/403.html" }
+          - { error_code: 404 , document: "/404.html" }
+          - { error_code: 500 , document: "/500.html" }
       - provider: directory
         path: '/var/www/spar-checker/sparchecker-backend/public/sfp/'
         addhandlers:
@@ -141,12 +141,12 @@ infra::profile::apache::pp_vhosts:
         rewrite_cond:
           - '%%{ich-trickse}{HTTP:HTTPS} !=on'
         rewrite_rule:
-          - '^(.*)$ https://spar-checker-de.pixelpark.net$1 [R=301,L]'
+          - '^(.*)$ https://www.spar-checker.de$1 [R=301,L]'
       - comment: 'Alle Aliase auf Servername'
         rewrite_cond:
-          - '%%{ich-trickse}{HTTP_HOST} !^spar-checker-de.pixelpark.net$ [NC]'
+          - '%%{ich-trickse}{HTTP_HOST} !^www\.spar-checker\.de$ [NC]'
         rewrite_rule:
-          - '^(.*)$ https://spar-checker-de.pixelpark.net$1 [R=301,L]'
+          - '^(.*)$ https://www.spar-checker.de [R=301,L]'
 
 infra::profile::cron::cronjobs:
   clear_tokens:
diff --git a/customer/spk-spar-checker/test.yaml b/customer/spk-spar-checker/test.yaml
index d04f79c3..37050f9a 100644
--- a/customer/spk-spar-checker/test.yaml
+++ b/customer/spk-spar-checker/test.yaml
@@ -48,9 +48,6 @@ infra::profile::apache::pp_vhosts:
       - 'HTTPS on X-Forwarded-Proto=https'
       - 'HTTPS on HTTPS=on'
       - '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/'
@@ -72,16 +69,19 @@ infra::profile::apache::pp_vhosts:
         path: '/api'
       - provider: location
         path: '/sfp'
-#        auth_type: Digest
-#        auth_name: 'Manager-Interface'
-#        auth_digest_provider: file
-#        auth_digest_algorithm: MD5
-#        auth_user_file: '/etc/httpd/spk.managed.htdigest'
+        auth_type: Digest
+        auth_name: 'Manager-Interface'
+        auth_digest_provider: file
+        auth_digest_algorithm: MD5
+        auth_user_file: '/etc/httpd/spk.managed.htdigest'
         require:
-#          - 'valid-user'
+          - 'valid-user'
           - 'env admin_ip_range'
         error_documents:
           - { error_code: 401 , document: "/401.html" }
+          - { error_code: 403 , document: "/403.html" }
+          - { error_code: 404 , document: "/404.html" }
+          - { error_code: 500 , document: "/500.html" }
       - provider: directory
         path: '/var/www/spar-checker/sparchecker-backend/public/sfp/'
         addhandlers: