From: Frank Brehm Date: Thu, 3 Jan 2013 10:16:01 +0000 (+0100) Subject: Current state X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=9986ff5b789af6a3e4f98a96617f32ac99b0c0ae;p=config%2Fsamara%2Fetc.git Current state --- diff --git a/cups/printers.conf b/cups/printers.conf index 1ccffad..ce7f9e5 100644 --- a/cups/printers.conf +++ b/cups/printers.conf @@ -1,5 +1,5 @@ # Printer configuration file for CUPS v1.5.2 -# Written by cupsd on 2012-11-21 10:21 +# Written by cupsd on 2012-12-17 11:19 # DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING UUID urn:uuid:6320fcff-05cc-3168-6d1c-8306a28977be @@ -8,7 +8,7 @@ Location Office Support MakeModel Dell 2330dn Laser Printer DeviceURI socket://192.168.178.6 State Idle -StateTime 1353489672 +StateTime 1355739545 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 60,84,-1 +Attribute marker-levels 50,83,-1 Attribute marker-names Black Toner,Fuser,Maintenance Kit Attribute marker-types toner,other,other -Attribute marker-change-time 1353489672 +Attribute marker-change-time 1355739545 diff --git a/cups/printers.conf.O b/cups/printers.conf.O index 66014cb..1ccffad 100644 --- a/cups/printers.conf.O +++ b/cups/printers.conf.O @@ -8,7 +8,7 @@ Location Office Support MakeModel Dell 2330dn Laser Printer DeviceURI socket://192.168.178.6 State Idle -StateTime 1353489603 +StateTime 1353489672 Type 8425692 Accepting Yes Shared No @@ -22,5 +22,5 @@ Attribute marker-colors \#000000,none,none Attribute marker-levels 60,84,-1 Attribute marker-names Black Toner,Fuser,Maintenance Kit Attribute marker-types toner,other,other -Attribute marker-change-time 1353489663 +Attribute marker-change-time 1353489672 diff --git a/cups/subscriptions.conf b/cups/subscriptions.conf index f9828aa..c7e3299 100644 --- a/cups/subscriptions.conf +++ b/cups/subscriptions.conf @@ -1,3 +1,3 @@ # Subscription configuration file for CUPS v1.5.2 -# Written by cupsd on 2012-11-22 10:15 -NextSubscriptionId 7 +# Written by cupsd on 2012-12-18 11:19 +NextSubscriptionId 8 diff --git a/cups/subscriptions.conf.O b/cups/subscriptions.conf.O index 8dd074d..08a5e93 100644 --- a/cups/subscriptions.conf.O +++ b/cups/subscriptions.conf.O @@ -1,11 +1,11 @@ # Subscription configuration file for CUPS v1.5.2 -# Written by cupsd on 2012-11-21 10:21 -NextSubscriptionId 7 - +# Written by cupsd on 2012-12-17 11:19 +NextSubscriptionId 8 + Events printer-state-changed printer-restarted printer-shutdown printer-stopped printer-added printer-deleted job-state-changed job-created job-completed job-stopped job-progress Owner fbrehm LeaseDuration 86400 Interval 0 -ExpirationTime 1353575671 -NextEventId 96 +ExpirationTime 1355825944 +NextEventId 4 diff --git a/portage/package.use b/portage/package.use index c34467c..6e73fd6 100644 --- a/portage/package.use +++ b/portage/package.use @@ -266,6 +266,7 @@ sys-block/parted device-mapper sys-devel/gcc libffi mudflap objc objc-gc objc++ sys-devel/libperl ithreads +=sys-fs/mdadm-3.2.6* development sys-fs/udev devfs-compat edd extras hwdb sys-kernel/gentoo-sources -doc diff --git a/shadow b/shadow index ffa3318..066763f 100644 --- a/shadow +++ b/shadow @@ -37,7 +37,7 @@ gpsd:!:15390:::::: kdm:!:15390:::::: apache:!:15391:::::: postfix:!:15391:::::: -ppd:$5$9nJZu8qE$di6eiBz8RmuY7vsmFbLmniTn1GIeDTy78k56vjYBMfD:15637:::::: +ppd:$5$9nJZu8qE$di6eiBz8RmuY7vsmFbLmniTn1GIeDTy78k56vjYBMfD:15686:::::: colord:!:15426:::::: qemu:!:15538:::::: memcached:!:15566:::::: diff --git a/shadow- b/shadow- index ffa3318..066763f 100644 --- a/shadow- +++ b/shadow- @@ -37,7 +37,7 @@ gpsd:!:15390:::::: kdm:!:15390:::::: apache:!:15391:::::: postfix:!:15391:::::: -ppd:$5$9nJZu8qE$di6eiBz8RmuY7vsmFbLmniTn1GIeDTy78k56vjYBMfD:15637:::::: +ppd:$5$9nJZu8qE$di6eiBz8RmuY7vsmFbLmniTn1GIeDTy78k56vjYBMfD:15686:::::: colord:!:15426:::::: qemu:!:15538:::::: memcached:!:15566:::::: diff --git a/ssh/sshd_config b/ssh/sshd_config index 2006bd5..c2dcc3b 100644 --- a/ssh/sshd_config +++ b/ssh/sshd_config @@ -162,7 +162,7 @@ UsePAM yes #X11UseLocalhost yes PrintMotd no PrintLastLog no -#TCPKeepAlive yes +TCPKeepAlive yes #UseLogin no #UsePrivilegeSeparation yes #PermitUserEnvironment no