Thcipriani has uploaded a new change for review. https://gerrit.wikimedia.org/r/313927
Change subject: Beta: Move beta::deployaccess to role::beta::deployaccess ...................................................................... Beta: Move beta::deployaccess to role::beta::deployaccess Change-Id: I16cb7cc2e8f9ef81cec41ce9a29e00d2c34e64a3 --- D modules/beta/manifests/deployaccess.pp A modules/role/manifests/beta/mediawiki.pp 2 files changed, 12 insertions(+), 12 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/27/313927/1 diff --git a/modules/beta/manifests/deployaccess.pp b/modules/beta/manifests/deployaccess.pp deleted file mode 100644 index 754412b..0000000 --- a/modules/beta/manifests/deployaccess.pp +++ /dev/null @@ -1,12 +0,0 @@ -# TODO: remove this if https://phabricator.wikimedia.org/T121721 -# is fixed. -class beta::deployaccess( - $bastion_ip = '10.68.20.135', # ip of deployment-mira -) { - - security::access::config { 'beta-allow-mwdeploy': - content => "+ : deploy-service mwdeploy : ${bastion_ip}\n", - priority => 50, - } - -} diff --git a/modules/role/manifests/beta/mediawiki.pp b/modules/role/manifests/beta/mediawiki.pp new file mode 100644 index 0000000..f37cb52 --- /dev/null +++ b/modules/role/manifests/beta/mediawiki.pp @@ -0,0 +1,12 @@ +# == Class role::beta::mediawiki +# +# Allow mwdeploy to login from scap deployment host. Adds an exception in +# /etc/security/access.conf to work around labs-specific restrictions +class role::beta::mediawiki { + $deployment_host = hiera('scap::deployment_server') + $deployment_ip = ipresolve($deployment_host) + security::access::config { 'scap-allow-mwdeploy': + content => "+ : mwdeploy : ${deployment_ip}\n", + priority => 60, + } +} -- To view, visit https://gerrit.wikimedia.org/r/313927 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I16cb7cc2e8f9ef81cec41ce9a29e00d2c34e64a3 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Thcipriani <tcipri...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
