fix lint for pixelpark-mail

diff --git a/customer/pixelpark-mail/common.yaml b/customer/pixelpark-mail/common.yaml
index dcf383eb0e878b5a9fc135bf6b35bdd3e7f9dd09..ff74f4078750692d944e1b55d3de73f248ae3b9c 100644 (file)
--- a/customer/pixelpark-mail/common.yaml
+++ b/customer/pixelpark-mail/common.yaml
@@ -4,12 +4,16 @@ infra::additional_classes:
   - infra::profile::postfix
 
 # Necessary, because the host has a local caching only DNS resolver
-#puppetconf::server: puppetmaster01.pixelpark.com
+# puppetconf::server: puppetmaster01.pixelpark.com
 
 #####################################################
 # Logrotation
 
 infra::profile::logrotate::rules:
+  wtmp:
+    dateformat: '-%Y-%m-%d'
+  btmp:
+    dateformat: '-%Y-%m-%d'
   named:
     path: '/var/log/named/*.log'
     rotate_every: 'day'
@@ -26,7 +30,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:
@@ -69,7 +72,7 @@ sasl::authd::ldap_auth_method: 'bind'
 sasl::authd::ldap_search_base: 'o=isp'
 sasl::authd::ldap_servers:
   - 'ldap://ldap.pixelpark.com'
-#sasl::authd::ldap_start_tls: false
+# sasl::authd::ldap_start_tls: false
 sasl::authd::bind_dn: 'cn=admin'
 sasl::authd::ldap_bind_dn: 'cn=admin'
 sasl::authd::ldap_password: >
@@ -117,35 +120,35 @@ postfix::manage_mailx: false
 postfix::mastercf_source: 'puppet:///postfix_dir/master.cf'
 postfix::myorigin: 'pixelpark.com'
 
-#infra::profile::postfix::config_directory: '/etc/postfix'
+# infra::profile::postfix::config_directory: '/etc/postfix'
 infra::profile::postfix::aliases_file: '/etc/postfix/maps/aliases'
 infra::profile::postfix::aliases_source: 'puppet:///postfix_dir/maps/aliases'
-#infra::profile::postfix::myorigin: "%{hiera('postfix::myorigin')}"
-#infra::profile::postfix::relayhost: ~
-#infra::profile::postfix::tls: true
-#infra::profile::postfix::tls_cert: ~
-#infra::profile::postfix::tls_key: ~
-#infra::profile::postfix::tls_chain: ~
-#infra::profile::postfix::tls_loglevel: 1
-#infra::profile::postfix::tls_received_header: true
-#infra::profile::postfix::tls_security_level: 'may'
-#infra::profile::postfix::tls_auth_only: false
-#infra::profile::postfix::cert_servername: 'wildcard.pixelpark.com'
-#infra::profile::postfix::cert_customer: 'pixelpark'
+# infra::profile::postfix::myorigin: "%{hiera('postfix::myorigin')}"
+# infra::profile::postfix::relayhost: ~
+# infra::profile::postfix::tls: true
+# infra::profile::postfix::tls_cert: ~
+# infra::profile::postfix::tls_key: ~
+# infra::profile::postfix::tls_chain: ~
+# infra::profile::postfix::tls_loglevel: 1
+# infra::profile::postfix::tls_received_header: true
+# infra::profile::postfix::tls_security_level: 'may'
+# infra::profile::postfix::tls_auth_only: false
+# infra::profile::postfix::cert_servername: 'wildcard.pixelpark.com'
+# infra::profile::postfix::cert_customer: 'pixelpark'
 infra::profile::postfix::has_map_smtp_tls_peers: true
-#infra::profile::postfix::map_smtp_tls_peers: '/etc/postfix/maps/smtp-tls-peers'
+# infra::profile::postfix::map_smtp_tls_peers: '/etc/postfix/maps/smtp-tls-peers'
 infra::profile::postfix::is_relay: true
-#infra::profile::postfix::unverified_recipient_reject_code: '550'
-#infra::profile::postfix::transport_maps_source: ~
+# infra::profile::postfix::unverified_recipient_reject_code: '550'
+# infra::profile::postfix::transport_maps_source: ~
 infra::profile::postfix::virtual_aliases_source: ~
 infra::profile::postfix::has_default_generic: false
-#infra::profile::postfix::virtual_regex: ~
+# infra::profile::postfix::virtual_regex: ~
 
-#infra::profile::postfix::ldap_server: 'ldap.pixelpark.com'
-#infra::profile::postfix::ldap_port: '389'
-#infra::profile::postfix::ldap_timeout: '5'
-#infra::profile::postfix::ldap_search_base: 'o=isp'
-#infra::profile::postfix::ldap_bind_dn: 'cn=admin'
+# infra::profile::postfix::ldap_server: 'ldap.pixelpark.com'
+# infra::profile::postfix::ldap_port: '389'
+# infra::profile::postfix::ldap_timeout: '5'
+# infra::profile::postfix::ldap_search_base: 'o=isp'
+# infra::profile::postfix::ldap_bind_dn: 'cn=admin'
 infra::profile::postfix::ldap_bind_pw: >
     ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEw
     DQYJKoZIhvcNAQEBBQAEggEAkGouEnyjTBA40/lpw1BEHsDx2b2I3L2HHnm9
@@ -169,45 +172,4 @@ rsyslog::client::log_local_custom:
 infra::profile::logrotate::config:
   dateformat: '-%Y-%m-%d'
 
-infra::profile::logrotate::rules:
-  wtmp:
-    dateformat: '-%Y-%m-%d'
-  btmp:
-    dateformat: '-%Y-%m-%d'
-  named:
-    path: '/var/log/named/*.log'
-    rotate_every: 'day'
-    rotate: 10
-    missingok: true
-    minsize: '4M'
-    su_owner: 'named'
-    su_group: 'named'
-    create: true
-    create_mode: '0644'
-    create_owner: 'named'
-    create_group: 'named'
-    dateext: true
-    dateformat: '-%Y-%m-%d'
-    compress: true
-    delaycompress: true
-    missingok: true
-    sharedscripts: true
-    postrotate: |
-      /usr/sbin/rndc reload >/dev/null
-  named_run:
-    path: '/var/named/data/named.run'
-    missingok: true
-    su_owner: 'named'
-    su_group: 'named'
-    create: true
-    create_mode: '0644'
-    create_owner: 'named'
-    create_group: 'named'
-    postrotate: |
-      /usr/bin/systemctl reload named.service > /dev/null 2>&1 || true
-      /usr/bin/systemctl reload named-chroot.service > /dev/null 2>&1 || true
-      /usr/bin/systemctl reload named-sdb.service > /dev/null 2>&1 || true
-      /usr/bin/systemctl reload named-sdb-chroot.service > /dev/null 2>&1 || true
-      /usr/bin/systemctl reload named-pkcs11.service > /dev/null 2>&1 || true
-
 # vim: et list

diff --git a/customer/pixelpark-mail/mail01.pixelpark.com.yaml b/customer/pixelpark-mail/mail01.pixelpark.com.yaml
index c90ec476aad915d4a05de6a97939c2082daea259..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
--- a/customer/pixelpark-mail/mail01.pixelpark.com.yaml
+++ b/customer/pixelpark-mail/mail01.pixelpark.com.yaml
@@ -1,3 +1,2 @@
 ---
 infra::role: base
-

diff --git a/customer/pixelpark-mail/mail02.pixelpark.com.yaml b/customer/pixelpark-mail/mail02.pixelpark.com.yaml
index c90ec476aad915d4a05de6a97939c2082daea259..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
--- a/customer/pixelpark-mail/mail02.pixelpark.com.yaml
+++ b/customer/pixelpark-mail/mail02.pixelpark.com.yaml
@@ -1,3 +1,2 @@
 ---
 infra::role: base
-