From 1c7e6f22d5022655d37896d126a89442ca3fe251 Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Tue, 14 Aug 2012 11:24:12 +0200 Subject: [PATCH] Current state --- conf.d/net | 2 +- make.conf | 4 ++-- portage/package.keywords | 2 ++ portage/package.use | 3 ++- resolv.conf | 2 +- shadow | 2 +- shadow- | 2 +- 7 files changed, 10 insertions(+), 7 deletions(-) diff --git a/conf.d/net b/conf.d/net index be67999..e64053d 100644 --- a/conf.d/net +++ b/conf.d/net @@ -8,5 +8,5 @@ config_eth0="192.168.178.88/24" routes_eth0="default via 192.168.178.254" dns_domain_eth0="profitbricks.localdomain" -dns_servers_eth0="192.168.178.30 192.168.178.85" +dns_servers_eth0="192.168.178.30 192.168.178.89" dns_search_eth0="profitbricks.localdomain brehm-online.com dc1.de.profitbricks.net dc2.us.profitbricks.net dc252.de.profitbricks.net uhu-banane.de" diff --git a/make.conf b/make.conf index bae4d8c..012fda0 100644 --- a/make.conf +++ b/make.conf @@ -33,8 +33,8 @@ ACCEPT_LICENSE=" \ Oracle-BCLA-JavaSE \ " -#EMERGE_DEFAULT_OPTS="--with-bdeps y --quiet-build=y --jobs=4 --load-average=10" -EMERGE_DEFAULT_OPTS="--with-bdeps y" +EMERGE_DEFAULT_OPTS="--with-bdeps y --quiet-build=y --jobs=4 --load-average=10" +#EMERGE_DEFAULT_OPTS="--with-bdeps y" CONFIG_PROTECT="/usr/share/xsessions \ /var/www/localhost/htdocs/phpmyadmin \ diff --git a/portage/package.keywords b/portage/package.keywords index 182bfb0..1d216d5 100644 --- a/portage/package.keywords +++ b/portage/package.keywords @@ -50,6 +50,8 @@ mail-client/thunderbird ~net-im/skype-2.2.0.35 +~net-libs/libvncserver-0.9.9 + ~sys-apps/etckeeper-0.58 ~sys-apps/ppd-9999 diff --git a/portage/package.use b/portage/package.use index a73651b..545e762 100644 --- a/portage/package.use +++ b/portage/package.use @@ -131,7 +131,7 @@ mail-client/evolution exchange -pda mail-client/thunderbird mozdom replytolist system-sqlite mail-client/nail net -mail-mta/postfix vda +mail-mta/postfix memcached vda media-gfx/dcraw gimp media-gfx/exiv2 contrib xmp @@ -220,6 +220,7 @@ net-im/psi extras jingle #net-libs/libgadu ssl net-libs/libssh2 gcrypt +net-libs/libvncserver gcrypt gnutls net-libs/xulrunner system-sqlite wifi net-misc/curl libssh2 diff --git a/resolv.conf b/resolv.conf index 6cce0b2..c0ab547 100644 --- a/resolv.conf +++ b/resolv.conf @@ -2,4 +2,4 @@ domain profitbricks.localdomain search profitbricks.localdomain 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.85 +nameserver 192.168.178.89 diff --git a/shadow b/shadow index b39e80b..8512ce0 100644 --- a/shadow +++ b/shadow @@ -37,6 +37,6 @@ gpsd:!:15390:::::: kdm:!:15390:::::: apache:!:15391:::::: postfix:!:15391:::::: -ppd:$5$9nJZu8qE$di6eiBz8RmuY7vsmFbLmniTn1GIeDTy78k56vjYBMfD:15545:::::: +ppd:$5$9nJZu8qE$di6eiBz8RmuY7vsmFbLmniTn1GIeDTy78k56vjYBMfD:15565:::::: colord:!:15426:::::: qemu:!:15538:::::: diff --git a/shadow- b/shadow- index 49cf3ad..b39e80b 100644 --- a/shadow- +++ b/shadow- @@ -37,6 +37,6 @@ gpsd:!:15390:::::: kdm:!:15390:::::: apache:!:15391:::::: postfix:!:15391:::::: -ppd:$5$9nJZu8qE$di6eiBz8RmuY7vsmFbLmniTn1GIeDTy78k56vjYBMfD:15518:::::: +ppd:$5$9nJZu8qE$di6eiBz8RmuY7vsmFbLmniTn1GIeDTy78k56vjYBMfD:15545:::::: colord:!:15426:::::: qemu:!:15538:::::: -- 2.39.5