From: Philipp Dallig <philipp.dallig@pixelpark.com>
Date: Tue, 6 Jun 2017 09:13:19 +0000 (+0200)
Subject: fbb-ws - merge tst-ws01 and tst-ws02
X-Git-Tag: v0.1.0~2855
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=7b357e95e8d9f9b0c14e7958a662ef0c781399d1;p=pixelpark%2Fhiera.git

fbb-ws - merge tst-ws01 and tst-ws02
---

diff --git a/customer/fbb-ws/test.yaml b/customer/fbb-ws/test.yaml
new file mode 100644
index 00000000..da6f5b45
--- /dev/null
+++ b/customer/fbb-ws/test.yaml
@@ -0,0 +1,130 @@
+---
+infra::role: base
+infra::additional_classes:
+  - infra::profile::apache_php
+
+sudo::configs:
+  jenkins_rights:
+    priority: "06"
+    content: |
+      jenkins ALL=(apache) NOPASSWD: ALL
+
+repo::remi_php71: true
+
+php::fpm::pools:
+  www:
+    ensure: absent
+
+infra::profile::apache_php::fpm_pool:
+  webservice:
+    listen_owner: apache
+    listen_group: apache
+  cdm-webservice:
+    listen_owner: apache
+    listen_group: apache
+
+php::extensions:
+  gd: {}
+  mysqlnd: {}
+  pecl-ssh2: {}
+  xml: {}
+
+php::settings:
+  PHP/serialize_precision: 100
+  PHP/memory_limit: 256M
+  PHP/display_errors: On #remove on live!
+  PHP/post_max_size: 20M
+  PHP/register_globals: Off
+  PHP/upload_max_filesize: 4M
+  PHP/max_file_uploads: 50
+  PHP/include_path: '.:/opt/app/ZendFramework/library:/opt/app/web' #muss angepasst werden
+
+infra::profile::apache::htdigest:
+  server:
+    www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAQkzCNaKrUkNv5Jeq7Ebr53aJX3KDt5n9kI7yy050w71v1LrpdAkkESTZeuKLLjswjcMC5ICL5wMSwn+7aj6Gcn259EECdsVZydD/VMsSHEVN3aLUrByNuM4+mFpK0Jthi0hi8zqcej5e3mdQPiT6gcfai29htoPHS23zruLnNIkmJ62tpcWaGrYp+eXVVm522jbmL/+oewNv/6YFUrYBPXdomznkC/ReGB1YG/fbz3Vt5UaWFbZ19+8YxHHMlT5nyvkGNsWhVKKeSDgacDLJ9Gr0zw/iFs1lLojEGt9HarRYWtSGt5PbhhYLxtt75OLU+BA0q/gZTbGiHvguQ2rwqjA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCIaKd8NKWcQ5fw1bElllIogBDy3gDC0xHpz9Zxv4+6nRST]
+
+infra::profile::apache::pp_vhosts:
+  webservice:
+    docroot: '/var/www/webservice/web'
+    servername: tst-ws-fbb.pixelpark.net
+    serveraliases:
+      - tstws.berlin-airport.de
+      - tstws01.berlin-airport.de
+      - tstws02.berlin-airport.de
+      - tst-ws01-fbb.pixelpark.net
+      - tst-ws02-fbb.pixelpark.net
+    ssl: false
+    default_vhost: true
+    docroot_owner: apache
+    docroot_group: apache
+    setenv:
+      - AIRLINE_DATA /www/data/fiona/app/online/docs/_airlines/index.php
+      - POI_CMS_EXPORT_FILE /www/data/fiona/app/online/docs/poiExport/index.php
+    headers:
+      - 'set X-Content-Type-Options: nosniff'
+      - 'set X-XSS-Protection: "1; mode=block"'
+      - 'set X-Frame-Options: DENY'
+    directories:
+      - provider: 'directory'
+        path: "/var/www/webservice/web"
+        addhandlers:
+          - { handler: "proxy:unix:/var/run/php5-fpm-webservice.sock|fcgi://./" , extensions: '.php' }
+        options:
+          - FollowSymLinks
+        allow_override:
+          - All
+      - provider: 'location'
+        path: '/webservices_conf'
+        require: 'all denied'
+      - provider: 'locationmatch'
+        path: '/webservices/(config.ini|certificates)'
+        require: 'all denied'
+      - provider: location
+        path: '/webservices/push'
+        auth_type: Digest
+        auth_name: 'server'
+        auth_digest_provider: file
+        auth_user_file: '/etc/httpd/htdigest'
+        auth_require: 'valid-user'
+
+  cdm-webservice:
+    docroot: '/var/www/cdm-webservice/web'
+    servername: tst-cdmws-fbb.pixelpark.net
+    serveraliases:
+      - tstcdmws.berlin-airport.de
+      - tstcdmws01.berlin-airport.de
+      - tstcdmws02.berlin-airport.de
+      - tst-cdmws01-fbb.pixelpark.net
+      - tst-cdmws02-fbb.pixelpark.net
+    ssl: false
+    docroot_owner: apache
+    docroot_group: apache
+    setenv:
+      - AIRLINE_DATA /www/data/fiona/app/online/docs/_airlines/index.php
+      - POI_CMS_EXPORT_FILE /www/data/fiona/app/online/docs/poiExport/index.php
+    headers:
+      - 'set X-Content-Type-Options: nosniff'
+      - 'set X-XSS-Protection: "1; mode=block"'
+      - 'set X-Frame-Options: DENY'
+    directories:
+      - provider: 'directory'
+        path: "/var/www/cdm-webservice/web"
+        addhandlers:
+          - { handler: "proxy:unix:/var/run/php5-fpm-cdm-webservice.sock|fcgi://./" , extensions: '.php' }
+        options:
+          - FollowSymLinks
+        allow_override:
+          - All
+      - provider: 'location'
+        path: '/webservices_conf'
+        require: 'all denied'
+      - provider: 'locationmatch'
+        path: '/webservices/(config.ini|certificates)'
+        require: 'all denied'
+      - provider: location
+        path: '/webservices/push'
+        auth_type: Digest
+        auth_name: 'server'
+        auth_digest_provider: file
+        auth_user_file: '/etc/httpd/htdigest'
+        auth_require: 'valid-user'
diff --git a/customer/fbb-ws/tst-ws01-fbb.pixelpark.net.yaml b/customer/fbb-ws/tst-ws01-fbb.pixelpark.net.yaml
deleted file mode 100644
index d19c8d2c..00000000
--- a/customer/fbb-ws/tst-ws01-fbb.pixelpark.net.yaml
+++ /dev/null
@@ -1,126 +0,0 @@
----
-infra::role: base
-infra::additional_classes:
-  - infra::profile::apache_php
-
-sudo::configs:
-  jenkins_rights:
-    priority: "06"
-    content: |
-      jenkins ALL=(apache) NOPASSWD: ALL
-
-repo::remi_php71: true
-
-php::fpm::pools:
-  www:
-    ensure: absent
-
-infra::profile::apache_php::fpm_pool:
-  webservice:
-    listen_owner: apache
-    listen_group: apache
-  cdm-webservice:
-    listen_owner: apache
-    listen_group: apache
-
-php::extensions:
-  gd: {}
-  mysqlnd: {}
-  pecl-ssh2: {}
-  xml: {}
-
-php::settings:
-  PHP/serialize_precision: 100
-  PHP/memory_limit: 256M
-  PHP/display_errors: On #remove on live!
-  PHP/post_max_size: 20M
-  PHP/register_globals: Off
-  PHP/upload_max_filesize: 4M
-  PHP/max_file_uploads: 50
-  PHP/include_path: '.:/opt/app/ZendFramework/library:/opt/app/web' #muss angepasst werden
-
-infra::profile::apache::htdigest:
-  server:
-    www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAQkzCNaKrUkNv5Jeq7Ebr53aJX3KDt5n9kI7yy050w71v1LrpdAkkESTZeuKLLjswjcMC5ICL5wMSwn+7aj6Gcn259EECdsVZydD/VMsSHEVN3aLUrByNuM4+mFpK0Jthi0hi8zqcej5e3mdQPiT6gcfai29htoPHS23zruLnNIkmJ62tpcWaGrYp+eXVVm522jbmL/+oewNv/6YFUrYBPXdomznkC/ReGB1YG/fbz3Vt5UaWFbZ19+8YxHHMlT5nyvkGNsWhVKKeSDgacDLJ9Gr0zw/iFs1lLojEGt9HarRYWtSGt5PbhhYLxtt75OLU+BA0q/gZTbGiHvguQ2rwqjA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCIaKd8NKWcQ5fw1bElllIogBDy3gDC0xHpz9Zxv4+6nRST]
-
-infra::profile::apache::pp_vhosts:
-  webservice:
-    docroot: '/var/www/webservice/web'
-    servername: tst-ws-fbb.pixelpark.net
-    serveraliases:
-      - tstws.berlin-airport.de
-      - tstws01.berlin-airport.de
-      - tst-ws01-fbb.pixelpark.net
-    ssl: false
-    default_vhost: true
-    docroot_owner: apache
-    docroot_group: apache
-    setenv:
-      - AIRLINE_DATA /www/data/fiona/app/online/docs/_airlines/index.php
-      - POI_CMS_EXPORT_FILE /www/data/fiona/app/online/docs/poiExport/index.php
-    headers:
-      - 'set X-Content-Type-Options: nosniff'
-      - 'set X-XSS-Protection: "1; mode=block"'
-      - 'set X-Frame-Options: DENY'
-    directories:
-      - provider: 'directory'
-        path: "/var/www/webservice/web"
-        addhandlers:
-          - { handler: "proxy:unix:/var/run/php5-fpm-webservice.sock|fcgi://./" , extensions: '.php' }
-        options:
-          - FollowSymLinks
-        allow_override:
-          - All
-      - provider: 'location'
-        path: '/webservices_conf'
-        require: 'all denied'
-      - provider: 'locationmatch'
-        path: '/webservices/(config.ini|certificates)'
-        require: 'all denied'
-      - provider: location
-        path: '/webservices/push'
-        auth_type: Digest
-        auth_name: 'server'
-        auth_digest_provider: file
-        auth_user_file: '/etc/httpd/htdigest'
-        auth_require: 'valid-user'
-
-  cdm-webservice:
-    docroot: '/var/www/cdm-webservice/web'
-    servername: tst-cdmws-fbb.pixelpark.net
-    serveraliases:
-      - tstcdmws.berlin-airport.de
-      - tstcdmws01.berlin-airport.de
-      - tst-cdmws01-fbb.pixelpark.net
-    ssl: false
-    docroot_owner: apache
-    docroot_group: apache
-    setenv:
-      - AIRLINE_DATA /www/data/fiona/app/online/docs/_airlines/index.php
-      - POI_CMS_EXPORT_FILE /www/data/fiona/app/online/docs/poiExport/index.php
-    headers:
-      - 'set X-Content-Type-Options: nosniff'
-      - 'set X-XSS-Protection: "1; mode=block"'
-      - 'set X-Frame-Options: DENY'
-    directories:
-      - provider: 'directory'
-        path: "/var/www/cdm-webservice/web"
-        addhandlers:
-          - { handler: "proxy:unix:/var/run/php5-fpm-cdm-webservice.sock|fcgi://./" , extensions: '.php' }
-        options:
-          - FollowSymLinks
-        allow_override:
-          - All
-      - provider: 'location'
-        path: '/webservices_conf'
-        require: 'all denied'
-      - provider: 'locationmatch'
-        path: '/webservices/(config.ini|certificates)'
-        require: 'all denied'
-      - provider: location
-        path: '/webservices/push'
-        auth_type: Digest
-        auth_name: 'server'
-        auth_digest_provider: file
-        auth_user_file: '/etc/httpd/htdigest'
-        auth_require: 'valid-user'
diff --git a/customer/fbb-ws/tst-ws02-fbb.pixelpark.net.yaml b/customer/fbb-ws/tst-ws02-fbb.pixelpark.net.yaml
deleted file mode 100644
index cdd8ba54..00000000
--- a/customer/fbb-ws/tst-ws02-fbb.pixelpark.net.yaml
+++ /dev/null
@@ -1,126 +0,0 @@
----
-infra::role: base
-infra::additional_classes:
-  - infra::profile::apache_php
-
-sudo::configs:
-  jenkins_rights:
-    priority: "06"
-    content: |
-      jenkins ALL=(apache) NOPASSWD: ALL
-
-repo::remi_php71: true
-
-php::fpm::pools:
-  www:
-    ensure: absent
-
-infra::profile::apache_php::fpm_pool:
-  webservice:
-    listen_owner: apache
-    listen_group: apache
-  cdm-webservice:
-    listen_owner: apache
-    listen_group: apache
-
-php::extensions:
-  gd: {}
-  mysqlnd: {}
-  pecl-ssh2: {}
-  xml: {}
-
-php::settings:
-  PHP/serialize_precision: 100
-  PHP/memory_limit: 256M
-  PHP/display_errors: On #remove on live!
-  PHP/post_max_size: 20M
-  PHP/register_globals: Off
-  PHP/upload_max_filesize: 4M
-  PHP/max_file_uploads: 50
-  PHP/include_path: '.:/opt/app/ZendFramework/library:/opt/app/web' #muss angepasst werden
-
-infra::profile::apache::htdigest:
-  server:
-    www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAQkzCNaKrUkNv5Jeq7Ebr53aJX3KDt5n9kI7yy050w71v1LrpdAkkESTZeuKLLjswjcMC5ICL5wMSwn+7aj6Gcn259EECdsVZydD/VMsSHEVN3aLUrByNuM4+mFpK0Jthi0hi8zqcej5e3mdQPiT6gcfai29htoPHS23zruLnNIkmJ62tpcWaGrYp+eXVVm522jbmL/+oewNv/6YFUrYBPXdomznkC/ReGB1YG/fbz3Vt5UaWFbZ19+8YxHHMlT5nyvkGNsWhVKKeSDgacDLJ9Gr0zw/iFs1lLojEGt9HarRYWtSGt5PbhhYLxtt75OLU+BA0q/gZTbGiHvguQ2rwqjA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCIaKd8NKWcQ5fw1bElllIogBDy3gDC0xHpz9Zxv4+6nRST]
-
-infra::profile::apache::pp_vhosts:
-  webservice:
-    docroot: '/var/www/webservice/web'
-    servername: tst-ws-fbb.pixelpark.net
-    serveraliases:
-      - tstws.berlin-airport.de
-      - tstws02.berlin-airport.de
-      - tst-ws02-fbb.pixelpark.net
-    ssl: false
-    default_vhost: true
-    docroot_owner: apache
-    docroot_group: apache
-    setenv:
-      - AIRLINE_DATA /www/data/fiona/app/online/docs/_airlines/index.php
-      - POI_CMS_EXPORT_FILE /www/data/fiona/app/online/docs/poiExport/index.php
-    headers:
-      - 'set X-Content-Type-Options: nosniff'
-      - 'set X-XSS-Protection: "1; mode=block"'
-      - 'set X-Frame-Options: DENY'
-    directories:
-      - provider: 'directory'
-        path: "/var/www/webservice/web"
-        addhandlers:
-          - { handler: "proxy:unix:/var/run/php5-fpm-webservice.sock|fcgi://./" , extensions: '.php' }
-        options:
-          - FollowSymLinks
-        allow_override:
-          - All
-      - provider: 'location'
-        path: '/webservices_conf'
-        require: 'all denied'
-      - provider: 'locationmatch'
-        path: '/webservices/(config.ini|certificates)'
-        require: 'all denied'
-      - provider: location
-        path: '/webservices/push'
-        auth_type: Digest
-        auth_name: 'server'
-        auth_digest_provider: file
-        auth_user_file: '/etc/httpd/htdigest'
-        auth_require: 'valid-user'
-
-  cdm-webservice:
-    docroot: '/var/www/cdm-webservice/web'
-    servername: tst-cdmws-fbb.pixelpark.net
-    serveraliases:
-      - tstcdmws.berlin-airport.de
-      - tstcdmws02.berlin-airport.de
-      - tst-cdmws02-fbb.pixelpark.net
-    ssl: false
-    docroot_owner: apache
-    docroot_group: apache
-    setenv:
-      - AIRLINE_DATA /www/data/fiona/app/online/docs/_airlines/index.php
-      - POI_CMS_EXPORT_FILE /www/data/fiona/app/online/docs/poiExport/index.php
-    headers:
-      - 'set X-Content-Type-Options: nosniff'
-      - 'set X-XSS-Protection: "1; mode=block"'
-      - 'set X-Frame-Options: DENY'
-    directories:
-      - provider: 'directory'
-        path: "/var/www/cdm-webservice/web"
-        addhandlers:
-          - { handler: "proxy:unix:/var/run/php5-fpm-cdm-webservice.sock|fcgi://./" , extensions: '.php' }
-        options:
-          - FollowSymLinks
-        allow_override:
-          - All
-      - provider: 'location'
-        path: '/webservices_conf'
-        require: 'all denied'
-      - provider: 'locationmatch'
-        path: '/webservices/(config.ini|certificates)'
-        require: 'all denied'
-      - provider: location
-        path: '/webservices/push'
-        auth_type: Digest
-        auth_name: 'server'
-        auth_digest_provider: file
-        auth_user_file: '/etc/httpd/htdigest'
-        auth_require: 'valid-user'