From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 7 Feb 2017 20:47:16 +0000 (+0100)
Subject: Cannot depend on Package[xinetd] without it being defined
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=87906b1fa1014b8ca88fa63854f258e7af507438;p=mirror%2Fdsa-puppet.git

Cannot depend on Package[xinetd] without it being defined
---

diff --git a/modules/xinetd/manifests/service.pp b/modules/xinetd/manifests/service.pp
index 0f0b4a6e4..1aee3b9d6 100644
--- a/modules/xinetd/manifests/service.pp
+++ b/modules/xinetd/manifests/service.pp
@@ -22,8 +22,18 @@ define xinetd::service (
 	case $ensure {
 		present,file: {
 			include xinetd
+			file { "/etc/xinetd.d/${name}":
+				ensure  => $ensure,
+				content => template('xinetd/service.erb'),
+				notify  => Service['xinetd'],
+				require => Package['xinetd'],
+			}
+		}
+		absent: {
+			file { "/etc/xinetd.d/${name}":
+				ensure  => $ensure,
+			}
 		}
-		absent: {}
 		default: { fail("Invalid ensure for '$name'") }
 	}
 
@@ -38,11 +48,4 @@ define xinetd::service (
 			rule        => "&SERVICE(${protocol}, ${fermport})"
 		}
 	}
-
-	file { "/etc/xinetd.d/${name}":
-		ensure  => $ensure,
-		content => template('xinetd/service.erb'),
-		notify  => Service['xinetd'],
-		require => Package['xinetd'],
-	}
 }