ArielGlenn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/402803 )
Change subject: make role::beta::mediawiki into a profile
......................................................................
make role::beta::mediawiki into a profile
It should be included on all the beta mediawiki hosts, so it should
be a profile that goes in the appropriate role. Make the current
role a shellincluding the profile; when all instances are converted
over to use the profile, the role can go away.
Change-Id: I53e6cf0b93698a415adb0f3b8d7503f9106e3ba5
---
A modules/profile/manifests/beta/mediawiki.pp
M modules/role/manifests/beta/mediawiki.pp
2 files changed, 19 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/03/402803/1
diff --git a/modules/profile/manifests/beta/mediawiki.pp
b/modules/profile/manifests/beta/mediawiki.pp
new file mode 100644
index 0000000..35ec787
--- /dev/null
+++ b/modules/profile/manifests/beta/mediawiki.pp
@@ -0,0 +1,15 @@
+# == Class profile::beta::mediawiki
+#
+# Allow mwdeploy to login from scap deployment host. Adds an exception in
+# /etc/security/access.conf to work around labs-specific restrictions
+#
+# filtertags: labs-project-deployment-prep
+class profile::beta::mediawiki {
+ include ::profile::base::firewall
+
+ $ips =
join($network::constants::special_hosts[$::realm]['deployment_hosts'], ' ')
+ security::access::config { 'scap-allow-mwdeploy':
+ content => "+ : mwdeploy : ${ips}\n",
+ priority => 60,
+ }
+}
diff --git a/modules/role/manifests/beta/mediawiki.pp
b/modules/role/manifests/beta/mediawiki.pp
index f3ebc88..1a058e4 100644
--- a/modules/role/manifests/beta/mediawiki.pp
+++ b/modules/role/manifests/beta/mediawiki.pp
@@ -2,14 +2,11 @@
#
# Allow mwdeploy to login from scap deployment host. Adds an exception in
# /etc/security/access.conf to work around labs-specific restrictions
+# Please consider adding profile::beta::mediawiki to your instance
+# roles instead, it does the same thing. This role is here only for
+# backwards compatibility.
#
# filtertags: labs-project-deployment-prep
class role::beta::mediawiki {
- include ::base::firewall
-
- $ips =
join($network::constants::special_hosts[$::realm]['deployment_hosts'], ' ')
- security::access::config { 'scap-allow-mwdeploy':
- content => "+ : mwdeploy : ${ips}\n",
- priority => 60,
- }
+ include ::profile::beta::mediawiki
}
--
To view, visit https://gerrit.wikimedia.org/r/402803
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I53e6cf0b93698a415adb0f3b8d7503f9106e3ba5
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn <ar...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
