spk-microsites - aufräumen und php-extensions/-settings auslagern

diff --git a/customer/spk-microsites/common.yaml b/customer/spk-microsites/common.yaml
new file mode 100644 (file)
index 0000000..af355f9
--- /dev/null
+++ b/customer/spk-microsites/common.yaml
@@ -0,0 +1,22 @@
+php::dev: true
+php::pear: true
+
+php::settings:
+  Date/date.timezone: Europe/Berlin
+
+php::extensions:
+  gd: {}
+  mbstring: {}
+  pdo: {}
+  mcrypt: {}
+  xml: {}
+  pecl-gmagick: {}
+  pspell: {}
+  xmlrpc: {}
+  mysql: {}
+  mysqlnd: {}
+  soap: {}
+  pear-SOAP: {}
+  xdebug:
+    provider: pecl
+    zend: true

diff --git a/customer/spk-microsites/dev-microsites01-sparkasse-de.pixelpark.net.yaml b/customer/spk-microsites/dev-microsites01-sparkasse-de.pixelpark.net.yaml
index 20e5e38f66e4ad8af7c330a41a6d285c68e8146b..13d2714c2e37816db4f9810fca559eab799524c1 100644 (file)
--- a/customer/spk-microsites/dev-microsites01-sparkasse-de.pixelpark.net.yaml
+++ b/customer/spk-microsites/dev-microsites01-sparkasse-de.pixelpark.net.yaml
@@ -5,7 +5,31 @@ site::additional_classes:
   - site::profile::wordpress
   - logstash
 
-php::extensions:
-  mbstring: {}
-  soap: {}
-  pear-SOAP: {}
+accounts::users:
+  deploy.vogel:
+    apply: true
+    sudo: true
+
+mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEASqZfnt59mey8HLkeQphdebiA0n+wmo7NdvuBCDN6YsQ8A+tm2+X2w6ZEWv/PPY3SMbJcOTyCikeTqn9MIAn0tbwCpNWDcH1tRxqExyQpyhR/EgsrU/pN01UdK83eLkuVrqBdmM1GycBMPqOXYhk1Iku+E4cIBIzTxgYULiGLRIBEM4OmijI3zQCDFjJz1i9Tc5en3N88HH3IGE7Fc0NI4F4QNt5JexeZeJdyYI/GdVAVirLACsyC1dlufnvRLpUc6fxlfxR/JH/CRABKPZ7kOWvxDYJcowvtK+awngrqHjinsLIsl1aclGZctpMONJkCLGSgvU4V2LPmk+m1ZdbJ3DBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBq8DBveIPcyyzrlMGPlVEPgCBYw+kQvlMfC/PcjOPG5q7gE2UIvex7fq//ix7T6hf8DA==]
+mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAt1mAc2+JrfVtj4N5gYF8Z1rngl/IrHTRcFjKsslqDQvKbOkZax+jURg6QvmbWwsUh/gP0L21wDJHKXhoj6SQ9hNx7ofxmAa1gHx4AHBQBOahVXRsKuEWtls+nr2UfDaAkokfDsCx/wpAWLE0PPOnx2K9xVk2FlK7Ln6neapwbK6t06rGyQlFEaDT5Ymt34Erd58st2jBkytsyoC/Uc7d1hRp/vpb/l3cfyJNhcPhls546pw2u/2f2hGNdFLrJtA1Kkuk0PvOXG99BUVsVSxLMmtHvds3PY8nY1uXE36ZNpWb9h8fWxGphIFAQYi5vkKKiDE4TSM9PXGpiK+iajAd7TBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAra20b8e9QIr5oTqC4KjITgCA3TZFO60ZSW75emlmmzslm+8w6DBvvtNrZ2d01jTHltg==]
+site::profile::mysql_server::databases:
+  wordpress:
+    user: wordpress
+    password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAc2YahBpu6Q6bBLUu0pl8/EGtzjpIpyXfxYUat3fvToMnvTlCrD55Sn9cB1QavAqihOidBG7jObvwgCUAKvg+Jfh1Y9MAO21mP6RHX4EMPsxPC9LfNvJXI6b4JbR6Ygdsom2LAf09UCsCtNRWADBWxXq5GglvpXRZoa0QT/Icrwv1RW99IVJFDSb7Il56awyLyLUQqoySpfbRzpcGzZPUbyNSanALY7/uSmGVpqJ+ToWvZDCpLGWleT2J/87DMvqQu5FSkJGOMOsl6rxhJC1YoT2slRwFGvcb+IKh0Gnw0geoGCz4VHnnirVtQ0yfTXbcltNDiddQHi3on2Iv0KQAkzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBUdF+vmXAMuWXV/cSllnN1gCCSSj0KXMWghCAeyYYKtnnXl2/wnnJUQYH/sHfy126ULw==]
+
+mysql::server::remove_default_accounts: true
+
+apache::mpm_module: worker
+apache::default_vhost: false
+
+site::profile::wordpress::projects:
+  'dev-microsites01-sparkasse-de.pixelpark.net':
+    servername: dev-microsites01-sparkasse-de.pixelpark.net
+    docroot: '/var/www/html/wordpress'
+    ip: 77.74.234.173
+    ssl_cert: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
+    ssl_key: '/etc/pki/tls/private/wildcard.pixelpark.net-key.pem'
+    ssl_chain: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
+    user: 'apache'
+    group: 'pixel'
+    mode: '2775'

diff --git a/customer/spk-microsites/development.yaml b/customer/spk-microsites/development.yaml
deleted file mode 100644 (file)
index aeb949b..0000000
--- a/customer/spk-microsites/development.yaml
+++ /dev/null
@@ -1,45 +0,0 @@
----
-
-accounts::users:
-  deploy.vogel:
-    apply: true
-    sudo: true
-
-mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEASqZfnt59mey8HLkeQphdebiA0n+wmo7NdvuBCDN6YsQ8A+tm2+X2w6ZEWv/PPY3SMbJcOTyCikeTqn9MIAn0tbwCpNWDcH1tRxqExyQpyhR/EgsrU/pN01UdK83eLkuVrqBdmM1GycBMPqOXYhk1Iku+E4cIBIzTxgYULiGLRIBEM4OmijI3zQCDFjJz1i9Tc5en3N88HH3IGE7Fc0NI4F4QNt5JexeZeJdyYI/GdVAVirLACsyC1dlufnvRLpUc6fxlfxR/JH/CRABKPZ7kOWvxDYJcowvtK+awngrqHjinsLIsl1aclGZctpMONJkCLGSgvU4V2LPmk+m1ZdbJ3DBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBq8DBveIPcyyzrlMGPlVEPgCBYw+kQvlMfC/PcjOPG5q7gE2UIvex7fq//ix7T6hf8DA==]
-mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAt1mAc2+JrfVtj4N5gYF8Z1rngl/IrHTRcFjKsslqDQvKbOkZax+jURg6QvmbWwsUh/gP0L21wDJHKXhoj6SQ9hNx7ofxmAa1gHx4AHBQBOahVXRsKuEWtls+nr2UfDaAkokfDsCx/wpAWLE0PPOnx2K9xVk2FlK7Ln6neapwbK6t06rGyQlFEaDT5Ymt34Erd58st2jBkytsyoC/Uc7d1hRp/vpb/l3cfyJNhcPhls546pw2u/2f2hGNdFLrJtA1Kkuk0PvOXG99BUVsVSxLMmtHvds3PY8nY1uXE36ZNpWb9h8fWxGphIFAQYi5vkKKiDE4TSM9PXGpiK+iajAd7TBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAra20b8e9QIr5oTqC4KjITgCA3TZFO60ZSW75emlmmzslm+8w6DBvvtNrZ2d01jTHltg==]
-site::profile::mysql_server::databases:
-  wordpress:
-    user: wordpress 
-    password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAc2YahBpu6Q6bBLUu0pl8/EGtzjpIpyXfxYUat3fvToMnvTlCrD55Sn9cB1QavAqihOidBG7jObvwgCUAKvg+Jfh1Y9MAO21mP6RHX4EMPsxPC9LfNvJXI6b4JbR6Ygdsom2LAf09UCsCtNRWADBWxXq5GglvpXRZoa0QT/Icrwv1RW99IVJFDSb7Il56awyLyLUQqoySpfbRzpcGzZPUbyNSanALY7/uSmGVpqJ+ToWvZDCpLGWleT2J/87DMvqQu5FSkJGOMOsl6rxhJC1YoT2slRwFGvcb+IKh0Gnw0geoGCz4VHnnirVtQ0yfTXbcltNDiddQHi3on2Iv0KQAkzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBUdF+vmXAMuWXV/cSllnN1gCCSSj0KXMWghCAeyYYKtnnXl2/wnnJUQYH/sHfy126ULw==]
-
-mysql::server::remove_default_accounts: true
-  
-apache::mpm_module: worker
-apache::default_vhost: false
-
-site::profile::wordpress::projects:
-  'dev-microsites01-sparkasse-de.pixelpark.net':
-    servername: dev-microsites01-sparkasse-de.pixelpark.net
-    docroot: '/var/www/html/wordpress'
-    ip: 77.74.234.173
-    ssl_cert: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
-    ssl_key: '/etc/pki/tls/private/wildcard.pixelpark.net-key.pem'
-    ssl_chain: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
-    user: 'apache'
-    group: 'pixel'
-    mode: '2775'
-
-php::settings:
-  Date/date.timezone: Europe/Berlin
- 
-php::extensions:
-  gd: {}
-  xml: {}
-  mysql: {}
-  xdebug:
-    provider: pecl
-    zend: true
-
-# because we have pecl packages we must install dev packages
-php::dev: true
-php::pear: true

diff --git a/customer/spk-microsites/microsites01-sparkasse-de.pixelpark.net.yaml b/customer/spk-microsites/microsites01-sparkasse-de.pixelpark.net.yaml
index 178fdad9a2a5e6f668f9ec383a9b09adcbf09b55..ebecca2de96b0e467871dd5f015365004faad5b0 100644 (file)
--- a/customer/spk-microsites/microsites01-sparkasse-de.pixelpark.net.yaml
+++ b/customer/spk-microsites/microsites01-sparkasse-de.pixelpark.net.yaml
@@ -46,17 +46,3 @@ site::profile::wordpress::projects:
 php::fpm::pools:
   www:
     ensure: absent
-
-
-php::extensions:
-  gd: {}
-  mbstring: {}
-  pdo: {}
-  mcrypt: {}
-  xml: {}
-  pecl-gmagick: {}
-  pspell: {}
-  xmlrpc: {}
-  mysqlnd: {}
-  soap: {}
-  pear-SOAP: {}