nissan - move most configuration into common.yaml

diff --git a/customer/nissan/common.yaml b/customer/nissan/common.yaml
index 0bcd470d09f5f67d22e316a75b8d8ed0494d4ce4..5c8fc2ba24573e508ea24c447a717ee58ec88fbc 100644 (file)
--- a/customer/nissan/common.yaml
+++ b/customer/nissan/common.yaml
@@ -3,8 +3,72 @@ infra::role: base
 infra::additional_classes:
   - infra::profile::postfix
   - infra::profile::cron
+  - infra::profile::apache_php
+  - infra::profile::mysql_server
 
 postfix::myorigin: "pixelpark.net"
 infra::profile::postfix::virtual_aliases_source: 'maps/virtual-nullclient-webmaster'
 infra::profile::postfix::cert_servername: 'wildcard.pixelpark.net'
 
+repo::remi_php71: true
+
+infra::profile::cron::cronjobs:
+  laravel_scheduler:
+    user: apache
+    command: '/bin/php /var/www/nissan/current/artisan schedule:run >> /dev/null 2>&1'
+    description: Laravel Scheduler
+
+accounts::users:
+  jenkins:
+    apply: true
+    groups:
+      - apache
+
+sudo::configs:
+  deploy_rights:
+    priority: "06"
+    content: |
+      jenkins ALL=(apache) NOPASSWD: ALL
+
+php::fpm::pools:
+  www:
+    ensure: absent
+
+php::extensions:
+  mysqlnd: {}
+  xml: {}
+  pdo: {}
+  mbstring: {}
+
+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 fa63e386ed784e2123cb519ca97207ebf20b8a49..89a793560e0122c896095fe5a659d3f5c5589dec 100644 (file)
--- a/customer/nissan/stage-web-nissan-meinedaten-de.pixelpark.net.yaml
+++ b/customer/nissan/stage-web-nissan-meinedaten-de.pixelpark.net.yaml
@@ -1,49 +1,10 @@
 ---
-infra::additional_classes:
-  - infra::profile::apache_php
-  - infra::profile::mysql_server
-  - infra::profile::cron
-
-infra::profile::cron::cronjobs:
-  laravel_scheduler:
-    user: apache
-    command: '/bin/php /var/www/nissan/current/artisan schedule:run >> /dev/null 2>&1'
-    description: Laravel Scheduler
-
-repo::remi_php71: true
 
 accounts::users:
   tim.schroeder:
     apply: true
     groups:
       - apache
-  jenkins:
-    apply: true
-    groups:
-      - apache
-
-sudo::configs:
-  deploy_rights:
-    priority: "06"
-    content: |
-      jenkins ALL=(apache) NOPASSWD: ALL
-
-php::fpm::pools:
-  www:
-    ensure: absent
-
-php::extensions:
-  mysqlnd: {}
-  xml: {}
-  pdo: {}
-  mbstring: {}
-
-
-
-infra::profile::apache_php::fpm_pool:
-  nissan:
-    listen_owner: apache
-    listen_group: apache
 
 infra::profile::apache::htdigest:
   server:
@@ -56,35 +17,7 @@ infra::profile::mysql_server::databases:
     user: nissan
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEACnznJnG7f2hql9yJGe3IHgkP7Jg7mTbmL5bdgTKi2kob/s9eYklzrff5U0cC7FXXxjURu8jvrUykQfT5MybgjmFtfEJTJl007S45vTWMkJJ+mHFYljTN/UY+y8X/ix3sMamHw2alkdq9U4PWRGXZtee4tb1HEfdB5jP5ZSeIJn7/ZHllzAWDTIFIjrYoorMb4lsP6SuUt86/FCisUL1IYrPITnW4IaB7R5jWKDVlznB/ornv7VWS5WAhfqQ4AuyS23xcwIsLbWqZxFVxCqhYdavKBFMuEnyNLUZbSQnxVYIKYNePL6ZvpX/666NeEBdXFV4EkSareqagRFyf5JM7sTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBD2kOSJ5nZMPbt+QCMjz0R3gCCxJ6qeolTi2Xm8ldOQqpHFMEKGEDCReTT0Lt3QMEXnZA==]
 
-
-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'
+infra::profile::apache::pp_vhosts::nissan::servername: stage-web-nissan-meinedaten-de.pixelpark.net
+infra::profile::apache::pp_vhosts::nissan::serveraliases:
+  - stage-web-nissan-meinedaten-at.pixelpark.net
+  - stage-web-nissan-meinedaten-ch.pixelpark.net