From: Frank Brehm <frank.brehm@profitbricks.com>
Date: Fri, 15 Feb 2013 08:18:16 +0000 (+0100)
Subject: Current state
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=d1da9fd95a6bc44f6ac3c453742ed9c5216fca8a;p=config%2Fsamara%2Fetc.git

Current state
---

diff --git a/passwd- b/passwd-
index bc297fa..67b804b 100644
--- a/passwd-
+++ b/passwd-
@@ -43,3 +43,4 @@ colord:x:113:982:added by portage for colord:/var/lib/colord:/sbin/nologin
 qemu:x:77:984:added by portage for libvirt:/dev/null:/sbin/nologin
 memcached:x:114:2:added by portage for memcached:/dev/null:/sbin/nologin
 polkitd:x:115:981:added by portage for polkit:/var/lib/polkit-1:/sbin/nologin
+saned:x:116:989:added by portage for sane-backends:/dev/null:/sbin/nologin
diff --git a/portage/package.keywords b/portage/package.keywords
index 21904e8..bd37cf8 100644
--- a/portage/package.keywords
+++ b/portage/package.keywords
@@ -42,6 +42,8 @@ app-text/docbook2odf-xsl-stylesheets
 dev-python/fbrehm-libs
 ~dev-python/iniparse-0.4
 ~dev-python/netifaces-0.6
+dev-python/pb-logging
+~dev-python/python-debian-0.1.21
 ~dev-python/virtualenvwrapper-3.2
 
 ~dev-ruby/dnsruby-1.53
diff --git a/resolv.conf b/resolv.conf
index e52ae1b..77f917d 100644
--- a/resolv.conf
+++ b/resolv.conf
@@ -1,5 +1,5 @@
 # Generated by net-scripts for interface eth0
-domain profitbricks.localdomain
+domain pb.local
 search pb.local brehm-online.com dc1.de.profitbricks.net dc2.us.profitbricks.net dc252.de.profitbricks.net uhu-banane.de
 nameserver 192.168.178.30
 nameserver 192.168.178.89
diff --git a/shadow b/shadow
index 331327f..367bb4b 100644
--- a/shadow
+++ b/shadow
@@ -37,7 +37,7 @@ gpsd:!:15390::::::
 kdm:!:15390::::::
 apache:!:15391::::::
 postfix:!:15391::::::
-ppd:$5$9nJZu8qE$di6eiBz8RmuY7vsmFbLmniTn1GIeDTy78k56vjYBMfD:15733::::::
+ppd:$5$9nJZu8qE$di6eiBz8RmuY7vsmFbLmniTn1GIeDTy78k56vjYBMfD:15749::::::
 colord:!:15426::::::
 qemu:!:15538::::::
 memcached:!:15566::::::
diff --git a/shadow- b/shadow-
index e13880e..d768539 100644
--- a/shadow-
+++ b/shadow-
@@ -37,8 +37,9 @@ gpsd:!:15390::::::
 kdm:!:15390::::::
 apache:!:15391::::::
 postfix:!:15391::::::
-ppd:$5$9nJZu8qE$di6eiBz8RmuY7vsmFbLmniTn1GIeDTy78k56vjYBMfD:15733::::::
+ppd:$5$9nJZu8qE$di6eiBz8RmuY7vsmFbLmniTn1GIeDTy78k56vjYBMfD:15747::::::
 colord:!:15426::::::
 qemu:!:15538::::::
 memcached:!:15566::::::
 polkitd:!:15633::::::
+saned:!:15734::::::