daily autocommit

diff --git a/.etckeeper b/.etckeeper
index e18368f6fbcfff38229f140660f0121542efcecd..e2096347d46b9579dd334649e1fab14f9f8bbb37 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -2289,6 +2289,7 @@ maybe chmod 0644 'logrotate.d/libvirtd.qemu'
 maybe chmod 0644 'logrotate.d/lightdm'
 maybe chmod 0644 'logrotate.d/mintupdate'
 maybe chmod 0644 'logrotate.d/mysql-server'
+maybe chmod 0644 'logrotate.d/named'
 maybe chmod 0644 'logrotate.d/pm-utils'
 maybe chmod 0644 'logrotate.d/ppp'
 maybe chmod 0644 'logrotate.d/rsyslog'
@@ -2959,9 +2960,7 @@ maybe chmod 0755 'systemd/system'
 maybe chmod 0644 'systemd/system.conf'
 maybe chmod 0755 'systemd/system.conf.d'
 maybe chmod 0644 'systemd/system.conf.d/50_linuxmint.conf'
-maybe chmod 0644 'systemd/system/bind9.service'
-maybe chmod 0755 'systemd/system/bind9.service.d'
-maybe chmod 0644 'systemd/system/bind9.service.d/override.conf'
+maybe chmod 0644 'systemd/system/bind9.service.deactivated'
 maybe chmod 0755 'systemd/system/bluetooth.target.wants'
 maybe chmod 0755 'systemd/system/cloud-final.service.wants'
 maybe chmod 0755 'systemd/system/default.target.wants'
@@ -2974,6 +2973,8 @@ maybe chmod 0644 'systemd/system/hddtemp.service'
 maybe chmod 0644 'systemd/system/local.service'
 maybe chmod 0755 'systemd/system/mdmonitor.service.wants'
 maybe chmod 0755 'systemd/system/multi-user.target.wants'
+maybe chmod 0755 'systemd/system/named.service.d'
+maybe chmod 0644 'systemd/system/named.service.d/override.conf'
 maybe chmod 0755 'systemd/system/netfilter-persistent.service.d'
 maybe chmod 0644 'systemd/system/netfilter-persistent.service.d/iptables.conf'
 maybe chmod 0755 'systemd/system/network-online.target.wants'

diff --git a/logrotate.d/named b/logrotate.d/named
new file mode 100644 (file)
index 0000000..c327697
--- /dev/null
+++ b/logrotate.d/named
@@ -0,0 +1,34 @@
+/var/log/bind/complete-debug.log /var/log/bind/debug.log /var/log/bind/query.log /var/log/bind/security.log {
+       daily
+       olddir /var/log/bind/.old
+       dateext
+       size 4M
+       rotate 10
+       notifempty
+       missingok
+       compress
+       delaycompress
+       sharedscripts
+       postrotate
+               /usr/sbin/rndc reload
+       endscript
+}
+
+/var/log/bind/named.log {
+       daily
+       olddir /var/log/bind/.old
+       dateext
+       size 10M
+       rotate 20
+       notifempty
+       missingok
+       compress
+       delaycompress
+       sharedscripts
+       postrotate
+               /usr/sbin/rndc reload
+       endscript
+}
+
+
+# vim: ts=4 filetype=conf

diff --git a/systemd/system/bind9.service b/systemd/system/bind9.service
deleted file mode 100644 (file)
index 5a21c45..0000000
--- a/systemd/system/bind9.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=BIND Domain Name Server
-Documentation=man:named(8)
-Wants=nss-lookup.target
-After=networking.service
-Before=nss-lookup.target display-manager.service chrony.service openvpn.service postfix.service smbd.service ssh.service systemd-resolved.service
-
-[Service]
-EnvironmentFile=/etc/default/bind9
-ExecStart=/usr/sbin/named -f $OPTIONS
-ExecReload=/usr/sbin/rndc reload
-ExecStop=/usr/sbin/rndc stop
-
-[Install]
-WantedBy=multi-user.target

diff --git a/systemd/system/bind9.service.d/override.conf b/systemd/system/bind9.service.d/override.conf
deleted file mode 100644 (file)
index 556204b..0000000
--- a/systemd/system/bind9.service.d/override.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[Unit]
-Before=display-manager.service chrony.service openvpn.service postfix.service smbd.service ssh.service systemd-resolved.service

diff --git a/systemd/system/bind9.service.deactivated b/systemd/system/bind9.service.deactivated
new file mode 100644 (file)
index 0000000..5a21c45
--- /dev/null
+++ b/systemd/system/bind9.service.deactivated
@@ -0,0 +1,15 @@
+[Unit]
+Description=BIND Domain Name Server
+Documentation=man:named(8)
+Wants=nss-lookup.target
+After=networking.service
+Before=nss-lookup.target display-manager.service chrony.service openvpn.service postfix.service smbd.service ssh.service systemd-resolved.service
+
+[Service]
+EnvironmentFile=/etc/default/bind9
+ExecStart=/usr/sbin/named -f $OPTIONS
+ExecReload=/usr/sbin/rndc reload
+ExecStop=/usr/sbin/rndc stop
+
+[Install]
+WantedBy=multi-user.target

diff --git a/systemd/system/multi-user.target.wants/bind9.service b/systemd/system/multi-user.target.wants/bind9.service
deleted file mode 120000 (symlink)
index d7c8ee4..0000000
--- a/systemd/system/multi-user.target.wants/bind9.service
+++ /dev/null
@@ -1 +0,0 @@
-/lib/systemd/system/bind9.service
\ No newline at end of file

diff --git a/systemd/system/multi-user.target.wants/smartd.service b/systemd/system/multi-user.target.wants/smartd.service
deleted file mode 120000 (symlink)
index 2e3d023..0000000
--- a/systemd/system/multi-user.target.wants/smartd.service
+++ /dev/null
@@ -1 +0,0 @@
-/lib/systemd/system/smartd.service
\ No newline at end of file

diff --git a/systemd/system/named.service.d/override.conf b/systemd/system/named.service.d/override.conf
new file mode 100644 (file)
index 0000000..556204b
--- /dev/null
+++ b/systemd/system/named.service.d/override.conf
@@ -0,0 +1,2 @@
+[Unit]
+Before=display-manager.service chrony.service openvpn.service postfix.service smbd.service ssh.service systemd-resolved.service