added softy stack to test-webstats01.pixelpark.net

diff --git a/customer/pixelpark-piwik/test-webstats01.pixelpark.net.yaml b/customer/pixelpark-piwik/test-webstats01.pixelpark.net.yaml
index e435ccb0c36f8355f6d783b24e1c5787581a8fc1..38b774d6c95639688a77d9aea1c4bdfe1e34140b 100644 (file)
--- a/customer/pixelpark-piwik/test-webstats01.pixelpark.net.yaml
+++ b/customer/pixelpark-piwik/test-webstats01.pixelpark.net.yaml
@@ -1,18 +1,29 @@
 ---
-accounts::users:
-  deploy.vogel:
-    apply: true
-    group: apache
 
 infra::role: base
 infra::additional_classes:
   - infra::profile::mysql_server
+  - infra::profile::postfix
   - infra::profile::apache_php
 
-infra::profile::apache::htdigest:
-  testserver:
-    www: 'Passwort setzen'
+accounts::users:
+  jenkins:
+    apply: true
+
+mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAln+KjMw58eMGkrIkEx9Srs2YAsRTbeppNXaEcALA/cz8UaalEDKyCygzVgFIQuDXM8Ga+FR/lLxQ7tNVJAJl9tvC5HAS9ND6sPMc5Z7T55X5SeKq5+DoXswRUjppouXaw5zMUiZ125aOMfaXz6nSOnn28k5JRl+nqjRrzs6WA1/nHUxetXKvNUaBQ68fMSNVDRYVHdMgOlMRDnD6I7LFtjP0nOWqoOp/gw8y/0M9+lW62DbXVnZk9gwPXXwKv5/QOhbRsJB5yI/gNf4FDSK4kNEkBkVB3Xe11MY97WGHhpsmo3imrk7FW2pZMg4zUazPRL+4n6qarHad2Smh2R56jDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBXZ0xuIRq2FXD9xgKBTaNQgCAa1flgxurPkk4tFo2rsHPv9xcb2b79gKBHQ+rPoFjfkg==]
+mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEArSaR1AVNv4Jv4LdxYqOVy7QzUQHgjnHuCk6K1LSEESHoCk4p+HkQzKPblYryiSW4ElnQzcMuRmKRa0YYU7NW3nGshp8wkAkGb59tQZcZv0Jl67+arq5na9krTap6fKmaiKtCjI4cCJcSIJKXvmOPx/iGSe7aPutJvyWsE3rKMaEzgzxfddTZ9wyYqWN2Lwkdd6U0rbKl3yuPA2LsQnmP/3xboqpS/HLar27KPEVSvyMrpIirapQNtviGa2i2vi7gOV/3bO+O/9k86QlOpOjEZTo98SsBPUcSLZD0UCLS/FT2Hc3t/NCbW6r6wQvFhY3Pqh8JBA3s3Pw8lQwNSpmmsjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBC8kAfi3EZ/jvR+xh+3F2j6gCB32kwVDJUaDsSfoPHgvsJibS1LSGkp0+L349kG04acxw==]
+
+php::fpm::pools:
+  www:
+    ensure: absent
 
+infra::profile::apache_php::fpm_pool:
+  piwik:
+    listen_owner: apache
+    listen_group: apache
+    php_admin_value:
+      upload_max_filesize: 20M
+      post_max_size: 20M
 
 php::extensions:
   gd: {}
@@ -22,16 +33,33 @@ php::extensions:
   mbstring: {}
   curl: {}
 
+infra::profile::apache::htdigest:
+  testserver:
+    www: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAvvNvfGimCTFyzZJPDD6UoxqXfQRTQU3tRNHzc5l4mi5QOyDVzwHjc+4QlQNzHesLbyByzg3x6xyyixN/uHju7lAN91pvsL1HdNMUtS+/JJODWD4XRnt4/HQw5vnNh1CtrVUhmz2IVZ8Ea6csH9aOAwhkS3+zpP6Gpmvq88yMC44bmZ+A1qGCCNDA3eWxtw6rbcg0/HQTJ4iqs7/6V3jQYzsjZoMln3rkCEKdtKwm0ELmilx+CnRqbHVoX/aRGO6KtqRFgoNLAkp04RpHAmUvDl4NcclLNXnxANNv4ZOajQs/uyw6fVwctzybWv35RpGli2YlGXHosHJg3BUvmPagTjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAQVotz+HJLzDaia2SBSEBTgCAJvTomNEI2zOl3z7//M8O5IrYHqgu6LCiD4jxoKI1bvA==]
 
-php::settings:
-  PHP/memory_limit: 320M
-  PHP/post_max_size: 20M
-  PHP/register_globals: 'Off'
-  PHP/include_path: '.:/opt/app/ZendFramework/library:/opt/app/web'
-  PHP/max_execution_time: 30
-  PHP/max_input_time: 60
-  PHP/output_buffering: 65536
-  PHP/upload_max_filesize: 4M
-  PHP/max_file_uploads: 50
-  PHP/short_open_tag: 'On'
-  PHP/expose_php: 'Off'
+infra::profile::apache::pp_vhosts:
+  test-webstats01:
+    docroot: /var/www/piwik
+    servername: www.test-webstats01.pixelpark.net
+    serveraliases:
+      - test-webstats01.pixelpark.net
+    cert_servername: 'wildcard.pixelpark.net'
+    cert_customer: 'pixelpark'
+    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'
+    docroot_owner: apache
+    docroot_group: pixel
+    docroot_mode: '2775'
+    directories:
+      - directory_root:
+        provider: directory
+        path: '/var/www/piwik'
+        addhandlers:
+          - { handler: "proxy:unix:/var/run/php70-fpm-piwik.sock|fcgi://./" , extensions: '.php' }
+        options:
+          - FollowSymLinks
+          - MultiViews
+        allow_override:
+          - All
+        directoryindex: index.php index.html