From be163c523f75a0944902f55bac40128ca4f594c1 Mon Sep 17 00:00:00 2001 From: "sascha.strassheim" Date: Fri, 18 May 2018 11:56:04 +0200 Subject: [PATCH] mutlifix fbb-api --- .../fbb-passngr/dev-poi-fbb.pixelpark.net | 6 +-- customer/fbb-passngr/production.yaml | 2 +- customer/fbb-passngr/test.yaml | 2 +- .../fbb-passngr/tst-api01-fbb.pixelpark.net | 44 +++++++++++++++++++ .../fbb-passngr/tst-api02-fbb.pixelpark.net | 44 +++++++++++++++++++ .../fbb-passngr/tst-poi01-fbb.pixelpark.net | 44 +++++++++++++++++++ 6 files changed, 137 insertions(+), 5 deletions(-) diff --git a/customer/fbb-passngr/dev-poi-fbb.pixelpark.net b/customer/fbb-passngr/dev-poi-fbb.pixelpark.net index adf0f9d2..aed48854 100644 --- a/customer/fbb-passngr/dev-poi-fbb.pixelpark.net +++ b/customer/fbb-passngr/dev-poi-fbb.pixelpark.net @@ -4,9 +4,9 @@ infra::profile::apache::htdigest: www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAehSprUuT2bcqDE4AjYNKPjBXDyca2jgpQfl2q/RXHus2TMdQ6kl38qF+Z5ePFxJhMSI6VENX9SDAoRSBcpPgI8nXiXgf/AeLOJ5r2SrMFlETYgN5nYkYsEy5AOiopOpfiLYakSKJC6Vj1M+8Yz+ySdVooI03NtgAa/1jAuzvF3Ehn/D4hVOc3H56OVFJ6p/WAIGQkpPT42KrQUU1HGWLEMXgvYN1mKkbiZLDkzPvRGWkp1pBqcgfNS0d22FX6RbT2E1vm/1nFzouIerm+9XEyWCYTsOW9AVjVC73cXtI32fm/ufAdnCChQ2f941dZoA5uUwPPUQs3VDiIg2BVgi/sjA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBB9zJuMd8mHOR5dh8nWE7AQgBARcJQpnWD35UGtus+SMaP0] infra::profile::apache::pp_vhosts: - dev-api: + dev-poi: docroot: /var/www/poi - servername: dev-api-fbb.pixelpark.net + servername: dev-poi-fbb.pixelpark.net cert_servername: 'wildcard.pixelpark.net' cert_customer: 'pixelpark' ssl_cert: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem' @@ -18,7 +18,7 @@ infra::profile::apache::pp_vhosts: directories: - directory_root: provider: directory - path: '/var/www/api' + path: '/var/www/poi' addhandlers: - { handler: "proxy:unix:/var/run/php5-fpm-api.sock|fcgi://./" , extensions: '.php' } options: diff --git a/customer/fbb-passngr/production.yaml b/customer/fbb-passngr/production.yaml index 5cabaf68..e3a62686 100644 --- a/customer/fbb-passngr/production.yaml +++ b/customer/fbb-passngr/production.yaml @@ -36,7 +36,7 @@ php::settings: PHP/expose_php: 'Off' infra::profile::apache_php::fpm_pool: - symfony: + api: listen_owner: apache listen_group: apache pm_max_children: 20 diff --git a/customer/fbb-passngr/test.yaml b/customer/fbb-passngr/test.yaml index 2e2072e5..11358df6 100644 --- a/customer/fbb-passngr/test.yaml +++ b/customer/fbb-passngr/test.yaml @@ -53,7 +53,7 @@ php::settings: PHP/expose_php: 'Off' infra::profile::apache_php::fpm_pool: - symfony: + api: listen_owner: apache listen_group: apache pm_max_children: 20 diff --git a/customer/fbb-passngr/tst-api01-fbb.pixelpark.net b/customer/fbb-passngr/tst-api01-fbb.pixelpark.net index ed97d539..dc3ec87a 100644 --- a/customer/fbb-passngr/tst-api01-fbb.pixelpark.net +++ b/customer/fbb-passngr/tst-api01-fbb.pixelpark.net @@ -1 +1,45 @@ --- +infra::profile::apache::htdigest: + server: + www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAi7B5vSvLZSBDcOlVym8Mn0yOKPvW6EG9cNIihJTLNYTTuT4zNIKrrYqfacgpjwqsWuu18dNfneh8wZRaf9/QccZ+HIYTV7a/0tKJLcGhE+5Ltm1OJ+CBrB/mVoz1YVWS6OTQoK0gsTMLYlH5psvdpuWVkwudV1b56WCa/TL5iJqy3V+A5hbQjlQVcG2A6HHz1vyPh6gxAg6we6bc43Nmxw8cPDG+Am5H+i97b+/BVagd2pTNJu1341p7WhXcnKiRzKfHUj2YoxB2hxm1Jr9gyZoJOJP0h4o5oP1D9hUkdUiwu8TF0KPY6K7FjWN/EXX3EYqAOjm8CXJCjqmch0ajDTA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAbSXchRvjLyzx3FxAqhXSVgBDnaVLim4RWrpZgLQJhA0ea] + +infra::profile::apache::pp_vhosts: + tst-api: + docroot: /var/www/api + servername: tst-api01-fbb.pixelpark.net + cert_servername: 'wildcard.pixelpark.net' + cert_customer: 'pixelpark' + ssl_cert: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem' + ssl_chain: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem' + ssl_key: '/etc/pki/tls/private/wildcard.pixelpark.net-key.pem' + docroot_owner: apache + docroot_group: apache + docroot_mode: '2775' + directories: + - directory_root: + provider: directory + path: '/var/www/api' + addhandlers: + - { handler: "proxy:unix:/var/run/php5-fpm-api.sock|fcgi://./" , extensions: '.php' } + options: + - FollowSymLinks + - MultiViews + allow_override: + - All + directoryindex: index.php index.html + - 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' + rewrites: + - alias: + comment: 'Alles auf https umleiten' + rewrite_cond: + - '%%{ich-trickse}{HTTPS} !=on' + rewrite_rule: + - '(.*) https://%%{ich-trickse}{HTTP_HOST}%%{ich-trickse}{REQUEST_URI} [R=301,L]' diff --git a/customer/fbb-passngr/tst-api02-fbb.pixelpark.net b/customer/fbb-passngr/tst-api02-fbb.pixelpark.net index ed97d539..5f56ffd3 100644 --- a/customer/fbb-passngr/tst-api02-fbb.pixelpark.net +++ b/customer/fbb-passngr/tst-api02-fbb.pixelpark.net @@ -1 +1,45 @@ --- +infra::profile::apache::htdigest: + server: + www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEApLwtQtA38osTY/7lUdvIQofSDJzSVVGCiE7m3++ZB+AnZPB0ygy4fKWig+ESSVD1fny4BFnl2WK1/E5BbFxOYkOFYNIQwEeXBTfukf4EFx8CJ4EfRGoWi2G8u/hDVS2mG6VCV7G71yg5JbDpo5riR/tLlJV6pEbgPITIRQE8DJ+a6gYy1Zs+QiWHoZpmh7ZrXR8XQMEoYOMtGig1EIHEb8t1vT5QQQiCT0JqwLzG9gdwHNf8+W42A1xNfPcZlHX5aFhUwDo+AQkn1Z5/C8Z2t44f/Sbd79D8T6UdIv+Ji98i47V1zFlbSe9DntU6yBa+pIPG+MHVPGuqoGBDOSxJFTA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBYFlJNLjZNOjB+ZJfS6OLTgBBfrWwrqWzTXq2m+8Up6oj1] + +infra::profile::apache::pp_vhosts: + dev-api: + docroot: /var/www/api + servername: tst-api02-fbb.pixelpark.net + cert_servername: 'wildcard.pixelpark.net' + cert_customer: 'pixelpark' + ssl_cert: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem' + ssl_chain: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem' + ssl_key: '/etc/pki/tls/private/wildcard.pixelpark.net-key.pem' + docroot_owner: apache + docroot_group: apache + docroot_mode: '2775' + directories: + - directory_root: + provider: directory + path: '/var/www/api' + addhandlers: + - { handler: "proxy:unix:/var/run/php5-fpm-api.sock|fcgi://./" , extensions: '.php' } + options: + - FollowSymLinks + - MultiViews + allow_override: + - All + directoryindex: index.php index.html + - 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' + rewrites: + - alias: + comment: 'Alles auf https umleiten' + rewrite_cond: + - '%%{ich-trickse}{HTTPS} !=on' + rewrite_rule: + - '(.*) https://%%{ich-trickse}{HTTP_HOST}%%{ich-trickse}{REQUEST_URI} [R=301,L]' diff --git a/customer/fbb-passngr/tst-poi01-fbb.pixelpark.net b/customer/fbb-passngr/tst-poi01-fbb.pixelpark.net index ed97d539..f6ef8bba 100644 --- a/customer/fbb-passngr/tst-poi01-fbb.pixelpark.net +++ b/customer/fbb-passngr/tst-poi01-fbb.pixelpark.net @@ -1 +1,45 @@ --- +infra::profile::apache::htdigest: + server: + www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEASk8/3kNoClMHZHyGqyEMn4iOhPPrpEPGoR7Wdp4J7kcTB5meRWI12d/mkX5TVFP1LmqgAWEaC1anYMYALcQTSAdJNKLmRdQZiVM+nzMk6nMib4EmLUes63BKPYQH+n18l+q+CFS3E56Rj5oMw9Tg3EF3/JVr7R40LXB9EudTLJUvcFgf0ZYm+e+uODB5YuGlAg9F5hsTpUMr1H5/SftMUNGJeONKxbxVj0cxPYz+RLTGEcxZoomjDiaNjkqiiUPXjuuZ+OZtE2yPPsQll7ys6YIe+wLWuPh/YrAlLlE678GXswFLMj1jb1gZxS0aJbuvJBY9th+UCqCCgrgfOGZUNjA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCqRSDJf4E7Y7ljab/MgdyigBAMce/wX9yR6dQLVjN2Y9ue] + +infra::profile::apache::pp_vhosts: + tst-poi: + docroot: /var/www/poi + servername: tst-poi01-fbb.pixelpark.net + cert_servername: 'wildcard.pixelpark.net' + cert_customer: 'pixelpark' + ssl_cert: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem' + ssl_chain: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem' + ssl_key: '/etc/pki/tls/private/wildcard.pixelpark.net-key.pem' + docroot_owner: apache + docroot_group: apache + docroot_mode: '2775' + directories: + - directory_root: + provider: directory + path: '/var/www/poi' + addhandlers: + - { handler: "proxy:unix:/var/run/php5-fpm-api.sock|fcgi://./" , extensions: '.php' } + options: + - FollowSymLinks + - MultiViews + allow_override: + - All + directoryindex: index.php index.html + - 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' + rewrites: + - alias: + comment: 'Alles auf https umleiten' + rewrite_cond: + - '%%{ich-trickse}{HTTPS} !=on' + rewrite_rule: + - '(.*) https://%%{ich-trickse}{HTTP_HOST}%%{ich-trickse}{REQUEST_URI} [R=301,L]' -- 2.39.5