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

* 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  samhain ignore /etc/apache2/sites-available/www.debian.org
  abel and alwyn run tftpd

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index ea0eb1f03a09e251d2bd36d0f20e2b3f5bcc5607..509023c876cd4520ff5263833aba42f6f4b18f19 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -236,6 +236,7 @@ host_settings:
     - raff.debian.org
     - rautavaara.debian.org
     - reger.debian.org
+    - rem.debian.org
     - salieri.debian.org
     - schuetz.debian.org
     - sibelius.debian.org