From 5bdf05efbe43fe32e95375d41b460e7112db7dd6 Mon Sep 17 00:00:00 2001 From: sambufe Date: Mon, 29 May 2017 14:11:25 +0200 Subject: [PATCH] prd-fbb-www rewrites --- .../fbb-www/prd-www01-fbb.pixelpark.net.yaml | 61 ------------------- .../fbb-www/prd-www02-fbb.pixelpark.net.yaml | 61 ------------------- customer/fbb-www/test.yaml | 2 +- 3 files changed, 1 insertion(+), 123 deletions(-) diff --git a/customer/fbb-www/prd-www01-fbb.pixelpark.net.yaml b/customer/fbb-www/prd-www01-fbb.pixelpark.net.yaml index 1c6b3159..3b0442d3 100644 --- a/customer/fbb-www/prd-www01-fbb.pixelpark.net.yaml +++ b/customer/fbb-www/prd-www01-fbb.pixelpark.net.yaml @@ -1,63 +1,2 @@ --- 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: - berlin-airport: - 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: - berlin-airport: - docroot: '/var/www/berlin-airport/web' - servername: prd-www-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/berlin-airport/web" - addhandlers: - - { handler: "proxy:unix:/var/run/php5-fpm-berlin-airport.sock|fcgi://./" , extensions: '.php' } - options: - - FollowSymLinks - allow_override: - - All diff --git a/customer/fbb-www/prd-www02-fbb.pixelpark.net.yaml b/customer/fbb-www/prd-www02-fbb.pixelpark.net.yaml index 1c6b3159..3b0442d3 100644 --- a/customer/fbb-www/prd-www02-fbb.pixelpark.net.yaml +++ b/customer/fbb-www/prd-www02-fbb.pixelpark.net.yaml @@ -1,63 +1,2 @@ --- 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: - berlin-airport: - 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: - berlin-airport: - docroot: '/var/www/berlin-airport/web' - servername: prd-www-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/berlin-airport/web" - addhandlers: - - { handler: "proxy:unix:/var/run/php5-fpm-berlin-airport.sock|fcgi://./" , extensions: '.php' } - options: - - FollowSymLinks - allow_override: - - All diff --git a/customer/fbb-www/test.yaml b/customer/fbb-www/test.yaml index 6df22af7..427a0df1 100644 --- a/customer/fbb-www/test.yaml +++ b/customer/fbb-www/test.yaml @@ -585,7 +585,7 @@ infra::profile::apache::pp_vhosts: - '%%{ich-trickse}{HTTP_HOST} ^berlin-airport.de$' rewrite_rule: - '^(.*)$ http://www.berlin-airport.de$1 [R=301,L]' - #HTTPS Rewrites TODO (Prüfen ob reinfolge eingehalten wird) + #HTTPS Rewrites - comment: 'Nachgeladene Ressourcen sollen bei den Nachfolgenden HTTPS Rewrites aussen vor sein' rewrite_cond: - '%%{ich-trickse}{REQUEST_URI} /(_images|_docroot|favicon|_flughafenplan|_errors)' -- 2.39.5