Current state

diff --git a/.etckeeper b/.etckeeper
index 4221f1b9f3918193374cc2474efbd12fba799218..d33385b7ff5c1979abcd57ae77f5b776d9a0b47f 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -693,6 +693,8 @@ maybe chmod 0644 './crontab'
 maybe chmod 0644 './csh.env'
 maybe chgrp lp './cups'
 maybe chmod 0755 './cups'
+maybe chgrp lp './cups/classes.conf'
+maybe chmod 0640 './cups/classes.conf'
 maybe chmod 0644 './cups/client.conf'
 maybe chmod 0644 './cups/command.types'
 maybe chmod 0644 './cups/cups-pdf.conf'
@@ -718,6 +720,10 @@ maybe chmod 0640 './cups/snmp.conf'
 maybe chgrp lp './cups/ssl'
 maybe chmod 0700 './cups/ssl'
 maybe chmod 0644 './cups/ssl/.keep_net-print_cups-0'
+maybe chgrp lp './cups/subscriptions.conf'
+maybe chmod 0640 './cups/subscriptions.conf'
+maybe chgrp lp './cups/subscriptions.conf.O'
+maybe chmod 0640 './cups/subscriptions.conf.O'
 maybe chmod 0755 './cupshelpers'
 maybe chmod 0644 './cupshelpers/preferreddrivers.xml'
 maybe chmod 0755 './dbus-1'
@@ -1383,6 +1389,8 @@ maybe chmod 0700 './lvm/archive'
 maybe chmod 0600 './lvm/archive/vg00_00000-433965340.vg'
 maybe chmod 0600 './lvm/archive/vg0_00000-820034969.vg'
 maybe chmod 0600 './lvm/archive/vg0_00001-507669851.vg'
+maybe chmod 0600 './lvm/archive/vg0_00002-1652382476.vg'
+maybe chmod 0600 './lvm/archive/vg0_00003-1382552338.vg'
 maybe chmod 0600 './lvm/archive/vg1_00000-6377988.vg'
 maybe chmod 0700 './lvm/backup'
 maybe chmod 0600 './lvm/backup/vg0'
@@ -1654,6 +1662,7 @@ maybe chmod 0644 './rc.conf'
 maybe chmod 0644 './request-key.conf'
 maybe chmod 0755 './request-key.d'
 maybe chmod 0644 './resolv.conf'
+maybe chmod 0644 './resolv.conf.bak'
 maybe chmod 0755 './revdep-rebuild'
 maybe chmod 0644 './revdep-rebuild/60-java'
 maybe chmod 0644 './revdep-rebuild/61-oracle-jdk-bin-1.7'

diff --git a/cups/printers.conf b/cups/printers.conf
index 31a3df11dd1b5df827cde39678d1397131534aad..825f4c894ba43427de9a210ba646f7ed7a7c4616 100644 (file)
--- a/cups/printers.conf
+++ b/cups/printers.conf
@@ -1,14 +1,14 @@
 # Printer configuration file for CUPS v1.5.2
-# Written by cupsd on 2012-05-07 22:37
+# Written by cupsd on 2012-06-29 13:03
 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING
-<Printer Dell_2330dn_Laser_Printer>
+<DefaultPrinter Dell_2330dn_Laser_Printer>
 UUID urn:uuid:6320fcff-05cc-3168-6d1c-8306a28977be
 Info Dell 2330dn Laser Printer
 Location Office R+I
 MakeModel Dell 2330dn Laser Printer
 DeviceURI socket://192.168.178.6
 State Idle
-StateTime 1331554954
+StateTime 1340967781
 Type 8425692
 Accepting Yes
 Shared No
@@ -19,8 +19,8 @@ KLimit 0
 OpPolicy default
 ErrorPolicy stop-printer
 Attribute marker-colors \#000000,none,none
-Attribute marker-levels 30,88,0
+Attribute marker-levels 100,87,-1
 Attribute marker-names Black Toner,Fuser,Maintenance Kit
 Attribute marker-types toner,other,other
-Attribute marker-change-time 1331554954
+Attribute marker-change-time 1340967781
 </Printer>

diff --git a/cups/printers.conf.O b/cups/printers.conf.O
index c680b0272f9289d17346c5c4eda88fcfddffb1d8..783d367fbebdaf194c64f2c6a3ce852cbc4b79d4 100644 (file)
--- a/cups/printers.conf.O
+++ b/cups/printers.conf.O
@@ -1,7 +1,8 @@
-# Printer configuration file for CUPS v1.4.8
-# Written by cupsd on 2012-03-12 13:23
+# Printer configuration file for CUPS v1.5.2
+# Written by cupsd on 2012-06-29 13:00
 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING
-<Printer Dell_2330dn_Laser_Printer>
+<DefaultPrinter Dell_2330dn_Laser_Printer>
+UUID urn:uuid:6320fcff-05cc-3168-6d1c-8306a28977be
 Info Dell 2330dn Laser Printer
 Location Office R+I
 MakeModel Dell 2330dn Laser Printer
@@ -9,9 +10,6 @@ DeviceURI socket://192.168.178.6
 State Idle
 StateTime 1331554954
 Type 8425692
-Filter application/vnd.cups-raw 0 -
-Filter application/vnd.cups-command 0 commandtops
-Filter application/vnd.cups-postscript 0 -
 Accepting Yes
 Shared No
 JobSheets none none

diff --git a/fstab b/fstab
index 81753578dce7ac4214fe7dc19ea15f91a02b3510..ff812d7e7e6e8bec6c4992c69bb2bd330cc6e877 100644 (file)
--- a/fstab
+++ b/fstab
@@ -14,19 +14,24 @@
 # <fs>                                 <mountpoint>                            <type>  <opts>                  <dump/pass>
 
 # NOTE: If your BOOT partition is ReiserFS, add the notail option to opts.
-/dev/sdb1                              /boot                                   ext3    noauto,noatime          0 0
-/dev/sdb2                              /                                       ext4    noatime,acl,user_xattr  0 1
-/dev/sdb3                              none                                    swap    sw                      0 0
-/dev/mapper/vg1-distfiles              /usr/portage/distfiles                  ext4    noatime                 0 0
-/dev/cdrom                             /mnt/cdrom                              auto    noauto,ro               0 0
-/dev/fd0                               /mnt/floppy                             auto    noauto                  0 0
+/dev/sdb1                              /boot                                   ext3    noauto,noatime          0       0
+/dev/sdb2                              /                                       ext4    noatime,acl,user_xattr  0       1
+/dev/sdb3                              none                                    swap    sw                      0       0
+/dev/mapper/vg0-tmp                    /tmp                                    ext4    noatime                 0       0
+/dev/mapper/vg0-usr                    /usr                                    ext4    noatime,acl,user_xattr  0       0
+/dev/mapper/vg0-var                    /var                                    ext4    noatime,acl,user_xattr  0       0
+/dev/mapper/vg0-opt                    /opt                                    ext4    noatime,acl,user_xattr  0       0
+
+/dev/mapper/vg1-distfiles              /usr/portage/distfiles                  ext4    noatime                 0       0
+/dev/cdrom                             /mnt/cdrom                              auto    noauto,ro               0       0
+/dev/fd0                               /mnt/floppy                             auto    noauto                  0       0
 
 /dev/mapper/vg00-root                  /b                                      ext3    defaults                0       0
 /dev/mapper/vg00-data                  /b/var/data                             ext4    defaults,user_xattr     0       0
 /dev/mapper/vg00-images                        /var/lib/vbox                           ext4    defaults,noatime        0       0
 
-/b/var/data/fbrehm/Fotos               /home/users/fbrehm/Fotos                none    bind                    0 0
-/b/home/users/fbrehm/Bilder            /home/users/fbrehm/Bilder               none    bind                    0 0
+/b/var/data/fbrehm/Fotos               /home/users/fbrehm/Fotos                none    bind                    0       0
+/b/home/users/fbrehm/Bilder            /home/users/fbrehm/Bilder               none    bind                    0       0
 /b/home/local/fbrehm/Bilder/Naturszenen        /home/users/fbrehm/Bilder/Naturszenen   none    bind            0 0
 /b/home/local/fbrehm/Bilder/Webilder   /home/users/fbrehm/Bilder/Webilder      none    bind            0 0
 /b/home/users/fbrehm/Devel             /home/users/fbrehm/Devel                none    bind                    0 0

diff --git a/printcap b/printcap
index 44341738924de0763a53ae38e247ef8a097cd2ad..d4972e51e935f218ca22d265145cb6f322be142c 100644 (file)
--- a/printcap
+++ b/printcap
@@ -1,11 +1,4 @@
 # This file was automatically generated by cupsd(8) from the
 # /etc/cups/printers.conf file.  All changes to this file
 # will be lost.
-default|Drucker im Büro:rm=samara:rp=default:
-Backoffice|R&I and SysOp:rm=samara:rp=Backoffice:
-Brother_MFC-7440N|Brother MFC-7440N:rm=samara:rp=Brother_MFC-7440N:
-Dell2330dn|Dell 2330dn Printer:rm=samara:rp=Dell2330dn:
 Dell_2330dn_Laser_Printer|Dell 2330dn Laser Printer:rm=samara:rp=Dell_2330dn_Laser_Printer:
-HP_LaserJet_CP1525nw|HP Color LaserJet CP1525nw:rm=samara:rp=HP_LaserJet_CP1525nw:
-HP_LaserJet_M1536dnf|HP LaserJet M1536dnf MFP:rm=samara:rp=HP_LaserJet_M1536dnf:
-Marketing|Marketing and Sales:rm=samara:rp=Marketing:

diff --git a/resolv.conf b/resolv.conf
index ee526e188c11b2bd2175b72bfa98e105bbec40d3..4678cb8a7b004d403a6d21eb79a490dea569f645 100644 (file)
--- a/resolv.conf
+++ b/resolv.conf
@@ -1,5 +1,5 @@
 # Generated by net-scripts for interface eth0
 domain profitbricks.localdomain
-search profitbricks.localdomain brehm-online.com dc1.de.profitbricks.net dc2.us.profitbricks.net dc252.de.profitbricks.net hennig-berlin.org uhu-banane.de
+search profitbricks.localdomain brehm-online.com dc1.de.profitbricks.net dc2.us.profitbricks.net hennig-berlin.org uhu-banane.de dc252.de.profitbricks.net pbb254.de.profitbricks.net
 nameserver 192.168.178.30
 nameserver 192.168.178.89

diff --git a/shadow b/shadow
index 6f9886215f6f0e2575786c2f96ac751ea8e67565..010aa8c20894a482aff99828775f0ff9e39dccde 100644 (file)
--- a/shadow
+++ b/shadow
@@ -37,5 +37,5 @@ gpsd:!:15390::::::
 kdm:!:15390::::::
 apache:!:15391::::::
 postfix:!:15391::::::
-ppd:$5$9nJZu8qE$di6eiBz8RmuY7vsmFbLmniTn1GIeDTy78k56vjYBMfD:15505::::::
+ppd:$5$9nJZu8qE$di6eiBz8RmuY7vsmFbLmniTn1GIeDTy78k56vjYBMfD:15518::::::
 colord:!:15426::::::

diff --git a/shadow- b/shadow-
index 7e643bffd25d9748475b2e8dbaa760f40b5a112a..6f9886215f6f0e2575786c2f96ac751ea8e67565 100644 (file)
--- a/shadow-
+++ b/shadow-
@@ -37,5 +37,5 @@ gpsd:!:15390::::::
 kdm:!:15390::::::
 apache:!:15391::::::
 postfix:!:15391::::::
-ppd:$5$9nJZu8qE$di6eiBz8RmuY7vsmFbLmniTn1GIeDTy78k56vjYBMfD:15502::::::
+ppd:$5$9nJZu8qE$di6eiBz8RmuY7vsmFbLmniTn1GIeDTy78k56vjYBMfD:15505::::::
 colord:!:15426::::::