daily autocommit

diff --git a/.etckeeper b/.etckeeper
index 39c8cb0a80f6ed5e5423f2c06c3550bf8ca20823..ce580105653d0da56f020451a3206c3e4d54fc7b 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -2383,8 +2383,6 @@ maybe chmod 0600 'ppp/chap-secrets'
 maybe chmod 0600 'ppp/chap-secrets.example'
 maybe chgrp 'users' 'ppp/forticlientsslvpn.backup.tmp'
 maybe chmod 0644 'ppp/forticlientsslvpn.backup.tmp'
-maybe chgrp 'users' 'ppp/forticlientsslvpn.cleanup.tmp'
-maybe chmod 0644 'ppp/forticlientsslvpn.cleanup.tmp'
 maybe chmod 0755 'ppp/ip-down'
 maybe chmod 0755 'ppp/ip-down.d'
 maybe chmod 0644 'ppp/ip-down.d/30-wins.sh'
@@ -2432,9 +2430,6 @@ maybe chmod 0644 'request-key.d/cifs.spnego.conf'
 maybe chmod 0644 'request-key.d/cifs.upcall.conf'
 maybe chmod 0644 'request-key.d/id_resolver.conf'
 maybe chmod 0644 'resolv.conf'
-maybe chmod 0644 'resolv.conf.pppd-backup'
-maybe chgrp 'users' 'resolv.conf.sslvpn.backup'
-maybe chmod 0644 'resolv.conf.sslvpn.backup'
 maybe chmod 0755 'revdep-rebuild'
 maybe chmod 0644 'revdep-rebuild/60-java'
 maybe chmod 0644 'revdep-rebuild/61-oracle-jdk-bin-1.8'

diff --git a/cups/subscriptions.conf b/cups/subscriptions.conf
index e2d25f19bba475adb2610c21282046e9d036f568..e24e1309ff6ba15d6bab46e9a084aba9aef6cf09 100644 (file)
--- a/cups/subscriptions.conf
+++ b/cups/subscriptions.conf
@@ -1,5 +1,5 @@
 # Subscription configuration file for CUPS v2.1.4
-# Written by cupsd on 2018-04-18 23:51
+# Written by cupsd on 2018-04-19 23:50
 NextSubscriptionId 675
 <Subscription 674>
 Events all
@@ -7,6 +7,6 @@ Owner anonymous
 Recipient dbus://
 LeaseDuration 86400
 Interval 0
-ExpirationTime 1524174637
+ExpirationTime 1524260977
 NextEventId 1
 </Subscription>

diff --git a/ppp/forticlientsslvpn.cleanup.tmp b/ppp/forticlientsslvpn.cleanup.tmp
deleted file mode 100644 (file)
index fc4a2cc..0000000
--- a/ppp/forticlientsslvpn.cleanup.tmp
+++ /dev/null
@@ -1 +0,0 @@
-route=del,93.188.110.49,255.255.255.255,0,10.12.11.254,br0

diff --git a/resolv.conf b/resolv.conf
index 1275906ff9f5131b92506b704aae8c2027138882..9076c0f3da3f4315912ea6570cf46a80418639b3 100644 (file)
--- a/resolv.conf
+++ b/resolv.conf
@@ -1,4 +1,3 @@
-nameserver     10.200.126.253
 # Generated by net-scripts for interface eth0
 domain brehm-online.com
 search home.brehm-online.com home.hennig-berlin.org brehm-online.com hennig-berlin.org uhu-banane.de

diff --git a/resolv.conf.pppd-backup b/resolv.conf.pppd-backup
deleted file mode 100644 (file)
index 9076c0f..0000000
--- a/resolv.conf.pppd-backup
+++ /dev/null
@@ -1,5 +0,0 @@
-# Generated by net-scripts for interface eth0
-domain brehm-online.com
-search home.brehm-online.com home.hennig-berlin.org brehm-online.com hennig-berlin.org uhu-banane.de
-#nameserver 10.12.11.254
-nameserver 127.0.0.1

diff --git a/resolv.conf.sslvpn.backup b/resolv.conf.sslvpn.backup
deleted file mode 100644 (file)
index 9076c0f..0000000
--- a/resolv.conf.sslvpn.backup
+++ /dev/null
@@ -1,5 +0,0 @@
-# Generated by net-scripts for interface eth0
-domain brehm-online.com
-search home.brehm-online.com home.hennig-berlin.org brehm-online.com hennig-berlin.org uhu-banane.de
-#nameserver 10.12.11.254
-nameserver 127.0.0.1