Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet

* 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  Raise recursion depth for samhain ignore on etc/puppet
  better header
  Now locals is a template too
  and add a newline
  virtualdomains into a template
  Silly M dashes
  um.  handel is puppetmast4er, not spohr
  Fix the syntax problems.  Some day ....
  Lets see if putting the extra functions in git works
  A little more whitespace.  It wasn't big enough
  Make even purposeless (useless?) hosts have nicely formatted motds

diff --git a/modules/exim/files/per-host/kassia.debian.org/local-settings.conf b/modules/exim/files/per-host/kassia.debian.org/local-settings.conf
new file mode 100644 (file)
index 0000000..1e20792
--- /dev/null
+++ b/modules/exim/files/per-host/kassia.debian.org/local-settings.conf
@@ -0,0 +1,6 @@
+##
+## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
+##
+
+STUPID_FIREWALL = 1

diff --git a/modules/exim/files/per-host/spohr.debian.org/manualroute b/modules/exim/files/per-host/spohr.debian.org/manualroute
index e984dce..81565ed 100644 (file)
--- a/modules/exim/files/per-host/spohr.debian.org/manualroute
+++ b/modules/exim/files/per-host/spohr.debian.org/manualroute
@@ -9,10 +9,10 @@
 
 ancina.debian.org:          ancina.debian.org::2025
 lafayette.debian.org:       lafayette.debian.org::587
+kassia.debian.org:          kassia.debian.org::587
 
 verdi.debian.org:           verdi.debian.org::2025
 volatile.debian.org:        verdi.debian.org::2025
 volatile-master.debian.org: verdi.debian.org::2025
-kassia.debian.org:          kassia.debian.org::2025
 allegri.debian.org:         allegri.debian.org::2025
 piatti.debian.org:          piatti.debian.org::2025