webstats galera override options

diff --git a/customer/pixelpark-piwik/webstats05.pixelpark.net.yaml b/customer/pixelpark-piwik/webstats05.pixelpark.net.yaml
index 4df8da5655dda139b2356b818640d3ae3b1cec6d..22de9130b174108e15f195e4101b05be31f2f0b6 100644 (file)
--- a/customer/pixelpark-piwik/webstats05.pixelpark.net.yaml
+++ b/customer/pixelpark-piwik/webstats05.pixelpark.net.yaml
@@ -21,16 +21,6 @@ infra::profile::galera_cluster::galera_servers:
 infra::profile::galera_cluster::root_password: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAWlNPTdRJbEY9KA1l/7CGilJwxyuivYvt4kfrUV9PQaBNR4iOu315c5647ZLAPWMj3EUqzS3CF/S5X15rYOxM/3PK0J+OVUuY2NvhmGRlN+aKx3nQNfaq4EcLtJ30q9ANcKvkBJF09awwshcGH4EQO/Xe6Pxy9YNKVhe3CT70G9ZPYouBE2p0PR+W9iOWGrMK0pWbtK7wBU2vzX/87rG3POkABXYc/yJ2oWRIkHv6B6/Gj7Nwbi/tgTZyb+CkZvd9+05pZjn75Kl+GpGp36yltKklH91n5Yi0GZwrQO4Mq3jaFe/n6pnZtQ3+haDrynXypgLnCQqJSP5SZpHJiPe7czA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBkff6X5ZmdT+y5l/f7zO2ggBCpo1K4qs/wmalLx75mm+xC]
 infra::profile::galera_cluster::status_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAl/59ISmIt+1ke3jtWJQiCxUAizGZwaW/KDWTabTJy2fe+0H/dcsCGWUrvV7LZg+NG73CS/oIu3CO3ynsStUW1nPk9M+8MfHoNkR3cBJF/19JpbhVExI6Lkkx+cxoHNp1UNMW/BCW3ZyUKrXLUQQ3xH5oSvSSdanFc/uc48Zyr0PmoJTNePxIjFUlwjNEr/4JGYnRL61Qq3/z3aCNPa0h8zewvq754ooiQ67y5bPZEO6bOrRNBaTfrGqaCyF9mxF2J/hD7zNtAGlO/D6DOuZ1meJwG13LUXK994nrAH2L72R5yu5gg3KjSzyw/gQRRdhoCF2VI5fJJhq8wqev5wTXajBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDYHgKzrCdO1JbKomw/B7WkgCCbXzoFXykKU9SSWNOuQXe0y2tUXnAyI4BoFsOs6rBKKA==]
 
-infra::profile::galera_cluster::override_options:
-  mysqld:
-    innodb_file_per_table: OFF
-    wait_timeout: '600'
-    interactive_timeout: '600'
-    max_allowed_packet: '128M'
-    sql-mode: "NO_ENGINE_SUBSTITUTION,NO_AUTO_CREATE_USER"
-    max_connections: 600
-    wsrep_retry_autocommit: 4
-
 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:
@@ -38,6 +28,13 @@ infra::profile::mysql_server::databases:
     user: webstats
     password: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAZStQqrpGzYEoMd2e3C5IqwayBG3cTCviCe1hmMNDUYzk7bgK1OqBvg+k9ZMeWdNZ0H8uG/9XEPOefeAUA73vAFd+f7iXk7UmbaNor2MAQnJwGYx/EZo/9fb4/em5j4RpqupWvbDh8+wVTkrt91mTouKGtoEjyJ6u6pARYYhyU5zvjkfwfVraV52FK8J9b6ES+cC0yxlg3hidg5sPAVBNxuOEeNv8LxuRmr7qQYvg+FUkYyERApy7zRDwU2w2dfakinXqoSuEssqVCR/U/R1I/ooq1SAz65lR9RooAE4ZHeDFiuPnK5kr1CQdZgYKvQeUhivHfIl1a4G6bEX/6R9bPzA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBATRzmhwFceHMORGppagWX9gBCe6BEK45Rsk341ERhIqbXV]
 
+infra::profile::galera_cluster::override_options:
+  mysqld:
+    innodb_file_per_table: 'ON'
+    wait_timeout: '600'
+    interactive_timeout: '600'
+    max_allowed_packet: '128M'
+    
 # php-fpm config
 php::fpm::pools:
   www:

diff --git a/customer/pixelpark-piwik/webstats06.pixelpark.net.yaml b/customer/pixelpark-piwik/webstats06.pixelpark.net.yaml
index 5580dc7fcdabfbc0b744dbfdf61e8f40d29288bf..bf8bbafa9add0f5d44c5b422dc47929e1a3cec7c 100644 (file)
--- a/customer/pixelpark-piwik/webstats06.pixelpark.net.yaml
+++ b/customer/pixelpark-piwik/webstats06.pixelpark.net.yaml
@@ -21,16 +21,6 @@ infra::profile::galera_cluster::galera_servers:
 infra::profile::galera_cluster::root_password: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAD0BuSYZXaYDeD4WhTHC082brjgejXhem/Kn/Bu8oOH1Zc6733y0lB9QysyHzLsvtf4BpGTS7Kc1rNflOLt8OiMqjqxQXcQA6I1jm/efOzCV0durTCM7CIh7MUe9fH/ti6Urj6uEm3s7RxMqh+6K/aSD6uTNmfyRLY19LLae57iKzf9AeoEyVtri3jzmUDVsrnnBflT0/CMKVsC5E0xGIT3GUekLxc/4bEltfy4bmnTG9XJgBW7KitWFDyqKrOEDpVO1mUwk01pTSQKFBFNmsI0IQPazOnvq+PJhX7WXItSGKqpN27Yjfn9sSoQtjxvdWU0yf/dP4C3nQ8p8RW8YdjjA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBw4+RDweJMplX/9Wr0+H5fgBBgAAJFNXHjcTjzGHaJ+sQw]
 infra::profile::galera_cluster::status_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAl/59ISmIt+1ke3jtWJQiCxUAizGZwaW/KDWTabTJy2fe+0H/dcsCGWUrvV7LZg+NG73CS/oIu3CO3ynsStUW1nPk9M+8MfHoNkR3cBJF/19JpbhVExI6Lkkx+cxoHNp1UNMW/BCW3ZyUKrXLUQQ3xH5oSvSSdanFc/uc48Zyr0PmoJTNePxIjFUlwjNEr/4JGYnRL61Qq3/z3aCNPa0h8zewvq754ooiQ67y5bPZEO6bOrRNBaTfrGqaCyF9mxF2J/hD7zNtAGlO/D6DOuZ1meJwG13LUXK994nrAH2L72R5yu5gg3KjSzyw/gQRRdhoCF2VI5fJJhq8wqev5wTXajBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDYHgKzrCdO1JbKomw/B7WkgCCbXzoFXykKU9SSWNOuQXe0y2tUXnAyI4BoFsOs6rBKKA==]
 
-infra::profile::galera_cluster::override_options:
-  mysqld:
-    innodb_file_per_table: OFF
-    wait_timeout: '600'
-    interactive_timeout: '600'
-    max_allowed_packet: '128M'
-    sql-mode: "NO_ENGINE_SUBSTITUTION,NO_AUTO_CREATE_USER"
-    max_connections: 600
-    wsrep_retry_autocommit: 4
-
 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:
@@ -38,6 +28,13 @@ infra::profile::mysql_server::databases:
     user: webstats
     password: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAZStQqrpGzYEoMd2e3C5IqwayBG3cTCviCe1hmMNDUYzk7bgK1OqBvg+k9ZMeWdNZ0H8uG/9XEPOefeAUA73vAFd+f7iXk7UmbaNor2MAQnJwGYx/EZo/9fb4/em5j4RpqupWvbDh8+wVTkrt91mTouKGtoEjyJ6u6pARYYhyU5zvjkfwfVraV52FK8J9b6ES+cC0yxlg3hidg5sPAVBNxuOEeNv8LxuRmr7qQYvg+FUkYyERApy7zRDwU2w2dfakinXqoSuEssqVCR/U/R1I/ooq1SAz65lR9RooAE4ZHeDFiuPnK5kr1CQdZgYKvQeUhivHfIl1a4G6bEX/6R9bPzA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBATRzmhwFceHMORGppagWX9gBCe6BEK45Rsk341ERhIqbXV]
 
+infra::profile::galera_cluster::override_options:
+  mysqld:
+    innodb_file_per_table: 'ON'
+    wait_timeout: '600'
+    interactive_timeout: '600'
+    max_allowed_packet: '128M'
+
 # php-fpm config
 php::fpm::pools:
   www:

diff --git a/customer/pixelpark-piwik/webstats07.pixelpark.net.yaml b/customer/pixelpark-piwik/webstats07.pixelpark.net.yaml
index 7593ae21f6ed08888ceed3c5ec547f5da8a669f3..87446bd7d5f1214e48fbac3b4976e6e5217e2270 100644 (file)
--- a/customer/pixelpark-piwik/webstats07.pixelpark.net.yaml
+++ b/customer/pixelpark-piwik/webstats07.pixelpark.net.yaml
@@ -21,16 +21,6 @@ infra::profile::galera_cluster::galera_servers:
 infra::profile::galera_cluster::root_password: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAVFE70o+nVZGB+eCJ+OP0iSqvB0VtnzBi51qeyfHgKknMlRkZCL2930I4P4yekSggN8rvqvjeaGLKI+WB0q+/DRi2zL9WMtxk4dZObiWAbzX/k2UQtjy/Zs+PlqtVbvCqK7tBODnJ6QHNQqo4jjPzadAEmNv0hK3PaAr/zoLZFWvvBeTL14iDbxpeGQU5tNwcueV+aRmJKSaCithsN3hyqslOfoogdsyjxoV6d16Y3r3aCuPvhpSITd1teNEY/V6TQADx9FJTgKAbFiFrOoXK2PRYS3kUQKsZ/bZ58zFsRbIzZHh+FbOrZKQeGjHFqJVocNIRn+pww0YCtQ10VtCjEzA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBABOBz1P/2ksqIh0pA0/lYXgBBfeBdWUCDA9wBHjbwcN7Bo]
 infra::profile::galera_cluster::status_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAl/59ISmIt+1ke3jtWJQiCxUAizGZwaW/KDWTabTJy2fe+0H/dcsCGWUrvV7LZg+NG73CS/oIu3CO3ynsStUW1nPk9M+8MfHoNkR3cBJF/19JpbhVExI6Lkkx+cxoHNp1UNMW/BCW3ZyUKrXLUQQ3xH5oSvSSdanFc/uc48Zyr0PmoJTNePxIjFUlwjNEr/4JGYnRL61Qq3/z3aCNPa0h8zewvq754ooiQ67y5bPZEO6bOrRNBaTfrGqaCyF9mxF2J/hD7zNtAGlO/D6DOuZ1meJwG13LUXK994nrAH2L72R5yu5gg3KjSzyw/gQRRdhoCF2VI5fJJhq8wqev5wTXajBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDYHgKzrCdO1JbKomw/B7WkgCCbXzoFXykKU9SSWNOuQXe0y2tUXnAyI4BoFsOs6rBKKA==]
 
-infra::profile::galera_cluster::override_options:
-  mysqld:
-    innodb_file_per_table: OFF
-    wait_timeout: '600'
-    interactive_timeout: '600'
-    max_allowed_packet: '128M'
-    sql-mode: "NO_ENGINE_SUBSTITUTION,NO_AUTO_CREATE_USER"
-    max_connections: 600
-    wsrep_retry_autocommit: 4
-
 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:
@@ -38,6 +28,13 @@ infra::profile::mysql_server::databases:
     user: webstats
     password: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAZStQqrpGzYEoMd2e3C5IqwayBG3cTCviCe1hmMNDUYzk7bgK1OqBvg+k9ZMeWdNZ0H8uG/9XEPOefeAUA73vAFd+f7iXk7UmbaNor2MAQnJwGYx/EZo/9fb4/em5j4RpqupWvbDh8+wVTkrt91mTouKGtoEjyJ6u6pARYYhyU5zvjkfwfVraV52FK8J9b6ES+cC0yxlg3hidg5sPAVBNxuOEeNv8LxuRmr7qQYvg+FUkYyERApy7zRDwU2w2dfakinXqoSuEssqVCR/U/R1I/ooq1SAz65lR9RooAE4ZHeDFiuPnK5kr1CQdZgYKvQeUhivHfIl1a4G6bEX/6R9bPzA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBATRzmhwFceHMORGppagWX9gBCe6BEK45Rsk341ERhIqbXV]
 
+infra::profile::galera_cluster::override_options:
+  mysqld:
+    innodb_file_per_table: 'ON'
+    wait_timeout: '600'
+    interactive_timeout: '600'
+    max_allowed_packet: '128M'
+    
 # php-fpm config
 php::fpm::pools:
   www: