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:
  make the range slightly more readable
  maybe that works better with correct syntax
  ensure correct path permissions, so nagios can read from it

diff --git a/modules/debian-org/misc/hoster.yaml b/modules/debian-org/misc/hoster.yaml
index d7dc606..bbd26b9 100644 (file)
--- a/modules/debian-org/misc/hoster.yaml
+++ b/modules/debian-org/misc/hoster.yaml
@@ -24,7 +24,7 @@ osousl:
 sanger:
   - 193.62.202.24/29
 sil:
-  - 86.59.118.153/28
+  - 86.59.118.144/28
 scanplus:
   - 212.211.132.0/26
   - 212.211.132.248/29

diff --git a/modules/ferm/manifests/init.pp b/modules/ferm/manifests/init.pp
index d49d9f8..467af75 100644 (file)
--- a/modules/ferm/manifests/init.pp
+++ b/modules/ferm/manifests/init.pp
@@ -27,6 +27,9 @@ class ferm {
             recurse => true,
             source  => "puppet:///files/empty/",
             require => Package["ferm"];
+        "/etc/ferm":
+            ensure  => directory,
+            mode    => 0755;
         "/etc/ferm/conf.d":
             ensure => directory,
             require => Package["ferm"];