BryanDavis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/283782
Change subject: apt: Conditionally configure multiverse
......................................................................
apt: Conditionally configure multiverse
Only install apt config for multiverse if the existing sources.list does
not already include it.
Change-Id: Ic231f0552b3f6f8e398c13820fb018806f062961
---
M puppet/modules/apt/manifests/init.pp
1 file changed, 14 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/82/283782/1
diff --git a/puppet/modules/apt/manifests/init.pp
b/puppet/modules/apt/manifests/init.pp
index 70a6e2c..8cdafb3 100644
--- a/puppet/modules/apt/manifests/init.pp
+++ b/puppet/modules/apt/manifests/init.pp
@@ -32,9 +32,22 @@
before => Exec['apt-get update'],
}
- file { '/etc/apt/sources.list.d/multiverse.list':
+ file { '/etc/apt/multiverse.list.puppet':
+ owner => 'root',
+ group => 'root',
+ mode => '0444',
content => template('apt/multiverse.list.erb'),
before => Exec['apt-get update'],
+ notify => Exec['multiverse.list'],
+ }
+ # Puppet's File resource doesn't have an unless or onlyif condition, so we
+ # will use an exec to copy the file conditionally instead.
+ exec { 'multiverse.list':
+ command => 'cp multiverse.list.puppet
sources.list.d/multiverse.list',
+ cwd => '/etc/apt',
+ unless => '/bin/grep -q multiverse sources.list',
+ before => Exec['apt-get update'],
+ refreshonly => true,
}
# prefer Wikimedia APT repository packages in all cases
--
To view, visit https://gerrit.wikimedia.org/r/283782
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic231f0552b3f6f8e398c13820fb018806f062961
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: BryanDavis <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
