Tim Landscheidt has uploaded a new change for review. https://gerrit.wikimedia.org/r/119428
Change subject: WIP: Tools: Use labsdeprepo ...................................................................... WIP: Tools: Use labsdeprepo Bug: 60925 Change-Id: I168565f61b2af26558becfbceb0dce29b4040ee5 --- M modules/toollabs/manifests/init.pp M modules/toollabs/manifests/master.pp 2 files changed, 3 insertions(+), 13 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/28/119428/1 diff --git a/modules/toollabs/manifests/init.pp b/modules/toollabs/manifests/init.pp index 6fa1943..7bbbda8 100644 --- a/modules/toollabs/manifests/init.pp +++ b/modules/toollabs/manifests/init.pp @@ -101,13 +101,8 @@ # that are intended to be local to the project. By keeping it on the # shared storage, we have no need to set up a server to use it. - file { '/etc/apt/sources.list.d/local.list': - ensure => file, - content => "deb [ arch=amd64 trusted=yes ] file:${repo}/ amd64/\ndeb [arch=all trusted=yes ] file:${repo}/ all/\n", - mode => '0444', - owner => 'root', - group => 'root', - } + misc::labsdebrepo { 'arch=amd64', 'trusted=yes', "$repo/amd64": } + misc::labsdebrepo { 'arch=all', 'trusted=yes', "$repo/all": } # Trustworthy enough file { '/etc/apt/sources.list.d/mariadb.list': diff --git a/modules/toollabs/manifests/master.pp b/modules/toollabs/manifests/master.pp index ab61220..7dffe61 100644 --- a/modules/toollabs/manifests/master.pp +++ b/modules/toollabs/manifests/master.pp @@ -33,12 +33,7 @@ } file { "${repo}/update-repo.sh": - ensure => file, - owner => 'local-admin', - group => 'local-admin', - mode => '0550', - require => File[$repo], - source => 'puppet:///modules/toollabs/update-repo.sh', + ensure => absent, } } -- To view, visit https://gerrit.wikimedia.org/r/119428 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I168565f61b2af26558becfbceb0dce29b4040ee5 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Tim Landscheidt <t...@tim-landscheidt.de> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits