Merge branch 'template' of ssh://matthijs@git.stderr.nl/matthijs/servers/drsnuggles...

* '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 6b38f75074d7fc7500b8317953b04fd40789d4ec..d8773d7db87e1768d6efa8c0e785bd19a02d1ea9 100644 (file)
--- 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 (file)
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 (file)
index 0000000..dee4c5e
--- /dev/null
+++ b/etc/mailname
@@ -0,0 +1 @@
+build.drsnuggles.stderr.nl