From: Oliver Böttcher <oliver.boettcher@pixelpark.com>
Date: Wed, 15 Nov 2017 10:27:25 +0000 (+0100)
Subject: BMAS-Typo3 - wartungsseite weg
X-Git-Tag: v0.1.0~2047^2~15
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=f4cf0c8672ddf6537f5feaec6969d1129a9288a1;p=pixelpark%2Fhiera.git

BMAS-Typo3 - wartungsseite weg
---

diff --git a/customer/bmas-typo3/test.yaml b/customer/bmas-typo3/test.yaml
index dc10647b..18f514cf 100644
--- a/customer/bmas-typo3/test.yaml
+++ b/customer/bmas-typo3/test.yaml
@@ -99,36 +99,22 @@ infra::profile::typo3::projects:
     ssl_key: '/etc/pki/tls/private/wildcard.pixelpark.net-key.pem'
     ssl_chain: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
     directories:
-      - error_docs:
-        provider: directory
-        path: '/var/www/wartung'
-      #- location1:
-      #  provider: location
-      #  path: '/'
-      #  auth_type: Digest
-      #  auth_name: arbeit
-      #  auth_digest_provider: file
-      #  auth_digest_algorithm: MD5
-      #  auth_user_file: '/etc/httpd/htdigest'
-      #  auth_require: 'valid-user'
-      #  require:
-      #    - local
+      - location1:
+        provider: location
+        path: '/'
+        auth_type: Digest
+        auth_name: arbeit
+        auth_digest_provider: file
+        auth_digest_algorithm: MD5
+        auth_user_file: '/etc/httpd/htdigest'
+        auth_require: 'valid-user'
+        require:
+          - local
     user: apache
     mode: '2775'
     php_admin_value:
       always_populate_raw_post_data: '-1'
       max_input_vars: 1500
-    aliases:
-      - { alias: /wartung , path: /var/www/wartung }
-    error_documents:
-      - { error_code: 503 , document: "/wartung/index.html" }
-    rewrites:
-      - alias:
-        comment: 'Maintenance'
-        rewrite_cond:
-          - '%%{ich-trickse}{REQUEST_URI} !=/wartung/index.html'
-        rewrite_rule:
-          - '^.*$ - [R=503,L]'
   unternehmenswertmensch:
     version: '7.6.22'
     site_path: '/srv/www/unternehmens-wert-mensch'
@@ -142,9 +128,6 @@ infra::profile::typo3::projects:
     ssl_key: '/etc/pki/tls/private/wildcard.pixelpark.net-key.pem'
     ssl_chain: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
     directories:
-      - error_docs:
-        provider: directory
-        path: '/var/www/wartung'
       - location1:
         provider: location
         path: '/'
@@ -159,17 +142,6 @@ infra::profile::typo3::projects:
     php_admin_value:
       always_populate_raw_post_data: '-1'
       max_input_vars: 1500
-    aliases:
-      - { alias: /wartung , path: /var/www/wartung }
-    error_documents:
-      - { error_code: 503 , document: "/wartung/index.html" }
-    rewrites:
-      - alias:
-        comment: 'Maintenance'
-        rewrite_cond:
-          - '%%{ich-trickse}{REQUEST_URI} !=/wartung/index.html'
-        rewrite_rule:
-          - '^.*$ - [R=503,L]'
   inqacheck:
     version: '6.2.31'
     site_path: '/srv/www/inqa-check'
@@ -188,9 +160,6 @@ infra::profile::typo3::projects:
     ssl_key: '/etc/pki/tls/private/wildcard.pixelpark.net-key.pem'
     ssl_chain: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
     directories:
-      - error_docs:
-        provider: directory
-        path: '/var/www/wartung'
       - location1:
         provider: location
         path: '/'
@@ -209,18 +178,8 @@ infra::profile::typo3::projects:
           - '%%{ich-trickse}{HTTPS} !=on'
         rewrite_rule:
           - '(.*) https://%%{ich-trickse}{HTTP_HOST}%%{ich-trickse}{REQUEST_URI} [R=301,L]'
-      - alias:
-        comment: 'Maintenance'
-        rewrite_cond:
-          - '%%{ich-trickse}{REQUEST_URI} !=/wartung/index.html'
-        rewrite_rule:
-          - '^.*$ - [R=503,L]'
     php_admin_value:
       memory_limit: 256M
-    aliases:
-      - { alias: /wartung , path: /var/www/wartung }
-    error_documents:
-      - { error_code: 503 , document: "/wartung/index.html" }
   fisnetzwerk:
     version: '7.6.22'
     site_path: '/srv/www/fisnetzwerk'
@@ -234,9 +193,6 @@ infra::profile::typo3::projects:
     ssl_key: '/etc/pki/tls/private/wildcard.pixelpark.net-key.pem'
     ssl_chain: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
     directories:
-      - error_docs:
-        provider: directory
-        path: '/var/www/wartung'
       - location1:
         provider: location
         path: '/'
@@ -251,14 +207,3 @@ infra::profile::typo3::projects:
     php_admin_value:
       always_populate_raw_post_data: '-1'
       max_input_vars: 1500
-    aliases:
-      - { alias: /wartung , path: /var/www/wartung }
-    error_documents:
-      - { error_code: 503 , document: "/wartung/index.html" }
-    rewrites:
-      - alias:
-        comment: 'Maintenance'
-        rewrite_cond:
-          - '%%{ich-trickse}{REQUEST_URI} !=/wartung/index.html'
-        rewrite_rule:
-          - '^.*$ - [R=503,L]'