Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/105946
Change subject: Separate out the config section into misc::smokeping::config
......................................................................
Separate out the config section into misc::smokeping::config
Change-Id: I98ae7e0f709b511e79723c4f8129fd4679bc7602
---
M manifests/misc/smokeping.pp
1 file changed, 13 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/46/105946/1
diff --git a/manifests/misc/smokeping.pp b/manifests/misc/smokeping.pp
index 480eeaa..f61a66d 100644
--- a/manifests/misc/smokeping.pp
+++ b/manifests/misc/smokeping.pp
@@ -1,8 +1,9 @@
# Smokeping server
class misc::smokeping {
-
system::role { "misc::smokeping": description => "Smokeping server" }
+
+ include config
package { "smokeping":
ensure => latest;
@@ -11,6 +12,16 @@
package { "curl":
ensure => latest;
}
+
+ service { 'smokeping':
+ require => [ Package['smokeping'], File["/etc/smokeping/config.d"] ],
+ subscribe => File["/etc/smokeping/config.d" ],
+ ensure => running;
+ }
+}
+
+class misc::smokeping::config {
+ Package['smokeping'] -> Class['misc::smokeping::config']
file { "/etc/smokeping/config.d/":
require => Package['smokeping'],
@@ -21,11 +32,4 @@
mode => 0444,
source => "puppet:///files/smokeping";
}
-
- service { 'smokeping':
- require => [ Package['smokeping'], File["/etc/smokeping/config.d"] ],
- subscribe => File["/etc/smokeping/config.d" ],
- ensure => running;
- }
-
-}
\ No newline at end of file
+}
--
To view, visit https://gerrit.wikimedia.org/r/105946
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I98ae7e0f709b511e79723c4f8129fd4679bc7602
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma <m...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
