From: Robert Waffen Date: Fri, 14 Sep 2018 15:06:07 +0000 (+0200) Subject: fix lint for fbb-db X-Git-Tag: v0.1.0~104 X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=780ef19fdcf76ef0f1d33c2cddf392e8c90f60ce;p=pixelpark%2Fhiera.git fix lint for fbb-db --- diff --git a/customer/fbb-db/common.yaml b/customer/fbb-db/common.yaml index e601c6cc..59652438 100644 --- a/customer/fbb-db/common.yaml +++ b/customer/fbb-db/common.yaml @@ -1,4 +1,4 @@ - +--- ##################################################### # Postfix configuration: @@ -11,7 +11,7 @@ postfix::myorigin: "pixelpark.net" # Default values for PP Postfix module infra::profile::postfix::myorigin: "%{hiera('postfix::myorigin')}" -#infra::profile::postfix::transport_maps_source: 'maps/transport-fbb' +# infra::profile::postfix::transport_maps_source: 'maps/transport-fbb' infra::profile::postfix::virtual_aliases_source: 'maps/virtual-nullclient-fbb' ##################################################### @@ -37,9 +37,9 @@ accounts::users: apply: true sudo: true -#infra::additional_files: -# '/var/backup': -# ensure: 'directory' -# owner: root -# group: root -# mode: '0755' +# infra::additional_files: +# '/var/backup': +# ensure: 'directory' +# owner: root +# group: root +# mode: '0755' diff --git a/customer/fbb-db/production.yaml b/customer/fbb-db/production.yaml index 8108fd32..545541fa 100644 --- a/customer/fbb-db/production.yaml +++ b/customer/fbb-db/production.yaml @@ -7,7 +7,7 @@ infra::additional_classes: - logstash accounts::users: - #UnitB + # UnitB florian.dorrer: apply: true sudo: false @@ -34,7 +34,7 @@ galera::vendor_version: '10.2' infra::profile::galera_cluster::override_options: mysqld: - innodb_file_per_table: ON + innodb_file_per_table: true wait_timeout: '600' interactive_timeout: '600' max_allowed_packet: '128M' @@ -73,7 +73,7 @@ infra::profile::mysql_server::databases: host: '192.168.65.0/255.255.255.0' flugplan_alt: user: flugplan_alt - password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAZNqDYCbo2ufaECOp5uOQwjso4j36LUAwyLRMRRnSLPrPMKo+jC4bmn4J2c+0qomgKuRFETeBQOd6QCH9xuT8HKwe12/UQ4RJOOTV8rlwyeXFjKymMVijERdsN3A1eub3Xdn8cGvaoKDs32QrP2IVbDa3ahVTl7OsLLa+Ya7ptswKmxXkll1m35a172mSh6gYWMDcWT3bEa7cQnTIxbp1QTo8OTXbDeVkfvQFWmHtPJije+LWzzL2FKhqtl9PMMnhPCF8KG7g9VOsmFhzeXyJtc9VC5WYXSDaKRW+m9fQQ8ZTSErLv5Fm1wKBiie5mG8kKGv67fCX8OwqUaiyLDkBYjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBEAYmDEvD7P4L1A6qfmVqBgCC9gf810UA0S87R3Fbq+/2X7yBmc/HvKuXj8ragDli7kw==] + password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAZNqDYCbo2ufaECOp5uOQwjso4j36LUAwyLRMRRnSLPrPMKo+jC4bmn4J2c+0qomgKuRFETeBQOd6QCH9xuT8HKwe12/UQ4RJOOTV8rlwyeXFjKymMVijERdsN3A1eub3Xdn8cGvaoKDs32QrP2IVbDa3ahVTl7OsLLa+Ya7ptswKmxXkll1m35a172mSh6gYWMDcWT3bEa7cQnTIxbp1QTo8OTXbDeVkfvQFWmHtPJije+LWzzL2FKhqtl9PMMnhPCF8KG7g9VOsmFhzeXyJtc9VC5WYXSDaKRW+m9fQQ8ZTSErLv5Fm1wKBiie5mG8kKGv67fCX8OwqUaiyLDkBYjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBEAYmDEvD7P4L1A6qfmVqBgCC9gf810UA0S87R3Fbq+/2X7yBmc/HvKuXj8ragDli7kw==] host: '192.168.65.0/255.255.255.0' website: user: website diff --git a/customer/fbb-db/test.yaml b/customer/fbb-db/test.yaml index 70754435..3f5595f1 100644 --- a/customer/fbb-db/test.yaml +++ b/customer/fbb-db/test.yaml @@ -5,7 +5,7 @@ infra::additional_classes: - logstash accounts::users: - #UnitB + # UnitB florian.dorrer: apply: true sudo: false @@ -26,6 +26,6 @@ accounts::users: sudo: false christian.schoenherr: apply: true - sudo: false + sudo: false infra::profile::postfix::transport_maps_source: 'maps/transport-fbb-tst' diff --git a/customer/fbb-db/tst-db01-fbb.pixelpark.net.yaml b/customer/fbb-db/tst-db01-fbb.pixelpark.net.yaml index c359b652..6d00283f 100644 --- a/customer/fbb-db/tst-db01-fbb.pixelpark.net.yaml +++ b/customer/fbb-db/tst-db01-fbb.pixelpark.net.yaml @@ -15,7 +15,7 @@ galera::vendor_version: '10.2' infra::profile::galera_cluster::override_options: mysqld: - innodb_file_per_table: ON + innodb_file_per_table: true wait_timeout: '600' interactive_timeout: '600' max_allowed_packet: '128M' @@ -51,7 +51,7 @@ infra::profile::mysql_server::databases: host: '192.168.66.0/255.255.255.0' flugplan_alt: user: flugplan_alt - password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAc810/TEt7ZV1sp/cPSG0Ujwwxd/Hs27/r3CcybZMKXUyTKxrFXZ52tFAJRYzoVzkJlJ805LUAkAVdyS1oAAbrLHVkqSmHdVXhOlW3k3K/DBzk6dwvx/66YYrDq/RiI0dYup/ymQiiNyrUzsuFN4FKdXlVesM22OG7i8AXGgNDO2GS4icDQSsNBdtSmsg6iKbfKuMa961af/hhZgHBPXlUAxJob2ofwL4IJeGcP9mcig58FKs26EJrBaJkhyyYkZWWBE9ZslMILBGnpAptQg4WPphzCsf0E5H71Sg2Wd/qpvt0Vlbs6IIAsfEbO8awC8Id2+gEMXXIf8gMhz+LGtKMjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDlvMZi2s5gtKvXBIEcLYUwgCA0b/ENpeqm79Gb0Qg2XsZ7KWSjG5AVQyJkU/buEwik+g==] + password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAc810/TEt7ZV1sp/cPSG0Ujwwxd/Hs27/r3CcybZMKXUyTKxrFXZ52tFAJRYzoVzkJlJ805LUAkAVdyS1oAAbrLHVkqSmHdVXhOlW3k3K/DBzk6dwvx/66YYrDq/RiI0dYup/ymQiiNyrUzsuFN4FKdXlVesM22OG7i8AXGgNDO2GS4icDQSsNBdtSmsg6iKbfKuMa961af/hhZgHBPXlUAxJob2ofwL4IJeGcP9mcig58FKs26EJrBaJkhyyYkZWWBE9ZslMILBGnpAptQg4WPphzCsf0E5H71Sg2Wd/qpvt0Vlbs6IIAsfEbO8awC8Id2+gEMXXIf8gMhz+LGtKMjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDlvMZi2s5gtKvXBIEcLYUwgCA0b/ENpeqm79Gb0Qg2XsZ7KWSjG5AVQyJkU/buEwik+g==] host: '192.168.66.0/255.255.255.0' website: user: website diff --git a/customer/fbb-db/tst-db02-fbb.pixelpark.net.yaml b/customer/fbb-db/tst-db02-fbb.pixelpark.net.yaml index f990fef4..8e137d07 100644 --- a/customer/fbb-db/tst-db02-fbb.pixelpark.net.yaml +++ b/customer/fbb-db/tst-db02-fbb.pixelpark.net.yaml @@ -15,7 +15,7 @@ galera::vendor_version: '10.2' infra::profile::galera_cluster::override_options: mysqld: - innodb_file_per_table: ON + innodb_file_per_table: true wait_timeout: '600' interactive_timeout: '600' max_allowed_packet: '128M' @@ -51,7 +51,7 @@ infra::profile::mysql_server::databases: host: '192.168.66.0/255.255.255.0' flugplan_alt: user: flugplan_alt - password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAc810/TEt7ZV1sp/cPSG0Ujwwxd/Hs27/r3CcybZMKXUyTKxrFXZ52tFAJRYzoVzkJlJ805LUAkAVdyS1oAAbrLHVkqSmHdVXhOlW3k3K/DBzk6dwvx/66YYrDq/RiI0dYup/ymQiiNyrUzsuFN4FKdXlVesM22OG7i8AXGgNDO2GS4icDQSsNBdtSmsg6iKbfKuMa961af/hhZgHBPXlUAxJob2ofwL4IJeGcP9mcig58FKs26EJrBaJkhyyYkZWWBE9ZslMILBGnpAptQg4WPphzCsf0E5H71Sg2Wd/qpvt0Vlbs6IIAsfEbO8awC8Id2+gEMXXIf8gMhz+LGtKMjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDlvMZi2s5gtKvXBIEcLYUwgCA0b/ENpeqm79Gb0Qg2XsZ7KWSjG5AVQyJkU/buEwik+g==] + password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAc810/TEt7ZV1sp/cPSG0Ujwwxd/Hs27/r3CcybZMKXUyTKxrFXZ52tFAJRYzoVzkJlJ805LUAkAVdyS1oAAbrLHVkqSmHdVXhOlW3k3K/DBzk6dwvx/66YYrDq/RiI0dYup/ymQiiNyrUzsuFN4FKdXlVesM22OG7i8AXGgNDO2GS4icDQSsNBdtSmsg6iKbfKuMa961af/hhZgHBPXlUAxJob2ofwL4IJeGcP9mcig58FKs26EJrBaJkhyyYkZWWBE9ZslMILBGnpAptQg4WPphzCsf0E5H71Sg2Wd/qpvt0Vlbs6IIAsfEbO8awC8Id2+gEMXXIf8gMhz+LGtKMjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDlvMZi2s5gtKvXBIEcLYUwgCA0b/ENpeqm79Gb0Qg2XsZ7KWSjG5AVQyJkU/buEwik+g==] host: '192.168.66.0/255.255.255.0' website: user: website diff --git a/customer/fbb-db/tst-db03-fbb.pixelpark.net.yaml b/customer/fbb-db/tst-db03-fbb.pixelpark.net.yaml index ad1caa90..729d116e 100644 --- a/customer/fbb-db/tst-db03-fbb.pixelpark.net.yaml +++ b/customer/fbb-db/tst-db03-fbb.pixelpark.net.yaml @@ -15,7 +15,7 @@ galera::vendor_version: '10.2' infra::profile::galera_cluster::override_options: mysqld: - innodb_file_per_table: ON + innodb_file_per_table: true wait_timeout: '600' interactive_timeout: '600' max_allowed_packet: '128M' @@ -51,7 +51,7 @@ infra::profile::mysql_server::databases: host: '192.168.66.0/255.255.255.0' flugplan_alt: user: flugplan_alt - password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAc810/TEt7ZV1sp/cPSG0Ujwwxd/Hs27/r3CcybZMKXUyTKxrFXZ52tFAJRYzoVzkJlJ805LUAkAVdyS1oAAbrLHVkqSmHdVXhOlW3k3K/DBzk6dwvx/66YYrDq/RiI0dYup/ymQiiNyrUzsuFN4FKdXlVesM22OG7i8AXGgNDO2GS4icDQSsNBdtSmsg6iKbfKuMa961af/hhZgHBPXlUAxJob2ofwL4IJeGcP9mcig58FKs26EJrBaJkhyyYkZWWBE9ZslMILBGnpAptQg4WPphzCsf0E5H71Sg2Wd/qpvt0Vlbs6IIAsfEbO8awC8Id2+gEMXXIf8gMhz+LGtKMjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDlvMZi2s5gtKvXBIEcLYUwgCA0b/ENpeqm79Gb0Qg2XsZ7KWSjG5AVQyJkU/buEwik+g==] + password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAc810/TEt7ZV1sp/cPSG0Ujwwxd/Hs27/r3CcybZMKXUyTKxrFXZ52tFAJRYzoVzkJlJ805LUAkAVdyS1oAAbrLHVkqSmHdVXhOlW3k3K/DBzk6dwvx/66YYrDq/RiI0dYup/ymQiiNyrUzsuFN4FKdXlVesM22OG7i8AXGgNDO2GS4icDQSsNBdtSmsg6iKbfKuMa961af/hhZgHBPXlUAxJob2ofwL4IJeGcP9mcig58FKs26EJrBaJkhyyYkZWWBE9ZslMILBGnpAptQg4WPphzCsf0E5H71Sg2Wd/qpvt0Vlbs6IIAsfEbO8awC8Id2+gEMXXIf8gMhz+LGtKMjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDlvMZi2s5gtKvXBIEcLYUwgCA0b/ENpeqm79Gb0Qg2XsZ7KWSjG5AVQyJkU/buEwik+g==] host: '192.168.66.0/255.255.255.0' website: user: website