Moving some logrotate definitions to more common places

diff --git a/common.yaml b/common.yaml
index 727b9391c4b0cfa75c942acf41e7eadd7f0dac24..797af2471e5c92f95d3b3ea1ad9c1267c924c7af 100644 (file)
--- a/common.yaml
+++ b/common.yaml
@@ -22,6 +22,47 @@ rsyslog::client::log_remote: true
 rsyslog::client::remote_type: 'udp'
 rsyslog::client::server: 'loghost.pixelpark.com'
 
+#####################################################
+# Logrotation
+
+infra::profile::logrotate::config:
+  rotate_every: 'week'
+  rotate: 4
+  create: true
+  dateext: true
+  compress: true
+  delaycompress: true
+  missingok: true
+  mail: false
+  olddir: false
+  ifempty: false
+
+infra::profile::logrotate::rules:
+  wtmp:
+    path: '/var/log/wtmp'
+    missingok: true
+    dateext: true
+    rotate_every: 'month'
+    create: true
+    create_mode: '0664'
+    create_owner: 'root'
+    create_group: 'utmp'
+    minsize: '1M'
+    rotate: 12
+  btmp:
+    path: '/var/log/btmp'
+    missingok: true
+    dateext: true
+    rotate_every: 'month'
+    create: true
+    create_mode: '0600'
+    create_owner: 'root'
+    create_group: 'utmp'
+    minsize: '1M'
+    rotate: 1
+
+#####################################################
+# Account definitions
 
 accounts::users:
   philipp.dallig:
@@ -1038,3 +1079,5 @@ accounts::users:
     shell: "nologin"
     sudo: false
     uid: 20031
+
+# vim: et list

diff --git a/customer/pixelpark-mail/common.yaml b/customer/pixelpark-mail/common.yaml
index bf2b4c46de1908f8463e7c66280c562a15d44169..c39518070bc3084efccb44c8306cab1f5d41f163 100644 (file)
--- a/customer/pixelpark-mail/common.yaml
+++ b/customer/pixelpark-mail/common.yaml
@@ -109,43 +109,13 @@ rsyslog::client::log_local_custom:
 # Logrotation
 
 infra::profile::logrotate::config:
-  rotate_every: 'week'
-  rotate: 4
-  create: true
-  dateext: true
   dateformat: '-%Y-%m-%d'
-  compress: true
-  delaycompress: true
-  missingok: true
-  mail: false
-  olddir: false
-  ifempty: false
 
 infra::profile::logrotate::rules:
   wtmp:
-    path: '/var/log/wtmp'
-    missingok: true
-    dateext: true
     dateformat: '-%Y-%m-%d'
-    rotate_every: 'month'
-    create: true
-    create_mode: '0664'
-    create_owner: 'root'
-    create_group: 'utmp'
-    minsize: '1M'
-    rotate: 12
   btmp:
-    path: '/var/log/btmp'
-    missingok: true
-    dateext: true
     dateformat: '-%Y-%m-%d'
-    rotate_every: 'month'
-    create: true
-    create_mode: '0600'
-    create_owner: 'root'
-    create_group: 'utmp'
-    minsize: '1M'
-    rotate: 1
   named:
     path: '/var/log/named/*.log'
     rotate_every: 'day'
@@ -182,3 +152,4 @@ infra::profile::logrotate::rules:
       /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-mail02.pixelpark.net.yaml b/customer/pixelpark-mail/test-mail02.pixelpark.net.yaml
index 5d54d72e449bdcb210ec0446e9e52f5a8e98be8f..0aecf7220fd08b3031553f1cd838933b1dbd5a0f 100644 (file)
--- a/customer/pixelpark-mail/test-mail02.pixelpark.net.yaml
+++ b/customer/pixelpark-mail/test-mail02.pixelpark.net.yaml
@@ -37,9 +37,6 @@ infra::profile::sasl::application:
 # Rsyslog configuration
 
 # Logrotation
-infra::profile::logrotate::config:
-  dateformat: '-%Y-%m-%d'
-
 infra::profile::logrotate::rules:
   samba:
     path: '/var/log/samba/*'
@@ -51,4 +48,4 @@ infra::profile::logrotate::rules:
     copytruncate: true
     sharedscripts: true
 
-# vim: et
+# vim: et list

diff --git a/os/RedHat-7.yaml b/os/RedHat-7.yaml
new file mode 100644 (file)
index 0000000..2464f2e
--- /dev/null
+++ b/os/RedHat-7.yaml
@@ -0,0 +1,15 @@
+---
+
+#####################################################
+# Logrotation
+
+infra::profile::logrotate::config:
+  dateformat: '-%Y-%m-%d'
+
+infra::profile::logrotate::rules:
+  wtmp:
+    dateformat: '-%Y-%m-%d'
+  btmp:
+    dateformat: '-%Y-%m-%d'
+
+# vim: et list