Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/105950
Change subject: Move smokeping to a module
......................................................................
Move smokeping to a module
Change-Id: I5bd6c6c8da602f13a3eff9e857fec4b10bae56ca
---
R modules/smokeping/files/config.d/Alerts
R modules/smokeping/files/config.d/General
R modules/smokeping/files/config.d/Probes
R modules/smokeping/files/config.d/Targets
A modules/smokeping/manifests/config.pp
A modules/smokeping/manifests/init.pp
A modules/smokeping/manifests/web.pp
7 files changed, 40 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/50/105950/1
diff --git a/files/smokeping/Alerts b/modules/smokeping/files/config.d/Alerts
similarity index 100%
rename from files/smokeping/Alerts
rename to modules/smokeping/files/config.d/Alerts
diff --git a/files/smokeping/General b/modules/smokeping/files/config.d/General
similarity index 100%
rename from files/smokeping/General
rename to modules/smokeping/files/config.d/General
diff --git a/files/smokeping/Probes b/modules/smokeping/files/config.d/Probes
similarity index 100%
rename from files/smokeping/Probes
rename to modules/smokeping/files/config.d/Probes
diff --git a/files/smokeping/Targets b/modules/smokeping/files/config.d/Targets
similarity index 100%
rename from files/smokeping/Targets
rename to modules/smokeping/files/config.d/Targets
diff --git a/modules/smokeping/manifests/config.pp
b/modules/smokeping/manifests/config.pp
new file mode 100644
index 0000000..7808c7e
--- /dev/null
+++ b/modules/smokeping/manifests/config.pp
@@ -0,0 +1,13 @@
+class smokeping::config {
+ Package['smokeping'] -> Class['smokeping::config']
+
+ file { '/etc/smokeping/config.d':
+ require => Package['smokeping'],
+ ensure => directory,
+ recurse => true,
+ owner => 'root',
+ group => 'root',
+ mode => 0444,
+ source => "puppet:///${module_name}/config.d";
+ }
+}
diff --git a/modules/smokeping/manifests/init.pp
b/modules/smokeping/manifests/init.pp
new file mode 100644
index 0000000..3460c54
--- /dev/null
+++ b/modules/smokeping/manifests/init.pp
@@ -0,0 +1,19 @@
+class smokeping {
+ system::role { 'smokeping': description => 'Smokeping' }
+
+ include config
+
+ package { 'smokeping':
+ ensure => latest;
+ }
+
+ package { 'curl':
+ ensure => latest;
+ }
+
+ service { 'smokeping':
+ require => [ Package['smokeping'], File['/etc/smokeping/config.d'] ],
+ subscribe => File['/etc/smokeping/config.d'],
+ ensure => running;
+ }
+}
diff --git a/modules/smokeping/manifests/web.pp
b/modules/smokeping/manifests/web.pp
new file mode 100644
index 0000000..7e979e3
--- /dev/null
+++ b/modules/smokeping/manifests/web.pp
@@ -0,0 +1,8 @@
+class smokeping::web {
+ @webserver::apache::module { 'fcgid': }
+ @webserver::apache::site { 'smokeping.wikimedia.org':
+ require => Webserver::Apache::Module['fcgid'],
+ docroot => '/var/www',
+ includes => ['/etc/torrus/torrus-apache2.conf']
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/105950
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5bd6c6c8da602f13a3eff9e857fec4b10bae56ca
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
