cleanup piwik

diff --git a/customer/pixelpark-piwik/common.yaml b/customer/pixelpark-piwik/common.yaml
index 4786de518d26036646aae511a7087aaae365c4af..32e788c2c97f86c94ffe954f9083e67d2cd65737 100644 (file)
--- a/customer/pixelpark-piwik/common.yaml
+++ b/customer/pixelpark-piwik/common.yaml
@@ -1,4 +1,6 @@
 ---
+infra::role: base
+
 # php 7
 repo::remi_php71: true
 # Postfix Config
@@ -10,3 +12,17 @@ accounts::users:
   sascha.strassheim:
     apply: true
     sudo: true
+
+php::extensions:
+  gd: {}
+  opcache: {}
+  soap: {}
+  mbstring: {}
+  zip: {}
+  xml: {}
+  json: {}
+  pdo: {}
+  redis: {}
+
+mysql::server::backup::backupdir: /var/lib/backup/mysql
+mysql::server::backup::backuprotate: '1'

diff --git a/customer/pixelpark-piwik/test-webstats01.pixelpark.net.yaml b/customer/pixelpark-piwik/test-webstats01.pixelpark.net.yaml
index d179b5f66488aa218d5f52540a78e8c620bed822..6a7566fcdf2c47644824b40da9a93a4983a5806b 100644 (file)
--- a/customer/pixelpark-piwik/test-webstats01.pixelpark.net.yaml
+++ b/customer/pixelpark-piwik/test-webstats01.pixelpark.net.yaml
@@ -42,15 +42,6 @@ infra::profile::apache_php::fpm_pool:
       upload_max_filesize: 20M
       post_max_size: 20M
 
-# php extension needed
-php::extensions:
-  gd: {}
-  mysqlnd: {}
-  pecl-ssh2: {}
-  xml: {}
-  mbstring: {}
-  curl: {}
-
 # htaccess cerdentials
 infra::profile::apache::htdigest:
   testserver:

diff --git a/customer/pixelpark-piwik/webstats05.pixelpark.net.yaml b/customer/pixelpark-piwik/webstats05.pixelpark.net.yaml
index 66574417b4f73c4803529e3c5a802c5e3756677f..176fa2d0bdd1177c10b7bab4099a0b9293c18178 100644 (file)
--- a/customer/pixelpark-piwik/webstats05.pixelpark.net.yaml
+++ b/customer/pixelpark-piwik/webstats05.pixelpark.net.yaml
@@ -2,7 +2,6 @@
 # https://intra.pixelpark.com/confluence/display/its/Shared+Piwik2+-+Betriebsdokumentation
 
 # modules
-infra::role: base
 infra::additional_classes:
   - infra::profile::galera_cluster
   - infra::profile::mysql_server
@@ -32,10 +31,6 @@ infra::profile::galera_cluster::override_options:
     max_connections: 600
     wsrep_retry_autocommit: 4
 
-
-mysql::server::backup::backupdir: /var/lib/backup/mysql
-mysql::server::backup::backuprotate: '1'
-
 mysql::server::root_password: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAfNVZjXHurO0qOCe55fwNnDs63RQFxxuCwl2WtIGKYT6jE0mO+4JktBi3pIbXFNLisnvKIHSo1eZNM7PQQpptXfAl0yuz7z7VtFqQTeJ529kmYmVG3H7lo6q+Ctj1FJ/6jw6wzDc/yUEGAXLuFIejPwaxx/nO24w1QES8L41tUDhktjuneTQ4rV8FkBBvQqQN3bAVqG+ulewdEkubHTJJ6V7oy7z7zTybaCrC1gUV3W85DpgajMEtj3zTPoyxgyCi3XKopvYNYOWs60yGGes5Pmg/aNePvmjQ8Kg9FSZ8YhoyUfk0jdFciJTktbAdj3cIUV9m94zdWEtLZviCKgzvVDA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDzHl3uTcGSfp39IcdLeX4kgBCTqTvNlsUD9lZOu8X6Bivn]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAr58l09Nu/HnAESV131Ja5FPbdr2QrCwUVOHnLOEuyvija692uVy1zWjHHkAIsXFWdh0Kt4gpS5ADilL+lDzeN/yxXmszTS8MiVlUpy0OzTQH8c4BCM63ad3RiFMo7jKwkZHlXeS/CEhIXtuDEfIOu537+AFIbpHsFTkgpzl9mwa5lqFzG0kvofXd/FaFddkvpf8vuA9ndDC5EpFJmSjwanRKozgH8pFCOEQa6WJ+8vnKAT2c8aLylGo/ma4lk7NiXXG6QpMmNVOddK7JoiJkCgD1toAyFZHQQJS1qJRJ1WQ+XQGvlw7xuIoIlpWfpFoNdAzAZNPc1qTTw49YuvY3sTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAAiHmucFcAKztwvEmaYXkDgCBXLMmnx8qz9CxLyVYSzVHtyfZksSlocNyIXoE54QtKLA==]
 infra::profile::mysql_server::databases:
@@ -58,15 +53,6 @@ infra::profile::apache_php::fpm_pool:
       upload_max_filesize: 20M
       post_max_size: 20M
 
-# php extension needed
-php::extensions:
-  gd: {}
-  mysqlnd: {}
-  pecl-ssh2: {}
-  xml: {}
-  mbstring: {}
-  curl: {}
-
 # htaccess cerdentials
 infra::profile::apache::htdigest:
   webstats:

diff --git a/customer/pixelpark-piwik/webstats06.pixelpark.net.yaml b/customer/pixelpark-piwik/webstats06.pixelpark.net.yaml
index 2ab30647a1ebabe3d3f2b717f42652422d2397e1..f0d65219a0c3ddc1c22cd56c9fb1638c14d72ac3 100644 (file)
--- a/customer/pixelpark-piwik/webstats06.pixelpark.net.yaml
+++ b/customer/pixelpark-piwik/webstats06.pixelpark.net.yaml
@@ -2,7 +2,6 @@
 # https://intra.pixelpark.com/confluence/display/its/Shared+Piwik2+-+Betriebsdokumentation
 
 # modules
-infra::role: base
 infra::additional_classes:
   - infra::profile::galera_cluster
   - infra::profile::mysql_server
@@ -32,10 +31,6 @@ infra::profile::galera_cluster::override_options:
     max_connections: 600
     wsrep_retry_autocommit: 4
 
-
-mysql::server::backup::backupdir: /var/lib/backup/mysql
-mysql::server::backup::backuprotate: '1'
-
 mysql::server::root_password: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAXd3QkHOPQuEE2XVSsGLLXY4MGIx34fEw1vY7MZkVlOEmf8htWZpIOFe4CF1AZcdmR9jg4gD92XGUqJHaC2vADEMCWt1R6ECW7zrWpPGKp7vU4piWUVS9yW15kj/OVO/YyD4Ry5Z6BJimkOVjn7QBKzYONaPgiXmhz7HncubAtxo1i/8pk5lzQGEttChaT14f5GQDOEoGHENbhCWil/rccutJFmS/49mplrss+/ED0xFhyoFa+wfk/q0v88KiwS+C5z8Byb9dL/QtbC1mC9100XYkqT53X89mv+NQCgk3E9zPvoja4t6KC7iPv28Rpfod4fcGp66IsIPrKJo97H5NVDA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAtYxKVHyJvwiCzDTI9iVdwgBCdOCGy2tyBKxC3Sz/eGsh3]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAr58l09Nu/HnAESV131Ja5FPbdr2QrCwUVOHnLOEuyvija692uVy1zWjHHkAIsXFWdh0Kt4gpS5ADilL+lDzeN/yxXmszTS8MiVlUpy0OzTQH8c4BCM63ad3RiFMo7jKwkZHlXeS/CEhIXtuDEfIOu537+AFIbpHsFTkgpzl9mwa5lqFzG0kvofXd/FaFddkvpf8vuA9ndDC5EpFJmSjwanRKozgH8pFCOEQa6WJ+8vnKAT2c8aLylGo/ma4lk7NiXXG6QpMmNVOddK7JoiJkCgD1toAyFZHQQJS1qJRJ1WQ+XQGvlw7xuIoIlpWfpFoNdAzAZNPc1qTTw49YuvY3sTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAAiHmucFcAKztwvEmaYXkDgCBXLMmnx8qz9CxLyVYSzVHtyfZksSlocNyIXoE54QtKLA==]
 infra::profile::mysql_server::databases:
@@ -58,15 +53,6 @@ infra::profile::apache_php::fpm_pool:
       upload_max_filesize: 20M
       post_max_size: 20M
 
-# php extension needed
-php::extensions:
-  gd: {}
-  mysqlnd: {}
-  pecl-ssh2: {}
-  xml: {}
-  mbstring: {}
-  curl: {}
-
 # htaccess cerdentials
 infra::profile::apache::htdigest:
   webstats:

diff --git a/customer/pixelpark-piwik/webstats07.pixelpark.net.yaml b/customer/pixelpark-piwik/webstats07.pixelpark.net.yaml
index fc6392f7be30883e0547c54bd86cc3e585efe198..d2d82cfdeec7793aac7992d97f1cf641087dc8cc 100644 (file)
--- a/customer/pixelpark-piwik/webstats07.pixelpark.net.yaml
+++ b/customer/pixelpark-piwik/webstats07.pixelpark.net.yaml
@@ -2,7 +2,6 @@
 # https://intra.pixelpark.com/confluence/display/its/Shared+Piwik2+-+Betriebsdokumentation
 
 # modules
-infra::role: base
 infra::additional_classes:
   - infra::profile::galera_cluster
   - infra::profile::mysql_server
@@ -32,10 +31,6 @@ infra::profile::galera_cluster::override_options:
     max_connections: 600
     wsrep_retry_autocommit: 4
 
-
-mysql::server::backup::backupdir: /var/lib/backup/mysql
-mysql::server::backup::backuprotate: '1'
-
 mysql::server::root_password: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAfNVZjXHurO0qOCe55fwNnDs63RQFxxuCwl2WtIGKYT6jE0mO+4JktBi3pIbXFNLisnvKIHSo1eZNM7PQQpptXfAl0yuz7z7VtFqQTeJ529kmYmVG3H7lo6q+Ctj1FJ/6jw6wzDc/yUEGAXLuFIejPwaxx/nO24w1QES8L41tUDhktjuneTQ4rV8FkBBvQqQN3bAVqG+ulewdEkubHTJJ6V7oy7z7zTybaCrC1gUV3W85DpgajMEtj3zTPoyxgyCi3XKopvYNYOWs60yGGes5Pmg/aNePvmjQ8Kg9FSZ8YhoyUfk0jdFciJTktbAdj3cIUV9m94zdWEtLZviCKgzvVDA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDzHl3uTcGSfp39IcdLeX4kgBCTqTvNlsUD9lZOu8X6Bivn]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAr58l09Nu/HnAESV131Ja5FPbdr2QrCwUVOHnLOEuyvija692uVy1zWjHHkAIsXFWdh0Kt4gpS5ADilL+lDzeN/yxXmszTS8MiVlUpy0OzTQH8c4BCM63ad3RiFMo7jKwkZHlXeS/CEhIXtuDEfIOu537+AFIbpHsFTkgpzl9mwa5lqFzG0kvofXd/FaFddkvpf8vuA9ndDC5EpFJmSjwanRKozgH8pFCOEQa6WJ+8vnKAT2c8aLylGo/ma4lk7NiXXG6QpMmNVOddK7JoiJkCgD1toAyFZHQQJS1qJRJ1WQ+XQGvlw7xuIoIlpWfpFoNdAzAZNPc1qTTw49YuvY3sTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAAiHmucFcAKztwvEmaYXkDgCBXLMmnx8qz9CxLyVYSzVHtyfZksSlocNyIXoE54QtKLA==]
 infra::profile::mysql_server::databases:
@@ -58,15 +53,6 @@ infra::profile::apache_php::fpm_pool:
       upload_max_filesize: 20M
       post_max_size: 20M
 
-# php extension needed
-php::extensions:
-  gd: {}
-  mysqlnd: {}
-  pecl-ssh2: {}
-  xml: {}
-  mbstring: {}
-  curl: {}
-
 # htaccess cerdentials
 infra::profile::apache::htdigest:
   webstats: