X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Fmanifests%2Fconf.pp;h=7457094e828111bfe0d7d73e5af21ac7c5a0c3ad;hb=3a8a2ef7517face9cff891c242e90b2cba916b57;hp=a97d4a930712abc57a496780ae8b54ca03cc5cd3;hpb=c1737f93d1e1b2571c76ee69c48994bafbd12849;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/manifests/conf.pp b/modules/ferm/manifests/conf.pp
index a97d4a930..7457094e8 100644
--- a/modules/ferm/manifests/conf.pp
+++ b/modules/ferm/manifests/conf.pp
@@ -1,25 +1,41 @@
-define ferm::conf ($content=undef, $source=undef, $ensure=present) {
+#
+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}" ) }
+		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}" )
 	}
 
-	$fname = "/etc/ferm/conf.d/${name}.conf"
+	$fname = "/etc/ferm/conf.d/${prio}_${name}.conf"
 
-	if $source {
+	if $content {
 		file { $fname:
-			ensure => $ensure,
-			source => $source
+				ensure  => $ensure,
+				mode	=> '0400',
+				content => $content,
+				notify  => Exec['ferm reload'],
 		}
-	} elsif $content {
+	} else {
 		file { $fname:
-			ensure  => $ensure,
-			content => $content,
+				ensure  => $ensure,
+				mode	=> '0400',
+				source  => $source,
+				notify  => Exec['ferm reload'],
 		}
 	}
 }