Tim Landscheidt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/120241
Change subject: Tools: Rename references to local-admin to tools.admin
......................................................................
Tools: Rename references to local-admin to tools.admin
Bug: 62961
Change-Id: I75c30a00f9e75626c1ae30accf40c4f8c145d66c
---
M modules/toollabs/files/motd-tips.sh
M modules/toollabs/manifests/infrastructure.pp
M modules/toollabs/manifests/master.pp
3 files changed, 6 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/41/120241/1
diff --git a/modules/toollabs/files/motd-tips.sh
b/modules/toollabs/files/motd-tips.sh
index 4e45159..27be8ce 100644
--- a/modules/toollabs/files/motd-tips.sh
+++ b/modules/toollabs/files/motd-tips.sh
@@ -26,7 +26,7 @@
fi
# If user is sysadmin print the sysadmin motd instead.
-if groups | fgrep -qw local-admin; then
+if groups | fgrep -qw tools.admin; then
if [ -f /etc/motd.sysadmin ]; then
echo
echo
diff --git a/modules/toollabs/manifests/infrastructure.pp
b/modules/toollabs/manifests/infrastructure.pp
index 9ff9bc2..6147bb3 100644
--- a/modules/toollabs/manifests/infrastructure.pp
+++ b/modules/toollabs/manifests/infrastructure.pp
@@ -26,7 +26,7 @@
# service group and root.
File <| title == '/etc/security/access.conf' |> {
- content => "-:ALL EXCEPT (local-admin) root:ALL\n",
+ content => "-:ALL EXCEPT (tools.admin) root:ALL\n",
}
}
diff --git a/modules/toollabs/manifests/master.pp
b/modules/toollabs/manifests/master.pp
index ab61220..584786c 100644
--- a/modules/toollabs/manifests/master.pp
+++ b/modules/toollabs/manifests/master.pp
@@ -26,16 +26,16 @@
file { $repo:
ensure => directory,
- owner => 'local-admin',
- group => 'local-admin',
+ owner => 'tools.admin',
+ group => 'tools.admin',
mode => '0755',
require => File[$sysdir],
}
file { "${repo}/update-repo.sh":
ensure => file,
- owner => 'local-admin',
- group => 'local-admin',
+ owner => 'tools.admin',
+ group => 'tools.admin',
mode => '0550',
require => File[$repo],
source => 'puppet:///modules/toollabs/update-repo.sh',
--
To view, visit https://gerrit.wikimedia.org/r/120241
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I75c30a00f9e75626c1ae30accf40c4f8c145d66c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
