X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Fmanifests%2Fconf.pp;h=c016e09f37382df00eb8b47cb0396a36ef026e9d;hb=6f1ddb39c54970b5ca34a01fe6fce4a81c6ea12e;hp=602b74ba4f18d4807dbf9fd4ed4a1b54ea77b8a8;hpb=153b12ca026c7d3a9878cb3993af84ea2d58d0a2;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/manifests/conf.pp b/modules/ferm/manifests/conf.pp
index 602b74ba4..c016e09f3 100644
--- a/modules/ferm/manifests/conf.pp
+++ b/modules/ferm/manifests/conf.pp
@@ -1,39 +1,41 @@
 #
 define ferm::conf (
-	$source=undef,
-	$content=undef,
-	$ensure=present,
-	$prio="xx-10",
+  $source=undef,
+  $content=undef,
+  $ensure=present,
+  $prio='xx-10',
 ) {
-	case $ensure {
-		present: {
-			if ! ($source or $content) {
-				fail ( "No configuration found for ${name}" )
-			}
-		}
-		absent:  {}
-		default: { fail ( "Unknown ensure value: '$ensure'" ) }
-	}
+  include ferm
 
-	if ($source and $content) {
-		fail ( "Can't define both source and content for ${name}" )
-	}
+  case $ensure {
+    present: {
+      if ! ($source or $content) {
+        fail ( "No configuration found for ${name}" )
+      }
+    }
+    absent:  {}
+    default: { fail ( "Unknown ensure value: '${ensure}'" ) }
+  }
 
-	$fname = "/etc/ferm/conf.d/${prio}_${name}.conf"
+  if ($source and $content) {
+    fail ( "Can't define both source and content for ${name}" )
+  }
 
-	if $content {
-		file { $fname:
-				ensure  => $ensure,
-				mode	=> '0400',
-				content => $content,
-				notify  => Exec["ferm restart"],
-		}
-	} else {
-		file { $fname:
-				ensure  => $ensure,
-				mode	=> '0400',
-				source  => $source,
-				notify  => Exec["ferm restart"],
-		}
-	}
+  $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'],
+    }
+  }
 }