Tim Landscheidt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/123882
Change subject: Tools: Use apt::repository instead of file resources
......................................................................
Tools: Use apt::repository instead of file resources
Change-Id: I9214e039eac8b90c9d937a2932686fd65c9d3389
---
M modules/toollabs/manifests/init.pp
1 file changed, 7 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/82/123882/1
diff --git a/modules/toollabs/manifests/init.pp
b/modules/toollabs/manifests/init.pp
index 6fa1943..f0a9c3b 100644
--- a/modules/toollabs/manifests/init.pp
+++ b/modules/toollabs/manifests/init.pp
@@ -110,19 +110,15 @@
}
# Trustworthy enough
- file { '/etc/apt/sources.list.d/mariadb.list':
- ensure => file,
- content => "deb http://ftp.osuosl.org/pub/mariadb/repo/5.5/ubuntu
precise main\n",
- mode => '0444',
- owner => 'root',
- group => 'root',
+ apt::repository { 'mariadb':
+ uri => 'http://ftp.osuosl.org/pub/mariadb/repo/5.5/ubuntu',
+ dist => 'precise',
+ components => 'main',
+ source => false,
+ keyfile => 'puppet:///modules/toollabs/mariadb.gpg',
}
file { '/etc/apt/trusted.gpg.d/mariadb.gpg':
- ensure => file,
- source => 'puppet:///modules/toollabs/mariadb.gpg',
- mode => '0444',
- owner => 'root',
- group => 'root',
+ ensure => absent,
}
File <| title == '/etc/exim4/exim4.conf' |> {
--
To view, visit https://gerrit.wikimedia.org/r/123882
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9214e039eac8b90c9d937a2932686fd65c9d3389
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
