From: Frank Brehm <frank@brehm-online.com>
Date: Tue, 11 Oct 2016 01:10:05 +0000 (+0200)
Subject: daily autocommit
X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=e09287af26f536a71d75db25680cee03d18c4c9a;p=config%2Fbruni%2Fetc.git

daily autocommit
---

diff --git a/cups/subscriptions.conf b/cups/subscriptions.conf
index d3c90de2..d782b1e6 100644
--- a/cups/subscriptions.conf
+++ b/cups/subscriptions.conf
@@ -1,20 +1,12 @@
 # Subscription configuration file for CUPS v2.1.3
-# Written by cupsd on 2016-10-09 10:01
+# Written by cupsd on 2016-10-10 10:04
 NextSubscriptionId 305
-<Subscription 302>
-Events printer-changed
-Owner root
-LeaseDuration 86400
-Interval 60
-ExpirationTime 1476086398
-NextEventId 1
-</Subscription>
 <Subscription 303>
 Events all
 Owner anonymous
 Recipient dbus://
 LeaseDuration 86400
 Interval 0
-ExpirationTime 1476086398
+ExpirationTime 1476172738
 NextEventId 1
 </Subscription>
diff --git a/resolv.conf b/resolv.conf
index 1602b40a..9076c0f3 100644
--- a/resolv.conf
+++ b/resolv.conf
@@ -1,7 +1,5 @@
-# Hand made by Frank Brehm
-domain home.brehm-online.com
-#search home.brehm-online.com brehm-online.com hennig-berlin.org uhu-banane.de pb.local dc1.pb.local dc2.pb.local
-search home.brehm-online.com brehm-online.com pb.local stage.pb.local dc1.de.profitbricks.net dc2.us.profitbricks.net dc3.de.profitbricks.net
-#nameserver 10.12.11.1
-nameserver 192.168.178.30
-nameserver 192.168.178.89
+# 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