From: Robert Waffen Date: Fri, 14 Sep 2018 15:06:12 +0000 (+0200) Subject: fix lint for pixelpark-dns X-Git-Tag: v0.1.0~161 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=7dce0124a2e25c2fe4a52a5e1961d057d3b31e94;p=pixelpark%2Fhiera.git fix lint for pixelpark-dns --- diff --git a/customer/pixelpark-dns/common.yaml b/customer/pixelpark-dns/common.yaml index 7bd28d20..96c6e105 100644 --- a/customer/pixelpark-dns/common.yaml +++ b/customer/pixelpark-dns/common.yaml @@ -36,7 +36,6 @@ infra::profile::logrotate::rules: dateformat: '-%Y-%m-%d' compress: true delaycompress: true - missingok: true sharedscripts: true postrotate: '/usr/sbin/rndc reload >/dev/null' named_run: diff --git a/customer/pixelpark-dns/development.yaml b/customer/pixelpark-dns/development.yaml index 4da97a85..c37aa4d1 100644 --- a/customer/pixelpark-dns/development.yaml +++ b/customer/pixelpark-dns/development.yaml @@ -1,8 +1,8 @@ --- -#infra::additional_classes: -# - rsyslog::client -# - infra::profile::logrotate -# - resolv_conf +# infra::additional_classes: +# - rsyslog::client +# - infra::profile::logrotate +# - resolv_conf # vim: et list diff --git a/customer/pixelpark-dns/dnsmaster.pp-dns.com.yaml b/customer/pixelpark-dns/dnsmaster.pp-dns.com.yaml index 86ef8171..1f86596d 100644 --- a/customer/pixelpark-dns/dnsmaster.pp-dns.com.yaml +++ b/customer/pixelpark-dns/dnsmaster.pp-dns.com.yaml @@ -1,6 +1,6 @@ --- infra::additional_classes: - #- infra::profile::apache + # - infra::profile::apache - rsyslog::client - infra::profile::logrotate @@ -33,7 +33,7 @@ apache::default_vhost: false infra::profile::apache::htdigest: systemshare: www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAqWJier/Gt5EAM6527A6wFgWYaRDYrCDhztdTqDVMTenBy5S+j8zY06gitODRxCEr3CbsBxx8GK5Fh66FY67Z6frJG0hJQK8qII2BuXJX5/Fj9OjmAjIqov8Rt7AK3toxNQxDt1ylgIFst6CVSNNLcLlRvqJwrRT30/9nRmVtUv9tnSH4m+QxQEG3n4ZthHhgx1zfJ+7Qcn0NNX55uE9XvG6ffAUYRdZm2N8Z7dTDTgNAen3WZFW3RbhmbgNZY4htkpyyK6Oppv1rGq6koLwZPuS4q11hgG6icvWjzqSbEDJHWl3lDk6cNdkepAv6kPXHC397fr3VgUMLt7/Yc+YhKDA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBApDAfgAJhCxDLLan6o8dgagBBEVotAvr+dD43/wSXg1GjP] -#test +# test infra::profile::apache::pp_vhosts: systemshare.pixelpark.com: docroot: '/var/www/dns-ui/public_html/' diff --git a/customer/pixelpark-dns/ns1-local.pixelpark.com.yaml b/customer/pixelpark-dns/ns1-local.pixelpark.com.yaml index 0cef1513..e787b18c 100644 --- a/customer/pixelpark-dns/ns1-local.pixelpark.com.yaml +++ b/customer/pixelpark-dns/ns1-local.pixelpark.com.yaml @@ -1,11 +1,11 @@ --- -#infra::role: base +# infra::role: base infra::additional_classes: - bind # - logstash # Necessary, because the host has a local caching only DNS resolver -#puppetconf::server: puppetmaster01.pixelpark.com +# puppetconf::server: puppetmaster01.pixelpark.com bind::local_recursor: true @@ -15,4 +15,3 @@ resolv_conf::nameservers: - '127.0.0.1' - '212.91.225.75' - '93.188.109.13' - diff --git a/customer/pixelpark-dns/ns1.pp-dns.com.yaml b/customer/pixelpark-dns/ns1.pp-dns.com.yaml index 02b5d85b..519910a4 100644 --- a/customer/pixelpark-dns/ns1.pp-dns.com.yaml +++ b/customer/pixelpark-dns/ns1.pp-dns.com.yaml @@ -1,7 +1,6 @@ --- -#infra::role: base +# infra::role: base infra::additional_classes: - bind -#bind::local_recursor: true - +# bind::local_recursor: true diff --git a/customer/pixelpark-dns/ns2-local.pixelpark.com.yaml b/customer/pixelpark-dns/ns2-local.pixelpark.com.yaml index 13629efd..6ff9898e 100644 --- a/customer/pixelpark-dns/ns2-local.pixelpark.com.yaml +++ b/customer/pixelpark-dns/ns2-local.pixelpark.com.yaml @@ -1,11 +1,11 @@ --- -#infra::role: base +# infra::role: base infra::additional_classes: - bind # - logstash # Necessary, because the host has a local caching only DNS resolver -#puppetconf::server: puppetmaster01.pixelpark.com +# puppetconf::server: puppetmaster01.pixelpark.com bind::local_recursor: true @@ -15,4 +15,3 @@ resolv_conf::nameservers: - '127.0.0.1' - '217.66.52.10' - '93.188.109.13' - diff --git a/customer/pixelpark-dns/ns2.pp-dns.com.yaml b/customer/pixelpark-dns/ns2.pp-dns.com.yaml index 071021b9..2e6197ef 100644 --- a/customer/pixelpark-dns/ns2.pp-dns.com.yaml +++ b/customer/pixelpark-dns/ns2.pp-dns.com.yaml @@ -24,7 +24,7 @@ repo::redhat::centos::extra_baseurl: absent rsyslog::client::log_remote: false rsyslog::client::server: ~ -#bind::local_recursor: true +# bind::local_recursor: true bind::deploy::listen_on_v6: true @@ -33,4 +33,3 @@ resolv_conf::nameservers: - 10.55.0.2 - 8.8.8.8 resolv_conf::options: ~ - diff --git a/customer/pixelpark-dns/ns3-local.pixelpark.com.yaml b/customer/pixelpark-dns/ns3-local.pixelpark.com.yaml index 36fd62ba..fe7ce8aa 100644 --- a/customer/pixelpark-dns/ns3-local.pixelpark.com.yaml +++ b/customer/pixelpark-dns/ns3-local.pixelpark.com.yaml @@ -1,11 +1,11 @@ --- -#infra::role: base +# infra::role: base infra::additional_classes: - bind # - logstash # Necessary, because the host has a local caching only DNS resolver -#puppetconf::server: puppetmaster01.pixelpark.com +# puppetconf::server: puppetmaster01.pixelpark.com bind::local_recursor: true @@ -15,4 +15,3 @@ resolv_conf::nameservers: - '127.0.0.1' - '217.66.52.10' - '212.91.225.75' - diff --git a/customer/pixelpark-dns/ns3.pp-dns.com.yaml b/customer/pixelpark-dns/ns3.pp-dns.com.yaml index 3c857e7f..0cffa236 100644 --- a/customer/pixelpark-dns/ns3.pp-dns.com.yaml +++ b/customer/pixelpark-dns/ns3.pp-dns.com.yaml @@ -24,7 +24,7 @@ repo::redhat::centos::extra_baseurl: absent rsyslog::client::log_remote: false rsyslog::client::server: ~ -#bind::local_recursor: true +# bind::local_recursor: true bind::deploy::listen_on_v6: true @@ -33,4 +33,3 @@ resolv_conf::nameservers: - 10.56.0.2 - 8.8.8.8 resolv_conf::options: ~ - diff --git a/customer/pixelpark-dns/ns4.pp-dns.com.yaml b/customer/pixelpark-dns/ns4.pp-dns.com.yaml index 02b5d85b..519910a4 100644 --- a/customer/pixelpark-dns/ns4.pp-dns.com.yaml +++ b/customer/pixelpark-dns/ns4.pp-dns.com.yaml @@ -1,7 +1,6 @@ --- -#infra::role: base +# infra::role: base infra::additional_classes: - bind -#bind::local_recursor: true - +# bind::local_recursor: true diff --git a/customer/pixelpark-dns/production.yaml b/customer/pixelpark-dns/production.yaml index 4fe3cc40..d203fdc2 100644 --- a/customer/pixelpark-dns/production.yaml +++ b/customer/pixelpark-dns/production.yaml @@ -1,4 +1,3 @@ --- # vim: et list - diff --git a/customer/pixelpark-dns/test-dnsmaster.pixelpark.com.yaml b/customer/pixelpark-dns/test-dnsmaster.pixelpark.com.yaml index d4130a4c..a3be59d3 100644 --- a/customer/pixelpark-dns/test-dnsmaster.pixelpark.com.yaml +++ b/customer/pixelpark-dns/test-dnsmaster.pixelpark.com.yaml @@ -1,7 +1,7 @@ --- infra::role: base infra::additional_classes: - #- infra::profile::apache + # - infra::profile::apache - rsyslog::client - infra::profile::logrotate @@ -11,5 +11,3 @@ resolv_conf::nameservers: - '217.66.52.10' - '93.188.109.13' - '212.91.225.75' - - diff --git a/customer/pixelpark-dns/test-dnsslave.pixelpark.com.yaml b/customer/pixelpark-dns/test-dnsslave.pixelpark.com.yaml index 9648b043..ec943e88 100644 --- a/customer/pixelpark-dns/test-dnsslave.pixelpark.com.yaml +++ b/customer/pixelpark-dns/test-dnsslave.pixelpark.com.yaml @@ -1,18 +1,16 @@ --- infra::role: base -#infra::additional_classes: -# - bind +# infra::additional_classes: +# - bind # Necessary, because the host has a local caching only DNS resolver -#puppetconf::server: puppetmaster01.pixelpark.com +# puppetconf::server: puppetmaster01.pixelpark.com bind::local_recursor: true bind::deploy::environment: 'local' -#resolv_conf::nameservers: -# - '127.0.0.1' -# - '212.91.225.75' -# - '93.188.109.13' - - +# resolv_conf::nameservers: +# - '127.0.0.1' +# - '212.91.225.75' +# - '93.188.109.13' diff --git a/customer/pixelpark-dns/test.yaml b/customer/pixelpark-dns/test.yaml index 4da97a85..c37aa4d1 100644 --- a/customer/pixelpark-dns/test.yaml +++ b/customer/pixelpark-dns/test.yaml @@ -1,8 +1,8 @@ --- -#infra::additional_classes: -# - rsyslog::client -# - infra::profile::logrotate -# - resolv_conf +# infra::additional_classes: +# - rsyslog::client +# - infra::profile::logrotate +# - resolv_conf # vim: et list