mbvd-specials add new vhost mercedes-benz-eqc-de

diff --git a/customer/mbvd-kampagne/common.yaml b/customer/mbvd-kampagne/common.yaml
index b5cb6072f0ebb06a5cd7331749585e215b71b7ea..583865df990e53e7674ea2781dcab9e4e5387830 100644 (file)
--- a/customer/mbvd-kampagne/common.yaml
+++ b/customer/mbvd-kampagne/common.yaml
@@ -24,3 +24,7 @@ accounts::users:
     apply: true
     sudo: true
     group: apache
+  tim.schroeder:
+    apply: false
+    sudo: true
+    group: apache

diff --git a/customer/mbvd-specials/common.yaml b/customer/mbvd-specials/common.yaml
new file mode 100644 (file)
index 0000000..583865d
--- /dev/null
+++ b/customer/mbvd-specials/common.yaml
@@ -0,0 +1,30 @@
+---
+infra::role: base
+infra::additional_classes:
+  - infra::profile::apache
+
+accounts::users:
+  sten.friedrich:
+    apply: false
+    sudo: true
+    group: apache
+  sandra.streimelweger:
+    apply: true
+    sudo: true
+    group: apache
+  sidney.jansen:
+    apply: true
+    sudo: true
+    group: apache
+  thomas.eggert:
+    apply: true
+    sudo: true
+    group: apache
+  alma.daschke:
+    apply: true
+    sudo: true
+    group: apache
+  tim.schroeder:
+    apply: false
+    sudo: true
+    group: apache

diff --git a/customer/mbvd-specials/stage-web-specials-mercedes-benz-de.pixelpark.net.yaml b/customer/mbvd-specials/stage-web-specials-mercedes-benz-de.pixelpark.net.yaml
index ba0bdd0cf3e0c46b99dc08050f59b005a6064d2e..e669e3a9ef4bafe5ac38b7ec885201989cc4e9a5 100644 (file)
--- a/customer/mbvd-specials/stage-web-specials-mercedes-benz-de.pixelpark.net.yaml
+++ b/customer/mbvd-specials/stage-web-specials-mercedes-benz-de.pixelpark.net.yaml
@@ -1,10 +1,10 @@
 ---
-infra::role: base
-infra::additional_classes:
-  - infra::profile::apache
-
 apache::mpm_module: event
 
+infra::profile::apache::htdigest:
+  server:
+    www: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAandf12+u5c/c7gLR282cK0HlaC4rX5V361aXjIcudqm5hx7/DHQx6mIaMSlr0EV97w2YamnCTbyZpCot/tSD0klWj0wyu5SAHJ+iIO8F7mAQWiAyxPbGatpDTwOWbOGivhz7D2rFxyz+7V+zWG8OmWVCoE4ag42ncD8NTKaytLP1Jbsb01v1dKm/Ny8dM17clgg26g3JaJOuoCzq2tQU50am28aNV7CCZd3IAgJ64Kcjgji3eZaKt/3ucODSeHijOziMr1Rj2hCLIYEVqlk80UntHoZYDOAKctX1vuSiR6QgGlSIQHmM3XS0c4NtBaiEhlex6VSxQ3b+dgKYHfdxSTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDLp2aHyWJ4nI9WgDYdHl1zgCALRb9LK9+/bNMlsVE2kBPN/AnZZU/OLqRpzhbu9033aA==]
+
 infra::profile::apache::pp_vhosts:
   proxy:
     docroot: /var/www/html
@@ -18,3 +18,34 @@ infra::profile::apache::pp_vhosts:
       - { path: /zeitfuerdich, url: 'http://stage-web-zeitfuermich-mercedes-benz-de.pixelpark.net/zeitfuerdich' }
       - { path: /a-klasse, url: 'http://stage-web-a-klasse-mb-de.pixelpark.net/a-klasse' }
       - { path: /servicevorteilskarte, url: 'http://mbvd-apps-pool01.pixelpark.net:48081/servicevorteilskarte' }
+
+  mercedes-benz-eqc-de:
+    docroot: /var/www/eqc
+    # es werden LB und WAF verwendet - SSL Certs liegen im Loadbalancer
+    servername: stage.mercedes-benz-eqc.de # falls Mercedes den DNS Eintrag setzt
+    serveraliases:
+      - stage-web-mercedes-benz-eqc-de.pixelpark.net # VM
+      - stage-mercedes-benz-eqc-de.pixelpark.net     # LB VIP
+    ssl: false
+#    setenvif:
+#      - 'HTTPS on HTTPS=on'
+    docroot_owner: apache
+    docroot_group: apache
+    docroot_mode: '2775'
+    directories:
+      # directory_root:
+      - provider: directory
+        path: '/var/www/eqc'
+        options:
+          - FollowSymLinks
+          - MultiViews
+        allow_override:
+          - All
+      - 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'

diff --git a/customer/mbvd-specials/web-specials-mercedes-benz-de.pixelpark.net.yaml b/customer/mbvd-specials/web-specials-mercedes-benz-de.pixelpark.net.yaml
index 459c0000fcc03688c1029acff3af28d55b4867b0..bd2f1be84d52e56c6792718a2a5b69a50ed5d650 100644 (file)
--- a/customer/mbvd-specials/web-specials-mercedes-benz-de.pixelpark.net.yaml
+++ b/customer/mbvd-specials/web-specials-mercedes-benz-de.pixelpark.net.yaml
@@ -1,12 +1,12 @@
 ---
-infra::role: base
-infra::additional_classes:
-  - infra::profile::apache
-
 apache::mpm_module: event
 
 apache::mod::proxy::proxy_via: 'Off'
 
+infra::profile::apache::htdigest:
+  server:
+    www: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAY4yz+nxZsNsViNxUW69Mi6eMQ7gOggyjCzE0b7HWQyzP2AkhEqRfsP+4Y2yBNrYOL3MrQg3j9xwd84/SstCkfofTBHDNBiaGK9v+GlmC5IlZJvoYtN0Pdvr22YKwukVCVnMSrNSLA17ni0/dpT3rR2MdPckfGmE/GRsJeuhFsdHC3srGr1nomPEPFqUh8iNvGIBeEElIoOlwS5XmBNYYpN04jkHUk3juk803G7HRijwE6K4R3KWbECrcbv+8T+Qh02syiX+Qtu8cGYvarcxapOygh/8CmNEe0inaAb5v9amRwacm1IZmggfvoZxDUchL+BwjG94yKv2ujBUwaBrH1DBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDfr8x/LlMhoRlGAd/cjHexgCAj9tkKHTQZ8Xu+75rXiKN+Vf/r8NCgZ/IUGte8TkuqKw==]
+
 infra::profile::apache::pp_vhosts:
   specials-mb-de:
     servername: web-specials-mercedes-benz-de.pixelpark.net
@@ -16,7 +16,37 @@ infra::profile::apache::pp_vhosts:
     ssl: false
     proxy_preserve_host: true
     proxy_pass:
-#      - { path: /eqc, url: '!' }
       - { path: /, url: 'http://localhost:9000/' }
     setenvif:
       - 'HTTPS on HTTPS=on'
+
+  mercedes-benz-eqc-de:
+    docroot: /var/www/eqc
+    # es werden LB und WAF verwendet - SSL Certs liegen im Loadbalancer
+    servername: mercedes-benz-eqc.de # falls Mercedes den DNS Eintrag setzt
+    serveraliases:
+      - www.mercedes-benz-eqc.de               # LB VIP
+      - web-mercedes-benz-eqc-de.pixelpark.net # VM
+    ssl: false
+#    setenvif:
+#      - 'HTTPS on HTTPS=on'
+    docroot_owner: apache
+    docroot_group: apache
+    docroot_mode: '2775'
+    directories:
+      # directory_root:
+      - provider: directory
+        path: '/var/www/eqc'
+        options:
+          - FollowSymLinks
+          - MultiViews
+        allow_override:
+          - All
+      - 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'