From 7d08cda709553c7fe913e155a6032e4d5a519209 Mon Sep 17 00:00:00 2001 From: sambufe Date: Thu, 18 May 2017 09:06:26 +0200 Subject: [PATCH] FBBKERNSERV-34 ws live --- .../fbb-ws/prd-ws01-fbb.pixelpark.net.yaml | 117 ++++++++++++++++++ .../fbb-ws/prd-ws02-fbb.pixelpark.net.yaml | 117 ++++++++++++++++++ .../fbb-ws/tst-ws02-fbb.pixelpark.net.yaml | 2 +- 3 files changed, 235 insertions(+), 1 deletion(-) diff --git a/customer/fbb-ws/prd-ws01-fbb.pixelpark.net.yaml b/customer/fbb-ws/prd-ws01-fbb.pixelpark.net.yaml index 3b0442d3..92b8d114 100644 --- a/customer/fbb-ws/prd-ws01-fbb.pixelpark.net.yaml +++ b/customer/fbb-ws/prd-ws01-fbb.pixelpark.net.yaml @@ -1,2 +1,119 @@ --- 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 + +apache::default_vhost: false + +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: prd-ws-fbb.pixelpark.net + serveraliases: + - ws.berlin-airport.de + - ws01.berlin-airport.de + - prd-ws01-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 + 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: prd-cdmws-fbb.pixelpark.net + serveraliases: + - cdmws.berlin-airport.de + - cdmws01.berlin-airport.de + - prd-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 + 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/prd-ws02-fbb.pixelpark.net.yaml b/customer/fbb-ws/prd-ws02-fbb.pixelpark.net.yaml index 3b0442d3..1d067ca6 100644 --- a/customer/fbb-ws/prd-ws02-fbb.pixelpark.net.yaml +++ b/customer/fbb-ws/prd-ws02-fbb.pixelpark.net.yaml @@ -1,2 +1,119 @@ --- 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 + +apache::default_vhost: false + +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: prd-ws-fbb.pixelpark.net + serveraliases: + - ws.berlin-airport.de + - ws02.berlin-airport.de + - prd-ws02-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 + 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: prd-cdmws-fbb.pixelpark.net + serveraliases: + - cdmws.berlin-airport.de + - cdmws02.berlin-airport.de + - prd-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 + 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 index 1e313bbe..25e6c944 100644 --- a/customer/fbb-ws/tst-ws02-fbb.pixelpark.net.yaml +++ b/customer/fbb-ws/tst-ws02-fbb.pixelpark.net.yaml @@ -87,7 +87,7 @@ infra::profile::apache::pp_vhosts: servername: tst-cdmws-fbb.pixelpark.net serveraliases: - tstcdmws.berlin-airport.de - - cdmtstws02.berlin-airport.de + - tstcdmws02.berlin-airport.de - tst-cdmws02-fbb.pixelpark.net ssl: false docroot_owner: apache -- 2.39.5