From 9335b7243282a7e3f74e9b4e7ad8c2dd3c06e034 Mon Sep 17 00:00:00 2001 From: Philipp Dallig Date: Wed, 25 May 2016 14:16:30 +0200 Subject: [PATCH] mbvd - Update prototyp for new service-gipfel-mbvd-de.pixelpark.net --- .../web01-prototyp-mbvd-de.pixelpark.net.yaml | 46 +++++++++---------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/customer/mbvd/web01-prototyp-mbvd-de.pixelpark.net.yaml b/customer/mbvd/web01-prototyp-mbvd-de.pixelpark.net.yaml index 5427b2b5..f4800c9d 100644 --- a/customer/mbvd/web01-prototyp-mbvd-de.pixelpark.net.yaml +++ b/customer/mbvd/web01-prototyp-mbvd-de.pixelpark.net.yaml @@ -21,22 +21,25 @@ apache::default_vhost: false apache::mpm_module: worker site::profile::apache::htdigest: - pixelrealm: + prototyp: www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAmKczsli1+qJMcX5nAG6POnAG9/heSnbkMDdEImOtDarPrXMISm1JU1+bHn0KRQZr4R7juvrxbwnahX3h6wgFwIKDL3ghByJqzjuDlgP9PKmIGbe6O9wG0yiYWMqlP/YQ+rG6wdhbXP7CtQ6Cgn38nMLwoP0m9wF/bpMj7BkFer1cIJOWt98BpNw2y4sKB8W2iJQlAzppZDOERPbl2NrMkYEcXwxtZcJNSHrHRCIXLgG3/Qehq8n/eL4CSXvV8qlVg6FO16AcpTVzq2b1L2aUi9jRESQlM2dCzh3YI5mFqOrg//9pBp6FK0l5Jb53vx5EeIun/g+1jpXpSpFkoBuh8TA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBANPzHHNkJ8cZdF7zszKmNagBB1dMLOXE7DbetORag5zEtm] - -site::profile::apache::vhosts: - prototyp-mbvd-de: - docroot: /srv/www/prototyp-mbvd-de + service-gipfel: + www: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAN5wssDIQjSOgK0PFbI6+JLOObSJlrbQPZDXlTWqQl62+idoxnG/sYqzXWZboaJ9vqxwpRbwyZM+xjUw8I4qdODuwDbyCmgjpKtf+2RUVBzp8Y+ebGgGntoGMILlJMIRee1oPuDW3itSrytdwSR30C67AttGm9KIj8YAB/YNIQf9rerTQap9RPNLK+PpBn3/GNuphpwn8B5De/bY9wZKWjaXJ3Rr6bLfrgx94MzP5uySDHnrZU67Ax5eEvgTlb8/3VAN3uJXgBVjpMmE92KjDBXZ6HHk3jCGASAhJUP7Cb49ad5C9biZJAEV8L9bz4QmjbxRXNRjL/wfd1DWS0RQ6RTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAHmw5BOy0AERrx5X0MjNvagCDssj48/yM9cIpTp6/HsWLBRypAC8amRA7ndLaHcxVcyQ==] +site::profile::apache::pp_vhosts: + prototyp: + docroot: /srv/www/prototyp servername: web01-prototyp-mbvd-de.pixelpark.net - port: 80 - ip: 77.74.238.22 + serveraliases: + - prototyp.mbvd.de + - prototyp-mbvd-de.pixelpark.net + ssl: false docroot_owner: deploy.vogel docroot_group: root docroot_mode: '0755' directories: - directory_root: provider: directory - path: '/srv/www/prototyp-mbvd-de' + path: '/srv/www/prototyp' options: - FollowSymLinks - MultiViews @@ -46,29 +49,26 @@ site::profile::apache::vhosts: provider: location path: '/' auth_type: Digest - auth_name: pixelrealm + auth_name: prototyp auth_digest_provider: file auth_digest_algorithm: MD5 auth_user_file: '/etc/httpd/htdigest' auth_require: 'valid-user' proxy_pass: - { path: /, url: 'http://%{fqdn}:3000/' } - - prototyp-mbvd-de_ssl: - docroot: /srv/www/prototyp-mbvd-de - servername: web01-prototyp-mbvd-de.pixelpark.net - port: 443 - ssl: true - ssl_cert: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem' - ssl_key: '/etc/pki/tls/private/wildcard.pixelpark.net-key.pem' - ssl_ca: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem' - ip: 77.74.238.22 - docroot_owner: root + service-gipfel: + docroot: /srv/www/service-gipfel + servername: service-gipfel-mbvd-de.pixelpark.net + serveraliases: + - service-gipfel.mbvd.de + ssl: false + docroot_owner: deploy.vogel docroot_group: root + docroot_mode: '0755' directories: - directory_root: provider: directory - path: '/srv/www/prototyp-mbvd-de' + path: '/srv/www/service-gipfel' options: - FollowSymLinks - MultiViews @@ -78,10 +78,10 @@ site::profile::apache::vhosts: provider: location path: '/' auth_type: Digest - auth_name: pixelrealm + auth_name: service-gipfel auth_digest_provider: file auth_digest_algorithm: MD5 auth_user_file: '/etc/httpd/htdigest' auth_require: 'valid-user' proxy_pass: - - { path: /, url: 'http://%{fqdn}:3000/' } \ No newline at end of file + - { path: /, url: 'http://%{fqdn}:3001/' } \ No newline at end of file -- 2.39.5