Matanya has uploaded a new change for review.
https://gerrit.wikimedia.org/r/104504
Change subject: ircecho: move to a module
......................................................................
ircecho: move to a module
Change-Id: I9238a052734abcb3f7e4e8412d6b0b5429ebc2ae
---
D manifests/misc/irc.pp
M manifests/misc/wikibugs.pp
M manifests/openstack.pp
A manifests/role/ircecho.pp
M manifests/site.pp
A modules/ircecho/manifests/init.pp
R modules/ircecho/templates/default.erb
M modules/ldap/manifests/client.pp
8 files changed, 42 insertions(+), 67 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/04/104504/1
diff --git a/manifests/misc/irc.pp b/manifests/misc/irc.pp
deleted file mode 100644
index ccee963..0000000
--- a/manifests/misc/irc.pp
+++ /dev/null
@@ -1,35 +0,0 @@
-# IRC-related classes
-
-class misc::ircecho {
-
- # To use this class, you must define some variables; here's an example
- # (leading hashes on channel names are added for you if missing):
- # $ircecho_logs = {
- # "/var/log/nagios/irc.log" =>
["wikimedia-operations","#wikimedia-tech"],
- # "/var/log/nagios/irc2.log" => "#irc2",
- # }
- # $ircecho_nick = "nagios-wm"
- # $ircecho_server = "chat.freenode.net"
-
- package { "ircecho":
- ensure => latest;
- }
-
- service { "ircecho":
- require => Package[ircecho],
- ensure => running;
- }
-
- file {
- "/etc/default/ircecho":
- require => Package[ircecho],
- content => template('ircecho/default.erb'),
- owner => root,
- mode => 0755;
- }
-
- # bug 26784 - IRC bots process need nagios monitoring
- monitor_service { "ircecho": description => "ircecho_service_running",
check_command => "nrpe_check_ircecho" }
-
-}
-
diff --git a/manifests/misc/wikibugs.pp b/manifests/misc/wikibugs.pp
index 554d890..f8aad7e 100644
--- a/manifests/misc/wikibugs.pp
+++ b/manifests/misc/wikibugs.pp
@@ -29,7 +29,7 @@
$ircecho_nick = 'wikibugs'
$ircecho_server = 'chat.freenode.net'
- include misc::ircecho
+ include ircecho
include misc::irc::wikibugs::packages
generic::systemuser { 'wikibugs': name => 'wikibugs' }
diff --git a/manifests/openstack.pp b/manifests/openstack.pp
index 550a923..0f3cd64 100644
--- a/manifests/openstack.pp
+++ b/manifests/openstack.pp
@@ -195,21 +195,7 @@
$ircecho_nick = "labs-storage-wm"
$ircecho_server = "chat.freenode.net"
- package { "ircecho":
- ensure => present;
- }
-
- service { "ircecho":
- require => Package[ircecho],
- ensure => running;
- }
-
- file {
- "/etc/default/ircecho":
- require => Package[ircecho],
- content => template('ircecho/default.erb'),
- owner => root,
- mode => 0755;
+ include ircecho
}
generic::upstart_job{ "manage-volumes":
diff --git a/manifests/role/ircecho.pp b/manifests/role/ircecho.pp
new file mode 100644
index 0000000..ea24098
--- /dev/null
+++ b/manifests/role/ircecho.pp
@@ -0,0 +1,7 @@
+class role::ircecho {
+ include ircecho,
+}
+ # bug 26784 - IRC bots process need nagios monitoring
+ monitor_service { "ircecho": description => "ircecho_service_running",
check_command => "nrpe_check_ircecho" }
+}
+
diff --git a/manifests/site.pp b/manifests/site.pp
index 45c0510..6a1b3a3 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1853,7 +1853,7 @@
include standard,
icinga::monitor,
role::ishmael,
- misc::ircecho,
+ role::ircecho,
tcpircbot,
passwords::logmsgbot
diff --git a/modules/ircecho/manifests/init.pp
b/modules/ircecho/manifests/init.pp
new file mode 100644
index 0000000..8a48121
--- /dev/null
+++ b/modules/ircecho/manifests/init.pp
@@ -0,0 +1,31 @@
+# IRC echo class
+
+class ircecho {
+
+ # To use this class, you must define some variables; here's an example
+ # (leading hashes on channel names are added for you if missing):
+ # $ircecho_logs = {
+ # "/var/log/nagios/irc.log" =>
+ # ["wikimedia-operations","#wikimedia-tech"],
+ # "/var/log/nagios/irc2.log" => "#irc2",
+ # }
+ # $ircecho_nick = "nagios-wm"
+ # $ircecho_server = "chat.freenode.net"
+
+ package { 'ircecho':
+ ensure => latest,
+ }
+
+ service { 'ircecho':
+ require => Package['ircecho'],
+ ensure => running,
+ }
+
+ file { '/etc/default/ircecho':
+ require => Package['ircecho'],
+ content => template('ircecho/default.erb'),
+ owner => 'root',
+ mode => '0755',
+ }
+}
+
diff --git a/templates/ircecho/default.erb
b/modules/ircecho/templates/default.erb
similarity index 100%
rename from templates/ircecho/default.erb
rename to modules/ircecho/templates/default.erb
diff --git a/modules/ldap/manifests/client.pp b/modules/ldap/manifests/client.pp
index fc1a1b6..ef1417d 100644
--- a/modules/ldap/manifests/client.pp
+++ b/modules/ldap/manifests/client.pp
@@ -305,21 +305,7 @@
$ircecho_nick = "labs-home-wm"
$ircecho_server = "chat.freenode.net"
- package { "ircecho":
- ensure => latest;
- }
-
- service { "ircecho":
- require => Package[ircecho],
- ensure => running;
- }
-
- file {
- "/etc/default/ircecho":
- require => Package[ircecho],
- content => template('ircecho/default.erb'),
- owner => root,
- mode => 0755;
+ include ircecho
}
cron { "manage-exports":
--
To view, visit https://gerrit.wikimedia.org/r/104504
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9238a052734abcb3f7e4e8412d6b0b5429ebc2ae
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya <mata...@foss.co.il>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
