From: root Date: Tue, 3 Aug 2010 15:49:33 +0000 (+0200) Subject: Merge branch 'template' of ssh://matthijs@git.stderr.nl/matthijs/servers/drsnuggles... X-Git-Url: https://git.stderr.nl/gitweb?a=commitdiff_plain;h=refs%2Fheads%2Fbuild;hp=a799b50b1d46b49b57ce3212c2fcf60317e7a6f9;p=matthijs%2Fservers%2Fdrsnuggles.git Merge branch 'template' of ssh://matthijs@git.stderr.nl/matthijs/servers/drsnuggles into build * 'template' of ssh://matthijs@git.stderr.nl/matthijs/servers/drsnuggles: oidentd: Allow the vserver host to forward connections. oidentd: Add default configuration. --- diff --git a/etc/apt/sources.list b/etc/apt/sources.list index 6b38f75..d8773d7 100644 --- a/etc/apt/sources.list +++ b/etc/apt/sources.list @@ -4,3 +4,7 @@ deb-src http://ftp.nl.debian.org/debian/ lenny main deb http://security.debian.org lenny/updates main deb file:///data/apt-repository/public/ stderr main + +# Allow packages from testing to be installed +deb http://ftp.nl.debian.org/debian/ squeeze main +deb-src http://ftp.nl.debian.org/debian/ squeeze main diff --git a/etc/hostname b/etc/hostname new file mode 100644 index 0000000..dee4c5e --- /dev/null +++ b/etc/hostname @@ -0,0 +1 @@ +build.drsnuggles.stderr.nl diff --git a/etc/mailname b/etc/mailname new file mode 100644 index 0000000..dee4c5e --- /dev/null +++ b/etc/mailname @@ -0,0 +1 @@ +build.drsnuggles.stderr.nl