From: root <root@drsnuggles.stderr.nl>
Date: Tue, 5 May 2009 16:20:21 +0000 (+0200)
Subject: Merge commit 'origin/template' into build
X-Git-Url: https://git.stderr.nl/gitweb?a=commitdiff_plain;h=4347cfec32eefb0208f06711d972c0687b1a447a;hp=3efd2f3ff6b490e947d45ec28925f35888ec6896;p=matthijs%2Fservers%2Fdrsnuggles.git

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 6b38f75..ad6731f 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
+
+# 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
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