spk-spar-checker configs optimiert

diff --git a/customer/spk-spar-checker/production.yaml b/customer/spk-spar-checker/production.yaml
index d7ec9d6186afc0813b5395faa51f7b757d53f56a..8b4532d6fc1a149e2b01279730b4a41cfa273417 100644 (file)
--- a/customer/spk-spar-checker/production.yaml
+++ b/customer/spk-spar-checker/production.yaml
@@ -19,3 +19,41 @@ infra::profile::mysql_server::databases:
 infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAPXzUOIQdrthx6nUbiPHoEC50cSmD1/wtCANCpMsvk23Iwzjd17Rd6Fn3nV4tPDhEkctoMxkEqvuUEUzxhWrNZtSWarzicRcnM1tIxoloUAzXH1/eSXwGdJgRGpdLOfKWGHJAUU2lRPuKcZvRCK8Ic5eXNXQwmvK5fxOHHNlOf4PVfgNRS2zElKKrSpnanB3inSDxumN0wDTZHWQvQ6JfYMHgTPQdPXWLTSRr05wTvd308hUtE9K8o9uULEc89LmoTNFH1pyE7no82kNqmJS2GVfCdH2lIJD3QmJYocR3bXH+JVLhtL5aNnI5ObRgttHtl30h1R6CuajtVvVOrgn6kjA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDWWdRsc52vq4Rohl4ounazgBBmIWlsU0GfdMm769kzNrFx]
+
+infra::profile::apache::pp_vhosts:
+  sparchecker:
+    docroot: /var/www/spar-checker
+    servername: spar-checker.de
+    serveraliases:
+      - web01-spar-checker-de.pixelpark.net
+      - web02-spar-checker-de.pixelpark.net
+      - spar-checker-de.pixelpark.net
+      - sparkasse-sparchecker.de
+      - www.spar-checker.de
+      - www.sparkasse-sparchecker.de
+    ssl: false
+    docroot_owner: apache
+    docroot_group: apache
+    docroot_mode: '0775'
+    directories:
+      - directory_root:
+        provider: directory
+        path: '/var/www/spar-checker'
+        addhandlers:
+          - { handler: "proxy:unix:/var/run/php5-fpm-sparchecker.sock|fcgi://./" , extensions: '.php' }
+        options:
+          - FollowSymLinks
+          - MultiViews
+        allow_override:
+          - All
+        directoryindex: 'index.php'
+      - location1:
+        provider: location
+        path: '/'
+        auth_type: Digest
+        auth_name: server
+        auth_digest_provider: file
+        auth_digest_algorithm: MD5
+        auth_user_file: '/etc/httpd/htdigest'
+        auth_require: 'valid-user'
+

diff --git a/customer/spk-spar-checker/stage-web01-spar-checker-de.pixelpark.net.yaml b/customer/spk-spar-checker/stage-web01-spar-checker-de.pixelpark.net.yaml
index b5da0cc027d9d0e3253bffb5150786c436669821..4a1a759b87008ace3c5ebe1f54f42933a00ecb8f 100644 (file)
--- a/customer/spk-spar-checker/stage-web01-spar-checker-de.pixelpark.net.yaml
+++ b/customer/spk-spar-checker/stage-web01-spar-checker-de.pixelpark.net.yaml
@@ -8,35 +8,3 @@ mysql::server::override_options:
     log-bin: 'binlog'
     binlog-format: 'MIXED'
     binlog-ignore-db: 'performance_schema, information_schema'
-
-infra::profile::apache::pp_vhosts:
-  sparchecker:
-    docroot: /var/www/spar-checker
-    servername: stage-web01-spar-checker-de.pixelpark.net
-    serveraliases:
-      - stage-spar-checker-de.pixelpark.net
-    ssl: false
-    docroot_owner: apache
-    docroot_group: apache
-    docroot_mode: '0775'
-    directories:
-      - directory_root:
-        provider: directory
-        path: '/var/www/spar-checker'
-        addhandlers:
-          - { handler: "proxy:unix:/var/run/php5-fpm-sparchecker.sock|fcgi://./" , extensions: '.php' }
-        options:
-          - FollowSymLinks
-          - MultiViews
-        allow_override:
-          - All
-        directoryindex: 'index.php'
-      - location1:
-        provider: location
-        path: '/'
-        auth_type: Digest
-        auth_name: server
-        auth_digest_provider: file
-        auth_digest_algorithm: MD5
-        auth_user_file: '/etc/httpd/htdigest'
-        auth_require: 'valid-user'

diff --git a/customer/spk-spar-checker/stage-web02-spar-checker-de.pixelpark.net.yaml b/customer/spk-spar-checker/stage-web02-spar-checker-de.pixelpark.net.yaml
index edfee24cc8ab17cff70fd0b4616085834c382816..15f558382043639a05d38aed9ed45f1db3561c84 100644 (file)
--- a/customer/spk-spar-checker/stage-web02-spar-checker-de.pixelpark.net.yaml
+++ b/customer/spk-spar-checker/stage-web02-spar-checker-de.pixelpark.net.yaml
@@ -9,34 +9,3 @@ mysql::server::override_options:
     binlog-format: 'MIXED'
     binlog-ignore-db: 'performance_schema, information_schema'
 
-infra::profile::apache::pp_vhosts:
-  sparchecker:
-    docroot: /var/www/spar-checker
-    servername: stage-web02-spar-checker-de.pixelpark.net
-    serveraliases:
-      - stage-spar-checker-de.pixelpark.net
-    ssl: false
-    docroot_owner: apache
-    docroot_group: apache
-    docroot_mode: '0775'
-    directories:
-      - directory_root:
-        provider: directory
-        path: '/var/www/spar-checker'
-        addhandlers:
-          - { handler: "proxy:unix:/var/run/php5-fpm-sparchecker.sock|fcgi://./" , extensions: '.php' }
-        options:
-          - FollowSymLinks
-          - MultiViews
-        allow_override:
-          - All
-        directoryindex: 'index.php'
-      - location1:
-        provider: location
-        path: '/'
-        auth_type: Digest
-        auth_name: server
-        auth_digest_provider: file
-        auth_digest_algorithm: MD5
-        auth_user_file: '/etc/httpd/htdigest'
-        auth_require: 'valid-user'

diff --git a/customer/spk-spar-checker/test.yaml b/customer/spk-spar-checker/test.yaml
index ee40f95376d2ac3589783ba5c590e6b7404e3ff9..f4699fd59fc3ca8647d6ee8a2a7b6f66b6892bca 100644 (file)
--- a/customer/spk-spar-checker/test.yaml
+++ b/customer/spk-spar-checker/test.yaml
@@ -19,3 +19,36 @@ infra::profile::mysql_server::databases:
 infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAgaTs4v4M186pjYjcjEILHFMVdtz4n5FcysRYDbQQC27Ktcb3XEy7+lDAgnCuh5A2+uQgO5UxdUJQ+DTwvBiV7/3e4ZYSpfcOCmLqYz7GVCM3YottvVDDlG9q4w8QG/Zzakx8qFrrr7QC3VppG+X7Dm7e+Lb5lIk33MQ8Az5OOb9V6wnlObjhN7D1vkaMJP/LzTSdjfuMe0MSUCx+kT6Ckillq06gpW8J/4edrXYxrkmrYKOoUR1kSlXc48o1vClPw29qV3OIoOQAaLUFPKD7QtbGaCMWgQno3dRDyxkrhVuvrRl6SG9ozuEpnpbDe1TvH78rt3J6/RH1Kl3ahvWlozA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCttcrRUdZhsD+WuxTDqCdygBBqwtCddXMlVvPshhYJQZjB]
+
+infra::profile::apache::pp_vhosts:
+  sparchecker:
+    docroot: /var/www/spar-checker
+    servername: stage-spar-checker-de.pixelpark.net
+    serveraliases:
+      - stage-web01-spar-checker-de.pixelpark.net
+      - stage-web02-spar-checker-de.pixelpark.net
+    ssl: false
+    docroot_owner: apache
+    docroot_group: apache
+    docroot_mode: '0775'
+    directories:
+      - directory_root:
+        provider: directory
+        path: '/var/www/spar-checker'
+        addhandlers:
+          - { handler: "proxy:unix:/var/run/php5-fpm-sparchecker.sock|fcgi://./" , extensions: '.php' }
+        options:
+          - FollowSymLinks
+          - MultiViews
+        allow_override:
+          - All
+        directoryindex: 'index.php'
+      - location1:
+        provider: location
+        path: '/'
+        auth_type: Digest
+        auth_name: server
+        auth_digest_provider: file
+        auth_digest_algorithm: MD5
+        auth_user_file: '/etc/httpd/htdigest'
+        auth_require: 'valid-user'

diff --git a/customer/spk-spar-checker/web01-spar-checker-de.pixelpark.net.yaml b/customer/spk-spar-checker/web01-spar-checker-de.pixelpark.net.yaml
index 88b370dc015bba9bff182ef3f57aaa9406feb289..5088414bce82722b25d49ee96938ab82c2ac4cfd 100644 (file)
--- a/customer/spk-spar-checker/web01-spar-checker-de.pixelpark.net.yaml
+++ b/customer/spk-spar-checker/web01-spar-checker-de.pixelpark.net.yaml
@@ -9,38 +9,3 @@ mysql::server::override_options:
     binlog-format: 'MIXED'
     binlog-ignore-db: 'performance_schema, information_schema'
 
-infra::profile::apache::pp_vhosts:
-  sparchecker:
-    docroot: /var/www/spar-checker
-    servername: web01-spar-checker-de.pixelpark.net
-    serveraliases:
-      - spar-checker-de.pixelpark.net
-      - spar-checker.de
-      - sparkasse-sparchecker.de
-      - www.spar-checker.de
-      - www.sparkasse-sparchecker.de
-    ssl: false
-    docroot_owner: apache
-    docroot_group: apache
-    docroot_mode: '0775'
-    directories:
-      - directory_root:
-        provider: directory
-        path: '/var/www/spar-checker'
-        addhandlers:
-          - { handler: "proxy:unix:/var/run/php5-fpm-sparchecker.sock|fcgi://./" , extensions: '.php' }
-        options:
-          - FollowSymLinks
-          - MultiViews
-        allow_override:
-          - All
-        directoryindex: 'index.php'
-      - location1:
-        provider: location
-        path: '/'
-        auth_type: Digest
-        auth_name: server
-        auth_digest_provider: file
-        auth_digest_algorithm: MD5
-        auth_user_file: '/etc/httpd/htdigest'
-        auth_require: 'valid-user'

diff --git a/customer/spk-spar-checker/web02-spar-checker-de.pixelpark.net.yaml b/customer/spk-spar-checker/web02-spar-checker-de.pixelpark.net.yaml
index 7d076e26e8d0cead4c6a67f9f96a65e0bc78b820..357aca3337efe8249c7b6f8299653c3464517f75 100644 (file)
--- a/customer/spk-spar-checker/web02-spar-checker-de.pixelpark.net.yaml
+++ b/customer/spk-spar-checker/web02-spar-checker-de.pixelpark.net.yaml
@@ -8,39 +8,3 @@ mysql::server::override_options:
     log-bin: 'binlog'
     binlog-format: 'MIXED'
     binlog-ignore-db: 'performance_schema, information_schema'
-
-infra::profile::apache::pp_vhosts:
-  sparchecker:
-    docroot: /var/www/spar-checker
-    servername: web02-spar-checker-de.pixelpark.net
-    serveraliases:
-      - spar-checker-de.pixelpark.net
-      - spar-checker.de
-      - sparkasse-sparchecker.de
-      - www.spar-checker.de
-      - www.sparkasse-sparchecker.de
-    ssl: false
-    docroot_owner: apache
-    docroot_group: apache
-    docroot_mode: '0775'
-    directories:
-      - directory_root:
-        provider: directory
-        path: '/var/www/spar-checker'
-        addhandlers:
-          - { handler: "proxy:unix:/var/run/php5-fpm-sparchecker.sock|fcgi://./" , extensions: '.php' }
-        options:
-          - FollowSymLinks
-          - MultiViews
-        allow_override:
-          - All
-        directoryindex: 'index.php'
-      - location1:
-        provider: location
-        path: '/'
-        auth_type: Digest
-        auth_name: server
-        auth_digest_provider: file
-        auth_digest_algorithm: MD5
-        auth_user_file: '/etc/httpd/htdigest'
-        auth_require: 'valid-user'