nissan - move most configuration into common.yaml (fix)

diff --git a/customer/nissan/common.yaml b/customer/nissan/common.yaml
index 5c8fc2ba24573e508ea24c447a717ee58ec88fbc..aa7860bba97d5ef4fdf825bdd58cea1827172648 100644 (file)
--- a/customer/nissan/common.yaml
+++ b/customer/nissan/common.yaml
@@ -44,31 +44,3 @@ infra::profile::apache_php::fpm_pool:
   nissan:
     listen_owner: apache
     listen_group: apache
-
-infra::profile::apache::pp_vhosts:
-  nissan:
-    docroot: '/var/www/nissan/current/public'
-    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:
-      - docroot:
-        provider: directory
-        path: '/var/www/nissan/current/public'
-        allow_override:
-          - FileInfo
-          - 'Options=MultiViews,Indexes'
-        addhandlers:
-          - { handler: "proxy:unix:/var/run/php5-fpm-nissan.sock|fcgi://./" , extensions: '.php' }
-      - provider: location
-        path: '/'
-        auth_type: Digest
-        auth_name: 'server'
-        auth_digest_provider: file
-        auth_user_file: '/etc/httpd/htdigest'
-        auth_require: 'valid-user'

diff --git a/customer/nissan/stage-web-nissan-meinedaten-de.pixelpark.net.yaml b/customer/nissan/stage-web-nissan-meinedaten-de.pixelpark.net.yaml
index 71cd88ca355f93c74401a3b45b132c775908f783..7b942684ddc5731fda492bd4b3c6b78ca1c0f8b4 100644 (file)
--- a/customer/nissan/stage-web-nissan-meinedaten-de.pixelpark.net.yaml
+++ b/customer/nissan/stage-web-nissan-meinedaten-de.pixelpark.net.yaml
@@ -19,7 +19,32 @@ infra::profile::mysql_server::databases:
 
 infra::profile::apache::pp_vhosts:
   nissan:
+    docroot: '/var/www/nissan/current/public'
     servername: stage-web-nissan-meinedaten-de.pixelpark.net
     serveraliases:
       - stage-web-nissan-meinedaten-at.pixelpark.net
       - stage-web-nissan-meinedaten-ch.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:
+      - docroot:
+        provider: directory
+        path: '/var/www/nissan/current/public'
+        allow_override:
+          - FileInfo
+          - 'Options=MultiViews,Indexes'
+        addhandlers:
+          - { handler: "proxy:unix:/var/run/php5-fpm-nissan.sock|fcgi://./" , extensions: '.php' }
+      - provider: location
+        path: '/'
+        auth_type: Digest
+        auth_name: 'server'
+        auth_digest_provider: file
+        auth_user_file: '/etc/httpd/htdigest'
+        auth_require: 'valid-user'