Revert "Merge branch 'bmas-typo3-wartung' into 'master'"

This reverts merge request !215

diff --git a/customer/bmas-typo3/production.yaml b/customer/bmas-typo3/production.yaml
index 52fc0a793c3b4d77e98c81be5888be3442bbe68d..90746e883539c4f6e660a078fbb70f85008a4c3f 100644 (file)
--- a/customer/bmas-typo3/production.yaml
+++ b/customer/bmas-typo3/production.yaml
@@ -190,12 +190,6 @@ infra::profile::typo3::projects:
       - futurale.de
       - www.futurale.de
     rewrites:
-      - alias:
-        comment: 'Maintenance'
-        rewrite_cond:
-          - '%%{ich-trickse}{REQUEST_URI} !=/wartung/index.html'
-        rewrite_rule:
-          - '^.*$ - [R=503,L]'
       - alias:
         comment: 'Filmfestival Presse'
         rewrite_cond:
@@ -240,35 +234,29 @@ infra::profile::typo3::projects:
           - '%%{ich-trickse}{HTTP_HOST} ^(www\.)?arbeitenviernull\.de$'
         rewrite_rule:
           - '^/mitmachen/foerderprogramm.html$ http://www.unternehmens-wert-mensch.de/das-programm/unsere-erstberatungsstellen [R=301,L]'
-    aliases:
-      - { alias: /wartung , path: /var/www/wartung }
-    error_documents:
-      - { error_code: 503 , document: "/wartung/index.html" }
+
     cert_servername: 'www.arbeitenviernull.de'
     cert_customer: 'bmas'
     ssl_cert: '/etc/pki/tls/certs/www.arbeitenviernull.de-cert.pem'
     ssl_key: '/etc/pki/tls/private/www.arbeitenviernull.de-key.pem'
     ssl_chain: '/etc/pki/tls/certs/www.arbeitenviernull.de-cert.pem'
     directories:
-      - error_docs:
-        provider: directory
-        path: '/var/www/wartung'
       # protect typo3 location
-      #- provider: location
-      #  path: '/typo3/'
-      #  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
+      - provider: location
+        path: '/typo3/'
+        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
       # make some other locations available
-      #- provider: location
-      #  path: '/typo3/js'
-      #- provider: location
-      #  path: '/typo3/sysext/rsaauth/resources/'
+      - provider: location
+        path: '/typo3/js'
+      - provider: location
+        path: '/typo3/sysext/rsaauth/resources/'
     user: apache
     mode: '2775'
     php_admin_value:
@@ -286,12 +274,6 @@ infra::profile::typo3::projects:
       - www-unternehmens-wert-mensch-de.pixelpark.net
       - unternehmens-wert-mensch.de
     rewrites:
-      - alias:
-        comment: 'Maintenance'
-        rewrite_cond:
-          - '%%{ich-trickse}{REQUEST_URI} !=/wartung/index.html'
-        rewrite_rule:
-          - '^.*$ - [R=503,L]'
       - alias:
         comment: 'Alle Aliase auf Servername'
         rewrite_cond:
@@ -304,27 +286,19 @@ infra::profile::typo3::projects:
     ssl_key: '/etc/pki/tls/private/www.unternehmens-wert-mensch.de-key.pem'
     ssl_chain: '/etc/pki/tls/certs/www.unternehmens-wert-mensch.de-cert.pem'
     directories:
-    directories:
-      - error_docs:
-        provider: directory
-        path: '/var/www/wartung'
-      #- provider: location
-      #  path: '/typo3/'
-      #  auth_type: Digest
-      #  auth_name: mensch
-      #  auth_digest_provider: file
-      #  auth_digest_algorithm: MD5
-      #  auth_user_file: '/etc/httpd/htdigest'
-      #  auth_require: 'valid-user'
-      #- location2:
-      #  provider: location
-      #  path: '/typo3/sysext'
+      - provider: location
+        path: '/typo3/'
+        auth_type: Digest
+        auth_name: mensch
+        auth_digest_provider: file
+        auth_digest_algorithm: MD5
+        auth_user_file: '/etc/httpd/htdigest'
+        auth_require: 'valid-user'
+      - location2:
+        provider: location
+        path: '/typo3/sysext'
     user: apache
     mode: '2775'
-    aliases:
-      - { alias: /wartung , path: /var/www/wartung }
-    error_documents:
-      - { error_code: 503 , document: "/wartung/index.html" }
   inqacheck:
     version: '6.2.31'
     site_path: '/srv/www/inqa-check'
@@ -348,28 +322,19 @@ infra::profile::typo3::projects:
     ssl_key: '/etc/pki/tls/private/wildcard.inqa-check.de-key.pem'
     ssl_chain: '/etc/pki/tls/certs/wildcard.inqa-check.de-cert.pem'
     directories:
-      - error_docs:
-        provider: directory
-        path: '/var/www/wartung'
-      #- provider: location
-      #  path: '/typo3/'
-      #  auth_type: Digest
-      #  auth_name: inqacheck
-      #  auth_digest_provider: file
-      #  auth_digest_algorithm: MD5
-      #  auth_user_file: '/etc/httpd/htdigest'
-      #  auth_require: 'valid-user'
+      - provider: location
+        path: '/typo3/'
+        auth_type: Digest
+        auth_name: inqacheck
+        auth_digest_provider: file
+        auth_digest_algorithm: MD5
+        auth_user_file: '/etc/httpd/htdigest'
+        auth_require: 'valid-user'
     user: apache
     mode: '2775'
     php_admin_value:
       memory_limit: 256M
     rewrites:
-      - alias:
-        comment: 'Maintenance'
-        rewrite_cond:
-          - '%%{ich-trickse}{REQUEST_URI} !=/wartung/index.html'
-        rewrite_rule:
-          - '^.*$ - [R=503,L]'
       - wrong_alias:
         comment: 'Rewrite falsch kommunizierter Domains psyga-check'
         rewrite_cond:
@@ -390,10 +355,6 @@ infra::profile::typo3::projects:
           - '%%{ich-trickse}{HTTPS} !=on'
         rewrite_rule:
           - '(.*) https://%%{ich-trickse}{HTTP_HOST}%%{ich-trickse}{REQUEST_URI} [R=301,L]'
-    aliases:
-      - { alias: /wartung , path: /var/www/wartung }
-    error_documents:
-      - { error_code: 503 , document: "/wartung/index.html" }
   # laeuft in der selben Docroot wie inqacheck, muss aber aufgrund von gesonderter Konfiguration in einen seperaten VHost laufen
   unternehmenscheck:
     version: '6.2.31'
@@ -413,32 +374,18 @@ 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'
-      #- provider: location
-      #  path: '/typo3/'
-      #  auth_type: Digest
-      #  auth_name: fachkraefte
-      #  auth_digest_provider: file
-      #  auth_digest_algorithm: MD5
-      #  auth_user_file: '/etc/httpd/htdigest'
-      #  auth_require: 'valid-user'
+      - provider: location
+        path: '/typo3/'
+        auth_type: Digest
+        auth_name: fachkraefte
+        auth_digest_provider: file
+        auth_digest_algorithm: MD5
+        auth_user_file: '/etc/httpd/htdigest'
+        auth_require: 'valid-user'
     user: apache
     mode: '2775'
     php_admin_value:
       memory_limit: 256M
-    rewrites:
-      - alias:
-        comment: 'Maintenance'
-        rewrite_cond:
-          - '%%{ich-trickse}{REQUEST_URI} !=/wartung/index.html'
-        rewrite_rule:
-          - '^.*$ - [R=503,L]'
-    aliases:
-      - { alias: /wartung , path: /var/www/wartung }
-    error_documents:
-      - { error_code: 503 , document: "/wartung/index.html" }
   # laeuft in der selben Docroot wie inqacheck, muss aber aufgrund von gesonderter Konfiguration in einen seperaten VHost laufen
   beschaeftigtencheck:
     version: '6.2.31'
@@ -458,32 +405,18 @@ 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'
-      #- provider: location
-      #  path: '/'
-      #  auth_type: Digest
-      #  auth_name: fachkraefte
-      #  auth_digest_provider: file
-      #  auth_digest_algorithm: MD5
-      #  auth_user_file: '/etc/httpd/htdigest'
-      #  auth_require: 'valid-user'
+      - provider: location
+        path: '/'
+        auth_type: Digest
+        auth_name: fachkraefte
+        auth_digest_provider: file
+        auth_digest_algorithm: MD5
+        auth_user_file: '/etc/httpd/htdigest'
+        auth_require: 'valid-user'
     user: apache
     mode: '2775'
     php_admin_value:
       memory_limit: 256M
-    rewrites:
-      - alias:
-        comment: 'Maintenance'
-        rewrite_cond:
-          - '%%{ich-trickse}{REQUEST_URI} !=/wartung/index.html'
-        rewrite_rule:
-          - '^.*$ - [R=503,L]'
-    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'
@@ -502,17 +435,14 @@ infra::profile::typo3::projects:
     ssl_key: '/etc/pki/tls/private/www.fis-netzwerk.de-key.pem'
     ssl_chain: '/etc/pki/tls/certs/www.fis-netzwerk.de-cert.pem'
     directories:
-      - error_docs:
-        provider: directory
-        path: '/var/www/wartung'
-      #- provider: location
-      #  path: '/typo3/'
-      #  auth_type: Digest
-      #  auth_name: fisnetzwerk
-      #  auth_digest_provider: file
-      #  auth_digest_algorithm: MD5
-      #  auth_user_file: '/etc/httpd/htdigest'
-      #  auth_require: 'valid-user'
+      - provider: location
+        path: '/typo3/'
+        auth_type: Digest
+        auth_name: fisnetzwerk
+        auth_digest_provider: file
+        auth_digest_algorithm: MD5
+        auth_user_file: '/etc/httpd/htdigest'
+        auth_require: 'valid-user'
     user: apache
     mode: '2775'
     rewrites_no_ssl:
@@ -526,14 +456,3 @@ infra::profile::typo3::projects:
     php_admin_value:
       always_populate_raw_post_data: '-1'
       max_input_vars: 1500
-    rewrites:
-      - alias:
-        comment: 'Maintenance'
-        rewrite_cond:
-          - '%%{ich-trickse}{REQUEST_URI} !=/wartung/index.html'
-        rewrite_rule:
-          - '^.*$ - [R=503,L]'
-    aliases:
-      - { alias: /wartung , path: /var/www/wartung }
-    error_documents:
-      - { error_code: 503 , document: "/wartung/index.html" }