Faidon Liambotis has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/353013 )
Change subject: Revert "base::standard_packages: Remove ubuntu precise check"
......................................................................
Revert "base::standard_packages: Remove ubuntu precise check"
This was obviously broken and misguided. os_version("ubuntu => precise")
returns false on Debian systems and as was obvious by the commit message
that introduced this, this was there to avoid being applied on jessie
systems.
This currently breaks labnodepool1001, which uninstalls libguestfs-tools
on even puppet runs, only to reinstall it on odd ones.
This reverts commit a8b64a73f30a93ecdff7d3835d8eca95985f6422.
Change-Id: I1728ba340ebdf82c11ec3f5ef2f5f7f2ec783182
---
M modules/base/manifests/standard_packages.pp
1 file changed, 10 insertions(+), 1 deletion(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/base/manifests/standard_packages.pp
b/modules/base/manifests/standard_packages.pp
index 6beec23..f8b6f5b 100644
--- a/modules/base/manifests/standard_packages.pp
+++ b/modules/base/manifests/standard_packages.pp
@@ -52,7 +52,6 @@
'command-not-found-data',
'ecryptfs-utils',
'mlocate',
- 'ntfs-3g',
'os-prober',
'python3-apport',
'wpasupplicant',
@@ -60,6 +59,16 @@
ensure => absent,
}
+ # Installed by default on Ubuntu, but not used (and it's setuid root, so
+ # a potential security risk).
+ #
+ # Limited to Ubuntu, since Debian doesn't pull it in by default and at
+ # least on labnodepool1001 we have a real world use case since libguestfs0
+ # pulls in ntfs-3g.
+ if os_version('ubuntu >= trusty') {
+ package { 'ntfs-3g': ensure => absent }
+ }
+
# On Ubuntu, eject is installed via the ubuntu-minimal package
# Uninstall in on Debian since it ships a setuid helper and we don't
# have servers with installed optical drives
--
To view, visit https://gerrit.wikimedia.org/r/353013
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1728ba340ebdf82c11ec3f5ef2f5f7f2ec783182
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Paladox <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
