remove explicit ferm allow from the pgbackup hosts to fasolo

[mirror/dsa-puppet.git] / modules / ferm / manifests / conf.pp

diff --git a/modules/ferm/manifests/conf.pp b/modules/ferm/manifests/conf.pp
index dd3bb0c..c016e09 100644 (file)
--- a/modules/ferm/manifests/conf.pp
+++ b/modules/ferm/manifests/conf.pp
@@ -1,23 +1,41 @@
-define ferm::conf ($content, $source) {
+#
+define ferm::conf (
+  $source=undef,
+  $content=undef,
+  $ensure=present,
+  $prio='xx-10',
+) {
+  include ferm
 
-       case $ensure {
-               present,absent: {}
-               default: { fail ( "Invald ensure `${ensure}' for ${name}" ) }
-       }
+  case $ensure {
+    present: {
+      if ! ($source or $content) {
+        fail ( "No configuration found for ${name}" )
+      }
+    }
+    absent:  {}
+    default: { fail ( "Unknown ensure value: '${ensure}'" ) }
+  }
 
-       if ($source and $content) {
-               fail ( "Can't define both source and content for ${name}" )
-       }
+  if ($source and $content) {
+    fail ( "Can't define both source and content for ${name}" )
+  }
 
-       if $source {
-               file { "/etc/ferm/conf.d/${name}":
-                       ensure => $ensure,
-                       source => $source
-               }
-       } elsif $content {
-               file { "/etc/ferm/conf.d/${name}":
-                       ensure  => $ensure,
-                       content => $content,
-               }
-       }
+  $fname = "/etc/ferm/conf.d/${prio}_${name}.conf"
+
+  if $content {
+    file { $fname:
+        ensure  => $ensure,
+        mode    => '0400',
+        content => $content,
+        notify  => Exec['ferm reload'],
+    }
+  } else {
+    file { $fname:
+        ensure => $ensure,
+        mode   => '0400',
+        source => $source,
+        notify => Exec['ferm reload'],
+    }
+  }
 }