]> Frank Brehm's Git Trees - pixelpark/hiera.git/commitdiff
projects / pixelpark / hiera.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f37db9f)
piwik
authorsascha.strassheim <sascha.strassheim@pixelpark.com>
Fri, 4 May 2018 10:54:15 +0000 (12:54 +0200)
committersascha.strassheim <sascha.strassheim@pixelpark.com>
Fri, 4 May 2018 10:54:15 +0000 (12:54 +0200)
customer/pixelpark-piwik/webstats05.pixelpark.net.yaml patch | blob | history
customer/pixelpark-piwik/webstats06.pixelpark.net.yaml patch | blob | history
customer/pixelpark-piwik/webstats07.pixelpark.net.yaml patch | blob | history

diff --git a/customer/pixelpark-piwik/webstats05.pixelpark.net.yaml b/customer/pixelpark-piwik/webstats05.pixelpark.net.yaml
index c8c34cce62a856ff997379fd71098c5a80fde040..eadfcd856103d28ef4d1f38e7bca0d438e523305 100644 (file)
--- a/customer/pixelpark-piwik/webstats05.pixelpark.net.yaml
+++ b/customer/pixelpark-piwik/webstats05.pixelpark.net.yaml
@@ -14,33 +14,6 @@ accounts::users:
   jenkins:
     apply: true
 
-infra::profile::galera_cluster::galera_master: webstats05.pixelpark.net
-infra::profile::galera_cluster::galera_servers:
-  - 93.188.110.195
-  - 93.188.110.196
-  - 93.188.110.197
-infra::profile::galera_cluster::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAIKCNANqKHMgVxolZaeLXu/MYAcfhqag6XenwLa0QPCcGy2SiivUET5bg9eyichaBnUon9Ttonp3y+yVv1ImC38BHzS0i1B+bPIG+PnPPqPND28CPJg5Fy2rEzJvwECPw5QkPf4oWtaTX/HG3l8eBRxQb71+I9uwhT4kE8tZBOTXqlTbvC6S8ZFmYyYAHP7t7NV88l/Xr+iK11tV9zk7AqJ+UIg7/MaDHbIEoBFVFtpbPoo6pdR28n9VVEZw0F0ONsShqqrG7SDDBn/4t+hC2fHnxoOVw+RhuQjvD2LldLAZX1agVAOjWB//5pBz2VJ+bTCqTHcuY35O92ZLV+DTc4zBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBD+KMxenaaXODL7AhqH89N4gCBjw67+Cu8PDm0za8BRx701amQpMpM9Vw6714ykjfmFEQ==]
-infra::profile::galera_cluster::status_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAW7G2O6t0w/akg20TgPHTeSv09bxQKdPC3kNDsLLN5w8KS6Hx3oBR2znbsJee9maKPUc28HdzDjg1iJbG6m4mSQjzW1RkWcFj0YBPE/FGsP6PHXZX4QQrvcBcOg7mZygM1lF4LwZ4nHsNh6Zo0O13S+Yvut96FWCab+I5k6I/EiQ6XvsJeV5VtizI7T05ngq38lG+kafW6HtHV9/Yb922V4RghzPZfYMBCaYf9VcOwwFTydN47Vwtkb5JeEV1/A7+kC6NZx8rFOPEjwqTP8Lign1XJKS+6vb2CKF+EbA2VvK1I1tfNLyCIBsoEx6LTz6cxXSst8aDEx3hYBU8fyZNgDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCjrfUJf09AarJb9iHtrFMmgCAAN3yO7z4XzVx2GK48tXWmwhFMzM8v0ufwCpAkMyqwcw==]
-
-infra::profile::galera_cluster::override_options:
-  mysqld:
-    innodb_file_per_table: ON
-    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::backup::backupdir: /var/lib/backup/mysql
-mysql::server::backup::backuprotate: '1'
-
-mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAr58l09Nu/HnAESV131Ja5FPbdr2QrCwUVOHnLOEuyvija692uVy1zWjHHkAIsXFWdh0Kt4gpS5ADilL+lDzeN/yxXmszTS8MiVlUpy0OzTQH8c4BCM63ad3RiFMo7jKwkZHlXeS/CEhIXtuDEfIOu537+AFIbpHsFTkgpzl9mwa5lqFzG0kvofXd/FaFddkvpf8vuA9ndDC5EpFJmSjwanRKozgH8pFCOEQa6WJ+8vnKAT2c8aLylGo/ma4lk7NiXXG6QpMmNVOddK7JoiJkCgD1toAyFZHQQJS1qJRJ1WQ+XQGvlw7xuIoIlpWfpFoNdAzAZNPc1qTTw49YuvY3sTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAAiHmucFcAKztwvEmaYXkDgCBXLMmnx8qz9CxLyVYSzVHtyfZksSlocNyIXoE54QtKLA==]
-infra::profile::mysql_server::databases:
-  webstats:
-    user: webstats
-    password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAYJY7J7ketIlU1b6iIzhtMj85z4zIbWnnQedKeRW70XfifBT+DUVoIPXR5E+grJRHitcAUchnPw8FqwRhtgIjoYz8FkDQO4Om+oIFs6cLBGvbip0DU19yp92HkioK7zbXwO30MW6N86sIE3pA51aaFHFFrHGyCu7mtYkpoycktZCvtCtK0wzMzgekncHcW9rf3IZb6VX9n9rlXtLeDa5P6LD/K3/Xk+9zOdltxXkwMIvUT6blGavB9ZzXnQ9dicqEcL46B0pMa/p4XZFIq37dF/snvB1P5mHPhfAUigVrEuVeMjOUbYWYWh5YxmWtGCuxVFYDKpfVuxWRTzBIs5TC+jBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBk/k38J+RaNrzHRXK2P01bgCB1XTPbEQQDn/e4J3WpfKChuOjD3chI3fdAFMQVL2LIoA==]
 
 # php-fpm config
 php::fpm::pools:
diff --git a/customer/pixelpark-piwik/webstats06.pixelpark.net.yaml b/customer/pixelpark-piwik/webstats06.pixelpark.net.yaml
index cf636aa386eff32ea366e51cb665f144566b659d..110097a3cda505a21096249e5fcc5ad18f0cb7ae 100644 (file)
--- a/customer/pixelpark-piwik/webstats06.pixelpark.net.yaml
+++ b/customer/pixelpark-piwik/webstats06.pixelpark.net.yaml
@@ -14,33 +14,6 @@ accounts::users:
   jenkins:
     apply: true
 
-infra::profile::galera_cluster::galera_master: webstats05.pixelpark.net
-infra::profile::galera_cluster::galera_servers:
-  - 93.188.110.195
-  - 93.188.110.196
-  - 93.188.110.197
-infra::profile::galera_cluster::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAizYRDBWQfq+tKPPbeQ+l+FKGvQOK9BOx+ZcFGvVjsfvrkjFT7yEJcRUPo6Fune6QuwYwgCuyt48x/R5wUSr74pz9gIUaGcQsUinQN+8oOhHjqfo0wzUhMRGUAj9lESdLgfA3hQX/uh8THmVVWznpRJZSxylUD8+Y92j6w/PxEL7xUD8mv2+VKcOwqE01SqIkM8ddrMZU9w2CzMwKXDD8uduQ8ewupl6jgyFtF+2kUL/uD6VdU71PwHW4Kvhog8S36ULSeOVzEHm07LSumbWxQG34orkfCXrqOt45aHF5v6ZFIzwBAcrjAjmXHE4IeM/ff0MlqmWC/02I1qVJKpB+djBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCHPsOGI+CAWqusFUEI+CqWgCCK2QSGdGr5vAoth+yE611XKvRs7a135FqHhYbDKm3G+A==]
-infra::profile::galera_cluster::status_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAqu84nj/UjJLJrr7eU1U8FV3+82LsnEk+b4w03VK7yXwLD2Ko404adMzGd46/5e63y1jv+FpdEPv5xew937PCJmzwULw+gBrjeKkscIn8gEXx452gPCyMHsyvqwltJK6lUT7ZtC20K5DRyNBN2ibxynxPp2EYjZojhXV16L4kkqH+a/e2wkWQ73Bhn4mPIreln9xtctmCPtMBWsraoMQRHIPyJoJ7KEmIoNomhk7B4lN3g00d1WPTxqguSvPOQxl7KzcqFvuqzL4yYuTpjW5IAm1eqEfJ+qmzOVZA6wELOMNqCk61Rav9qySoWQnHc1FEr8YbGjq/WyMAVSMXMzLHaDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBBM7QcWuDJKHfh74ry/oSggCCpZfac1vgg8zjSZGbFo44m3UHkf8SrxsM+NzvPvNm2rg==]
-
-infra::profile::galera_cluster::override_options:
-  mysqld:
-    innodb_file_per_table: ON
-    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::backup::backupdir: /var/lib/backup/mysql
-mysql::server::backup::backuprotate: '1'
-
-mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAr58l09Nu/HnAESV131Ja5FPbdr2QrCwUVOHnLOEuyvija692uVy1zWjHHkAIsXFWdh0Kt4gpS5ADilL+lDzeN/yxXmszTS8MiVlUpy0OzTQH8c4BCM63ad3RiFMo7jKwkZHlXeS/CEhIXtuDEfIOu537+AFIbpHsFTkgpzl9mwa5lqFzG0kvofXd/FaFddkvpf8vuA9ndDC5EpFJmSjwanRKozgH8pFCOEQa6WJ+8vnKAT2c8aLylGo/ma4lk7NiXXG6QpMmNVOddK7JoiJkCgD1toAyFZHQQJS1qJRJ1WQ+XQGvlw7xuIoIlpWfpFoNdAzAZNPc1qTTw49YuvY3sTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAAiHmucFcAKztwvEmaYXkDgCBXLMmnx8qz9CxLyVYSzVHtyfZksSlocNyIXoE54QtKLA==]
-infra::profile::mysql_server::databases:
-  webstats:
-    user: webstats
-    password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAYJY7J7ketIlU1b6iIzhtMj85z4zIbWnnQedKeRW70XfifBT+DUVoIPXR5E+grJRHitcAUchnPw8FqwRhtgIjoYz8FkDQO4Om+oIFs6cLBGvbip0DU19yp92HkioK7zbXwO30MW6N86sIE3pA51aaFHFFrHGyCu7mtYkpoycktZCvtCtK0wzMzgekncHcW9rf3IZb6VX9n9rlXtLeDa5P6LD/K3/Xk+9zOdltxXkwMIvUT6blGavB9ZzXnQ9dicqEcL46B0pMa/p4XZFIq37dF/snvB1P5mHPhfAUigVrEuVeMjOUbYWYWh5YxmWtGCuxVFYDKpfVuxWRTzBIs5TC+jBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBk/k38J+RaNrzHRXK2P01bgCB1XTPbEQQDn/e4J3WpfKChuOjD3chI3fdAFMQVL2LIoA==]
 
 # php-fpm config
 php::fpm::pools:
diff --git a/customer/pixelpark-piwik/webstats07.pixelpark.net.yaml b/customer/pixelpark-piwik/webstats07.pixelpark.net.yaml
index 449cddbee1702f3591266b01369ac8740a15f409..5f382f2ed0c7bc74b52c2d1fd10e61a1235708f0 100644 (file)
--- a/customer/pixelpark-piwik/webstats07.pixelpark.net.yaml
+++ b/customer/pixelpark-piwik/webstats07.pixelpark.net.yaml
@@ -9,41 +9,6 @@ infra::additional_classes:
   - infra::profile::postfix
   - infra::profile::apache_php
 
-mysql::server::package_name: MariaDB-server
-mysql::client::package_name: MariaDB-client
-
-# users and deploy users
-accounts::users:
-  jenkins:
-    apply: true
-
-infra::profile::galera_cluster::galera_master: webstats05.pixelpark.net
-infra::profile::galera_cluster::galera_servers:
-  - 93.188.110.195
-  - 93.188.110.196
-  - 93.188.110.197
-infra::profile::galera_cluster::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAJLJ0bGyZieBRhKYzBjdXz5UA5awdSstt/RL2BchQrkxeCurNxyh6VFZcBoVpQGcLqx9i3p3PQPBJnZ1SWZq/JCN0eBvD3rAwUvDzmmkpujnbjPvhrH9qAvYD3Zdx2FJNOdVxOIrzGhRES8tQ00lmsEkRiYI2vWYdJdv1PaSQzdapvgQdkZdRsCDoV/3X76hlv4/y1uXz8yIeKdpX1MRCPpJaFlhdSfCO8ho7X3oNTJuphTewSs36t08A6sMR7655xnkIgk0psedPjRnUlpzv4W17HlE+oT/6+oiNt5GjdI5cwJRc3tVEElv8Hx1txSLTIhxQmleQU9yUISEIp1O+2zBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBNZ+aGF2Shl8vePVg4eiXhgCCFilZO9ZswBiXuJdhTS/KRkyOLfCkD2D+YMXhyC3xlFQ==]
-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: ON
-    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::backup::backupdir: /var/lib/backup/mysql
-mysql::server::backup::backuprotate: '1'
-
-mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAr58l09Nu/HnAESV131Ja5FPbdr2QrCwUVOHnLOEuyvija692uVy1zWjHHkAIsXFWdh0Kt4gpS5ADilL+lDzeN/yxXmszTS8MiVlUpy0OzTQH8c4BCM63ad3RiFMo7jKwkZHlXeS/CEhIXtuDEfIOu537+AFIbpHsFTkgpzl9mwa5lqFzG0kvofXd/FaFddkvpf8vuA9ndDC5EpFJmSjwanRKozgH8pFCOEQa6WJ+8vnKAT2c8aLylGo/ma4lk7NiXXG6QpMmNVOddK7JoiJkCgD1toAyFZHQQJS1qJRJ1WQ+XQGvlw7xuIoIlpWfpFoNdAzAZNPc1qTTw49YuvY3sTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAAiHmucFcAKztwvEmaYXkDgCBXLMmnx8qz9CxLyVYSzVHtyfZksSlocNyIXoE54QtKLA==]
-infra::profile::mysql_server::databases:
-  webstats:
-    user: webstats
-    password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAYJY7J7ketIlU1b6iIzhtMj85z4zIbWnnQedKeRW70XfifBT+DUVoIPXR5E+grJRHitcAUchnPw8FqwRhtgIjoYz8FkDQO4Om+oIFs6cLBGvbip0DU19yp92HkioK7zbXwO30MW6N86sIE3pA51aaFHFFrHGyCu7mtYkpoycktZCvtCtK0wzMzgekncHcW9rf3IZb6VX9n9rlXtLeDa5P6LD/K3/Xk+9zOdltxXkwMIvUT6blGavB9ZzXnQ9dicqEcL46B0pMa/p4XZFIq37dF/snvB1P5mHPhfAUigVrEuVeMjOUbYWYWh5YxmWtGCuxVFYDKpfVuxWRTzBIs5TC+jBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBk/k38J+RaNrzHRXK2P01bgCB1XTPbEQQDn/e4J3WpfKChuOjD3chI3fdAFMQVL2LIoA==]
 
 # php-fpm config
 php::fpm::pools:
Unnamed repository; edit this file 'description' to name the repository.