Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/346926 )
Change subject: mw_rc_irc: convert to profile/role structure
......................................................................
mw_rc_irc: convert to profile/role structure
Change-Id: I28e481efaa6b50ad2c57ea32dc03f6a1579c33f6
---
M manifests/site.pp
A modules/profile/manifests/mw_rc_irc.pp
M modules/role/manifests/mw_rc_irc.pp
3 files changed, 28 insertions(+), 23 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/site.pp b/manifests/site.pp
index 0876d1f..b60a22a 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1149,8 +1149,6 @@
# irc.wikimedia.org (replaced argon)
node 'kraz.wikimedia.org' {
role(mw_rc_irc)
-
- interface::add_ip6_mapped { 'main': }
}
# labservices1001 hosts openstack-designate, the labs DNS service.
diff --git a/modules/profile/manifests/mw_rc_irc.pp
b/modules/profile/manifests/mw_rc_irc.pp
new file mode 100644
index 0000000..cea1fce
--- /dev/null
+++ b/modules/profile/manifests/mw_rc_irc.pp
@@ -0,0 +1,26 @@
+class profile::mw_rc_irc {
+
+ interface::add_ip6_mapped { 'main': }
+
+ $udpmxircecho_pass = $passwords::udpmxircecho::udpmxircecho_pass
+
+ class { '::mw_rc_irc::irc_echo':
+ ircpassword => $udpmxircecho_pass,
+ }
+
+ class { 'mw_rc_irc::ircserver': }
+
+ # IRCd - public access
+ ferm::service { 'ircd_public':
+ proto => 'tcp',
+ port => '(6664 6665 6666 6667 6668 6669 8001)',
+ }
+
+ # IRC RecentChanges bot - gets updates from appservers
+ ferm::service { 'udpmxircecho':
+ proto => 'udp',
+ port => '9390',
+ srange => '$MW_APPSERVER_NETWORKS',
+ }
+
+}
diff --git a/modules/role/manifests/mw_rc_irc.pp
b/modules/role/manifests/mw_rc_irc.pp
index 7869b9e..947b504 100644
--- a/modules/role/manifests/mw_rc_irc.pp
+++ b/modules/role/manifests/mw_rc_irc.pp
@@ -5,26 +5,7 @@
include ::standard
include ::base::firewall
- include passwords::udpmxircecho
- $udpmxircecho_pass = $passwords::udpmxircecho::udpmxircecho_pass
-
- class { '::mw_rc_irc::irc_echo':
- ircpassword => $udpmxircecho_pass,
- }
-
- include mw_rc_irc::ircserver
-
- # IRCd - public access
- ferm::service { 'ircd_public':
- proto => 'tcp',
- port => '(6664 6665 6666 6667 6668 6669 8001)',
- }
-
- # IRC RecentChanges bot - gets updates from appservers
- ferm::service { 'udpmxircecho':
- proto => 'udp',
- port => '9390',
- srange => '$MW_APPSERVER_NETWORKS',
- }
+ include ::passwords::udpmxircecho
+ include ::profile::mw_rc_irc
}
--
To view, visit https://gerrit.wikimedia.org/r/346926
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I28e481efaa6b50ad2c57ea32dc03f6a1579c33f6
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
