ArielGlenn has submitted this change and it was merged. Change subject: remove now obselete snapshot hosts sudoers file ......................................................................
remove now obselete snapshot hosts sudoers file Change-Id: Ib44864755dc33d3b851945e683622ceed917f015 --- D files/snapshot/sudoers.snapshot M manifests/role/snapshot.pp 2 files changed, 0 insertions(+), 57 deletions(-) Approvals: ArielGlenn: Looks good to me, approved jenkins-bot: Verified diff --git a/files/snapshot/sudoers.snapshot b/files/snapshot/sudoers.snapshot deleted file mode 100644 index 373fcf7..0000000 --- a/files/snapshot/sudoers.snapshot +++ /dev/null @@ -1,46 +0,0 @@ -# sudoers file. - -##################################################################### -#### THIS FILE IS MANAGED BY PUPPET -#### puppet:///files/snapshot/sudoers.snapshot -#### Installed by the role::snapshot::common puppet class -###################################################################### -# -# See the sudoers man page for the details on how to write a sudoers file. -# -# vim: sts=0 noet ts=8 - -# User alias specification -User_Alias ADMINS = %wikidev -User_Alias WIKIUSER = apache,%wikidev - -# Cmnd alias specification -Cmnd_Alias ADMIN_COMMANDS = \ - /usr/sbin/apache2ctl, \ - /etc/init.d/apache2, \ - /usr/local/sbin/set-group-write2, \ - /usr/sbin/install-common, \ - /usr/bin/renice - -# User privilege specification -root ALL=(ALL) ALL -ADMINS ALL= NOPASSWD: ADMIN_COMMANDS -WIKIUSER ALL=NOPASSWD: /home/wikipedia/sbin/wikiuser_pass_real - -# Allow admins to run commands as apache, mwdeploy and l10nupdate -ADMINS ALL = (apache,mwdeploy,l10nupdate) NOPASSWD: ALL - -# Allow l10nupdate to run commands as mwdeploy -l10nupdate ALL = (mwdeploy) NOPASSWD: ALL - -# Uncomment to allow people in group wheel to run all commands -# %wheel ALL=(ALL) ALL - -# Same thing without a password -# %wheel ALL=(ALL) NOPASSWD: ALL - -# Samples -# %users ALL=/sbin/mount /cdrom,/sbin/umount /cdrom -# %users localhost=/sbin/shutdown -h now - -nagios ALL=NOPASSWD: /usr/local/bin/check-raid.py "" diff --git a/manifests/role/snapshot.pp b/manifests/role/snapshot.pp index 2818b22..5030446 100644 --- a/manifests/role/snapshot.pp +++ b/manifests/role/snapshot.pp @@ -1,16 +1,5 @@ class role::snapshot::common { include role::dataset::systemusers - # The snapshot nodes do not include standard, so this is needed. - # It also includes some duplication with other modules, and should really go away. - file { '/etc/sudoers.d/appserver': - ensure => present, - path => '/etc/sudoers.d/appserver', - owner => root, - group => root, - mode => '0440', - source => 'puppet:///files/snapshot/sudoers.snapshot', - } - } class role::snapshot::cron::primary { -- To view, visit https://gerrit.wikimedia.org/r/230524 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib44864755dc33d3b851945e683622ceed917f015 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: ArielGlenn <ar...@wikimedia.org> Gerrit-Reviewer: ArielGlenn <ar...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits