fix lint for pixelpark-mail-test

diff --git a/customer/pixelpark-mail-test/common.yaml b/customer/pixelpark-mail-test/common.yaml
index b0ff6313e9e9b73d67a18827b1050a5b157453f3..c68a53d25163afdabf6344c9194ede093ddf10e4 100644 (file)
--- a/customer/pixelpark-mail-test/common.yaml
+++ b/customer/pixelpark-mail-test/common.yaml
@@ -4,12 +4,16 @@ infra::additional_classes:
   - pp_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'
 
-#pp_postfix::config_directory: '/etc/postfix'
+# pp_postfix::config_directory: '/etc/postfix'
 pp_postfix::aliases_file: '/etc/postfix/maps/aliases'
 pp_postfix::aliases_source: 'puppet:///postfix_dir/maps/aliases'
-#pp_postfix::myorigin: "%{hiera('postfix::myorigin')}"
-#pp_postfix::relayhost: ~
-#pp_postfix::tls: true
-#pp_postfix::tls_cert: ~
-#pp_postfix::tls_key: ~
-#pp_postfix::tls_chain: ~
-#pp_postfix::tls_loglevel: 1
-#pp_postfix::tls_received_header: true
-#pp_postfix::tls_security_level: 'may'
-#pp_postfix::tls_auth_only: false
-#pp_postfix::cert_servername: 'wildcard.pixelpark.com'
-#pp_postfix::cert_customer: 'pixelpark'
+# pp_postfix::myorigin: "%{hiera('postfix::myorigin')}"
+# pp_postfix::relayhost: ~
+# pp_postfix::tls: true
+# pp_postfix::tls_cert: ~
+# pp_postfix::tls_key: ~
+# pp_postfix::tls_chain: ~
+# pp_postfix::tls_loglevel: 1
+# pp_postfix::tls_received_header: true
+# pp_postfix::tls_security_level: 'may'
+# pp_postfix::tls_auth_only: false
+# pp_postfix::cert_servername: 'wildcard.pixelpark.com'
+# pp_postfix::cert_customer: 'pixelpark'
 pp_postfix::has_map_smtp_tls_peers: true
-#pp_postfix::map_smtp_tls_peers: '/etc/postfix/maps/smtp-tls-peers'
+# pp_postfix::map_smtp_tls_peers: '/etc/postfix/maps/smtp-tls-peers'
 pp_postfix::is_relay: true
-#pp_postfix::unverified_recipient_reject_code: '550'
-#pp_postfix::transport_maps_source: ~
+# pp_postfix::unverified_recipient_reject_code: '550'
+# pp_postfix::transport_maps_source: ~
 pp_postfix::virtual_aliases_source: ~
 pp_postfix::has_default_generic: false
-#pp_postfix::virtual_regex: ~
+# pp_postfix::virtual_regex: ~
 
-#pp_postfix::ldap_server: 'ldap.pixelpark.com'
-#pp_postfix::ldap_port: '389'
-#pp_postfix::ldap_timeout: '5'
-#pp_postfix::ldap_search_base: 'o=isp'
-#pp_postfix::ldap_bind_dn: 'cn=admin'
+# pp_postfix::ldap_server: 'ldap.pixelpark.com'
+# pp_postfix::ldap_port: '389'
+# pp_postfix::ldap_timeout: '5'
+# pp_postfix::ldap_search_base: 'o=isp'
+# pp_postfix::ldap_bind_dn: 'cn=admin'
 pp_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-test/test-mail02.pixelpark.net.yaml b/customer/pixelpark-mail-test/test-mail02.pixelpark.net.yaml
index a5843a2d365823a19403a4c913b9a6b461e1eec5..12ac7a90505a32bc4ba9dc4953beb2a0f3d3ed03 100644 (file)
--- a/customer/pixelpark-mail-test/test-mail02.pixelpark.net.yaml
+++ b/customer/pixelpark-mail-test/test-mail02.pixelpark.net.yaml
@@ -15,27 +15,27 @@ infra::profile::ntp::disable_ntp: true
 chrony::do_log: true
 
 # For testing the accounts module
-#accounts::users:
-#  web:
-#    apply: false
-#    sudo: false
-#    uid: 60300
-#    comment: 'Test Webuser'
-#    group: 'web'
-#    groups:
-#      - 'apache'
-#      - 'wheel'
-#    shell: 'bash'
-#  annika.wenzel:
-#    apply: false
-#    groups:
-#      - apache
-#  dennis.klein:
-#    apply: false
-#    group: apache
-#    groups:
-#      - users
-#      - wheel
+# accounts::users:
+#   web:
+#     apply: false
+#     sudo: false
+#     uid: 60300
+#     comment: 'Test Webuser'
+#     group: 'web'
+#     groups:
+#       - 'apache'
+#       - 'wheel'
+#     shell: 'bash'
+#   annika.wenzel:
+#     apply: false
+#     groups:
+#       - apache
+#   dennis.klein:
+#     apply: false
+#     group: apache
+#     groups:
+#       - users
+#       - wheel
 
 # Necessary, because the host has a local caching only DNS resolver
 puppetconf::server: puppetmaster01.pixelpark.com
@@ -47,11 +47,11 @@ resolv_conf::nameservers:
 
 #####################################################
 # SASL configuration
-#sasl::authd::mechanism: 'rimap'
+# sasl::authd::mechanism: 'rimap'
 
-#sasl::authd::ldap_filter: >
+# sasl::authd::ldap_filter: >
 #  (&(objectclass=inetlocalmailrecipient)(|(uid=%u)(mail=%u)))
-#sasl::authd::ldap_filter: '(&(objectclass=inetlocalmailrecipient)(mail=%u@%r))'
+# sasl::authd::ldap_filter: '(&(objectclass=inetlocalmailrecipient)(mail=%u@%r))'
 sasl::authd::imap_server: 'mail-brln-store02.pixelpark.com'
 sasl::authd::threads: 2
 sasl::authd::ldap_version: 3
@@ -82,4 +82,3 @@ infra::profile::logrotate::rules:
     dateformat: '-%Y-%m-%d'
     copytruncate: true
     sharedscripts: true
-