From: Andreas Gerstenberg <gerstenberg@pixelpark.com>
Date: Tue, 6 Feb 2018 11:21:22 +0000 (+0100)
Subject: spk-spar-checker disable master-master on stage
X-Git-Tag: v0.1.0~1702
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=c1e04fb419fdf29a5aa712553f99942f4bc14629;p=pixelpark%2Fhiera.git

spk-spar-checker disable master-master on stage
---

diff --git a/customer/spk-spar-checker/stage-web01-spar-checker-de.pixelpark.net.yaml b/customer/spk-spar-checker/stage-web01-spar-checker-de.pixelpark.net.yaml
index ede5d81a..da973fb1 100644
--- a/customer/spk-spar-checker/stage-web01-spar-checker-de.pixelpark.net.yaml
+++ b/customer/spk-spar-checker/stage-web01-spar-checker-de.pixelpark.net.yaml
@@ -1,17 +1,17 @@
 ---
-mysql::server::override_options:
-  'mysqld':
-#    log-error: '/var/log/mysqld.log'
-#    pid-file: '/var/run/mysqld/mysqld.pid'
-    server-id: '1'
-    auto_increment_offset: '1'
-    bind-address: '192.168.15.18'
-    auto_increment_increment: '2'
-    log-bin: 'binlog'
-    binlog-format: 'MIXED'
-    binlog-ignore-db: 'performance_schema, information_schema'
-    character-set-server: utf8
-    collation-server: utf8_general_ci
-    log_bin_trust_function_creators: '1'
-#    enforce_gtid_consistency: 'on'
-#    gtid_mode: 'on'
+#mysql::server::override_options:
+#  'mysqld':
+##    log-error: '/var/log/mysqld.log'
+##    pid-file: '/var/run/mysqld/mysqld.pid'
+#    server-id: '1'
+#    auto_increment_offset: '1'
+#    bind-address: '192.168.15.18'
+#    auto_increment_increment: '2'
+#    log-bin: 'binlog'
+#    binlog-format: 'MIXED'
+#    binlog-ignore-db: 'performance_schema, information_schema'
+#    character-set-server: utf8
+#    collation-server: utf8_general_ci
+#    log_bin_trust_function_creators: '1'
+##    enforce_gtid_consistency: 'on'
+##    gtid_mode: 'on'
diff --git a/customer/spk-spar-checker/test.yaml b/customer/spk-spar-checker/test.yaml
index 097eff41..b96edbb4 100644
--- a/customer/spk-spar-checker/test.yaml
+++ b/customer/spk-spar-checker/test.yaml
@@ -12,15 +12,15 @@ infra::additional_classes:
 apache::log_formats:
   spk_combined: '%%{ich-trickse}{X-Forwarded-For}i %a %l %u %t \"%r\" %>s %b \"%%{ich-trickse}{Referer}i\" \"%%{ich-trickse}{User-Agent}i\"'
 
-mysql::server::users:
-  'replication@%':
-    password_hash: ENC[PKCS7,MIIBmQYJKoZIhvcNAQcDoIIBijCCAYYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAQqb00kdh1x/DxMgkawRvI1jSHD3lG2HZgn6DPPH831pSJ9lnm1SnqlxCxU526CyCVE6Q9cNZgsaPatu6FWdOUl1WA26Yutbh2UOhU47olweRLAOv83dtiuADQLgqgp8MMcuIC2X9DVSjFA/tL2ucvdyZp5oUqYQrS9CKyDsmr185N+WjFXwhZOH3foI8PrVXe5xJMmUhWf8gFCVQee9kvmXQfd4ezyZ4OPOWt1yASaPS8xpPDK+zmu/QizydsK2Rs6xSzGpPyccU80Dw3bomjd4lM98gct58kVe0Eoqg3wOwsb662Flovh9EUULX0OnEIkV5Vi0KYDnO0yfZhVhdmTBcBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBQVMrKiYncTWVRLcBbteVLgDAhIH+adP9NcucM5xOEUvOKrCOHeT6q4hSqWc0XxrU59nsRd9Wwk5+O2DmfMcOKpOg=]
-mysql::server::grants:
-  'replication@%/*.*':
-    options: 'GRANT'
-    privileges: 'REPLICATION SLAVE'
-    table: '*.*'
-    user: 'replication@%'
+#mysql::server::users:
+#  'replication@%':
+#    password_hash: ENC[PKCS7,MIIBmQYJKoZIhvcNAQcDoIIBijCCAYYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAQqb00kdh1x/DxMgkawRvI1jSHD3lG2HZgn6DPPH831pSJ9lnm1SnqlxCxU526CyCVE6Q9cNZgsaPatu6FWdOUl1WA26Yutbh2UOhU47olweRLAOv83dtiuADQLgqgp8MMcuIC2X9DVSjFA/tL2ucvdyZp5oUqYQrS9CKyDsmr185N+WjFXwhZOH3foI8PrVXe5xJMmUhWf8gFCVQee9kvmXQfd4ezyZ4OPOWt1yASaPS8xpPDK+zmu/QizydsK2Rs6xSzGpPyccU80Dw3bomjd4lM98gct58kVe0Eoqg3wOwsb662Flovh9EUULX0OnEIkV5Vi0KYDnO0yfZhVhdmTBcBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBQVMrKiYncTWVRLcBbteVLgDAhIH+adP9NcucM5xOEUvOKrCOHeT6q4hSqWc0XxrU59nsRd9Wwk5+O2DmfMcOKpOg=]
+#mysql::server::grants:
+#  'replication@%/*.*':
+#    options: 'GRANT'
+#    privileges: 'REPLICATION SLAVE'
+#    table: '*.*'
+#    user: 'replication@%'
 
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEALXSUFrj+9Yn41vRBaqpFmKj/Ojh1QBDIx2WG1nnOtJewSCUuLrbUCfCcrRWchmcYFEj0tIUGDlBeGaAD6cxYeFiQCK9WpeA5hd+FV/gXSSLah4Q2wz6ZOXXLdIT270sEMKGJONL/VYUkSrdT1h+y8KIwULbRvAYSBdXL0FUoIrVBxRt1thr+y/4K/E3xySrX0FsKjNpln0icC5Zt4TRE1fxrChOA7LKhVZBp05Iw7WH5t6txpOOZbH6cItsvGUnt3aXbSSiFu+060pEk7w5m82U/437iL40SJ615dK+i52Oh+LUinX5yV6T8c47mQlsJ/k6wvGY3rX523aFg1XliYzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDYtJJFNWMMYRepy/tOaNXfgCB9KykOY5UfcO9W7RJIyIVDMzzIKbQBK3Tr86RkUMmAQw==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAqsIvptOejYWCbmnvN32J+mJCPEQBTI0b1wsgv72AWuANa9QpzMiH3d0odQgVAhtu55WS0VHcwA/OMhDmWT+dUJE9QkDJFVpZ+n9o1fX8A0atoTVHcjV+ki2zwGroX8mBZ1Y/VmtjjJB32MCixhE/uhS/OvO1TD/h0spmXXsSLPLK30ulAgN+DGHlyEYx69zGEoF+WU+rVrciFpBoITUIcYKmnQBrQtqi01gJB1mNqIsIyRESnp8ff8LIs54xhw5K9aU4qiNP/z/kmAUZJCq5Ja8YO5nf5e1euWaj0m4Il2k8/dK+Pvw0R/I8joyYKqir9+kwpvFKkGWODMzwzrII3TBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAAQamIzsiqRLZgEEefoXwNgCD83OhZVENssIJdHTAtRlPH9sIxdRIYb19K6x4J3xqnpQ==]
@@ -40,7 +40,7 @@ infra::profile::apache::pp_vhosts:
     serveraliases:
       - stage-spar-checker-de.pixelpark.net
       - stage-web01-spar-checker-de.pixelpark.net
-      - stage-web02-spar-checker-de.pixelpark.net
+#      - stage-web02-spar-checker-de.pixelpark.net
       - www.spar-checker.stage.sparkassen-finanzportal.de
     ssl: false
     docroot_owner: deploy.spk
@@ -74,9 +74,9 @@ infra::profile::apache::pp_vhosts:
       - 'X-Forwarded-For 62.181.145 admin_ip_range'
       - 'X-Forwarded-For 62.181.146 admin_ip_range'
       - 'X-Forwarded-For 192.168.15.16 self_ip_range'
-      - 'X-Forwarded-For 192.168.15.17 self_ip_range'
+#      - 'X-Forwarded-For 192.168.15.17 self_ip_range'
       - 'X-Forwarded-For 192.168.15.18 self_ip_range'
-      - 'X-Forwarded-For 192.168.15.19 self_ip_range'
+#      - 'X-Forwarded-For 192.168.15.19 self_ip_range'
 
     error_documents:
       - { error_code: 401 , document: "/401.html" }