Merge commit 'origin/template' into build

* commit 'origin/template':
  rsyslog: Use another format for forwarding messages.
  ssh: Disable changing of the oom_adj value.
  ssh: Add default initscript configuration.

diff --git a/etc/apt/sources.list b/etc/apt/sources.list
index 6b38f75074d7fc7500b8317953b04fd40789d4ec..ad6731f8c865fa30b05cc03d6fcad5f5d4f4181f 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
+
+# Source for unreleased dovecot 1.2. Not available in binary for stable, so we
+# just use build our own.
+deb-src http://xi.rename-it.nl/debian/ experimental-auto 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