]> Frank Brehm's Git Trees - pixelpark/hiera.git/commitdiff
spk-spar-checker remove web02-spar-checker-de
authorAndreas Gerstenberg <gerstenberg@pixelpark.com>
Tue, 6 Feb 2018 14:22:21 +0000 (15:22 +0100)
committerAndreas Gerstenberg <gerstenberg@pixelpark.com>
Tue, 6 Feb 2018 14:22:21 +0000 (15:22 +0100)
customer/spk-spar-checker/production.yaml
customer/spk-spar-checker/web01-spar-checker-de.pixelpark.net.yaml [deleted file]
customer/spk-spar-checker/web02-spar-checker-de.pixelpark.net.yaml [deleted file]

index c8c60cfca4b976666b81c516fc77f55d2722f639..cd8cae1feb44d03fbb67e21a69e9b3529736d96e 100644 (file)
@@ -2,16 +2,6 @@
 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,MIIBmQYJKoZIhvcNAQcDoIIBijCCAYYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAUQVX+ytN1gk5Cy0JHstlNS/4oiYyJCckfpPo51uYDjaH+CHAkGqZtA/P/DbOQ7SrzkCr5/rZwxdcU8G7YL+sS4wb2NJfeLqatkzGZYW56IikfpN5Moh3uEaxr9GYv3kVcS+wTKV2iISK2pn/BMhBOxP7BOZwlzpH3k2UC8X0lpbyG/PxDbutlfUB7p1Cs5YcMyvzBSvoHICQ48MZaBEHvNWJ6DEPd3q4PTNjOYNE/Phu4KNEWFPMTK8PKo8sI75rkMPOQdTLwh/OTF81sqFj1tqaKtbkAwOBXEPjCgMEXmgv4Jbf3Ded6cEillEJEB8K37GAvfOyEbm1hItu2tUmRTBcBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDXVk1qGLlnnjhwl/e8aWXTgDCnPzAo9/965wdJ/9GoNGIqs2co7c4SInv+9RtGrQqgzCdXn31iYaWXYP7pEVhDRvI=]
-mysql::server::grants:
-  'replication@%/*.*':
-    options: 'GRANT'
-    privileges: 'REPLICATION SLAVE'
-    table: '*.*'
-    user: 'replication@%'
-
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEACX70W4nRA+3yFBjVJc6RZB9Ivxahcou4LlF1YyOp4sP4Hg4+Htd0SyMhE3bR0ImaJBpQChahEU6r9NWt0cNLu0i7jp6FQbSV52W0OfX5kyPXTZE07Lc1bOOIP0VLlR36BkkFlgqxu6BcZHpU5I2jLFjCsoksipZhjjGAGRXi5npvSjSEK0QXRD4EapjtHMW1Nfc8gkX1bXmVprBPnD29973KBy4PprHH36kppyZBWbuxgD0V3w18MV263S1YiXMbDXLnHcZdMrjQCYgH4DuhPwpTmMV1L5FYqqm16hWBeNepdRME38CbokXuEXc+lDQURfJhi8+jLI9sE/JPGQ1H7jBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBC5LYfbUHm19ZQk0FWnx6JngCA5dS3buG0jOYgQYhjDg28u37wOmAjhr8Y/cDLcwTsCeg==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAKYgu3RxkWScqDa1PwANjqVxavbX9XyI4ZNzfxNrV8pGeBNNn07hKejoFUlLH97iNEzrThivYL5SuRBrtZmx9m15h7Wr3xQSs7Uwjy33aF4op/ZfDMphBeDhWLUoQbMGg0dUIy3ky9nqlZA+gycx9hj57430FtJUS6uKmd5h51c5z9ZZVN/Xmu5sqj9XrDjhayTYDCMMjbBAXZlHIvifXSTTVRBcIROTn0GBa/PpAuizl/Qs/yGW8LA+AEqUIBiKSOnRdXuabcbTvdEQ7GrrqMFnx+P4yUMIJRNLwM94vUeyApibQ0seqxt3IozZwWaOBGIID+G6L6kclLC3TzJnQ2zBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCJP7+u/I60bVvCrPHsTl8wgCCpo6QJMw3txO10Jp+Y+pIHH6l5E3x123LiZSZt7MmvRw==]
 infra::profile::mysql_server::databases:
@@ -29,7 +19,6 @@ infra::profile::apache::pp_vhosts:
     servername: spar-checker.de
     serveraliases:
       - web01-spar-checker-de.pixelpark.net
-      - web02-spar-checker-de.pixelpark.net
       - spar-checker-de.pixelpark.net
       - sparkasse-sparchecker.de
       - www.spar-checker.de
@@ -64,7 +53,7 @@ infra::profile::apache::pp_vhosts:
       - 'X-Forwarded-For 195.140.44 admin_ip_range'
       - 'X-Forwarded-For 62.181.145 admin_ip_range'
       - 'X-Forwarded-For 62.181.146 admin_ip_range'
-      - 'X-Forwarded-For 192.168.15.1[6789] self_ip_range'
+      - 'X-Forwarded-For 192.168.15.1[68] self_ip_range'
 
     error_documents:
       - { error_code: 401 , document: "/401.html" }
diff --git a/customer/spk-spar-checker/web01-spar-checker-de.pixelpark.net.yaml b/customer/spk-spar-checker/web01-spar-checker-de.pixelpark.net.yaml
deleted file mode 100644 (file)
index 91cae9e..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
----
-infra::additional_classes:
-  - infra::profile::apache_php
-  - infra::profile::mysql_server
-  - infra::profile::cron
-
-mysql::server::override_options:
-  'mysqld':
-    server-id: '1'
-    auto_increment_offset: '1'
-    bind-address: '192.168.15.16'
-    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'
-
diff --git a/customer/spk-spar-checker/web02-spar-checker-de.pixelpark.net.yaml b/customer/spk-spar-checker/web02-spar-checker-de.pixelpark.net.yaml
deleted file mode 100644 (file)
index f555554..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
----
-infra::additional_classes:
-  - infra::profile::apache_php
-  - infra::profile::mysql_server
-  - infra::profile::cron
-
-mysql::server::override_options:
-  'mysqld':
-    server-id: '2'
-    auto_increment_offset: '2'
-    bind-address: '192.168.15.17'
-    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'
-