Code Review
/
puppet-modules
/
puppetlabs-apt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge pull request #332 from zacharyalexstern/fix_readme_typo
[puppet-modules/puppetlabs-apt.git]
/
manifests
/
init.pp
diff --git
a/manifests/init.pp
b/manifests/init.pp
index 03856a273bf00832ace479fe13d7704629862206..597774c8338775a56e1e64c1d3a03ffe8ceb59ce 100644
(file)
--- a/
manifests/init.pp
+++ b/
manifests/init.pp
@@
-55,13
+55,6
@@
class apt(
true => "# Repos managed by puppet.\n",
}
true => "# Repos managed by puppet.\n",
}
- $preferences_content = $purge_preferences ? {
- false => undef,
- true => "Explanation: Preferences managed by Puppet\n
-Explanation: We need a bogus package line because of Debian Bug #732746\n
-Package: bogus-package\n",
- }
-
if $always_apt_update == true {
Exec <| title=='apt_update' |> {
refreshonly => false,
if $always_apt_update == true {
Exec <| title=='apt_update' |> {
refreshonly => false,
@@
-94,13
+87,11
@@
Package: bogus-package\n",
notify => Exec['apt_update'],
}
notify => Exec['apt_update'],
}
- file { 'apt-preferences':
- ensure => present,
- path => "${root}/preferences",
- owner => root,
- group => root,
- mode => '0644',
- content => $preferences_content,
+ if $purge_preferences {
+ file { 'apt-preferences':
+ ensure => absent,
+ path => "${root}/preferences",
+ }
}
file { 'preferences.d':
}
file { 'preferences.d':
@@
-162,7
+153,7
@@
Package: bogus-package\n",
owner => root,
group => root,
}
owner => root,
group => root,
}
-
+
file { 'old-proxy-file':
ensure => absent,
path => "${apt_conf_d}/proxy",
file { 'old-proxy-file':
ensure => absent,
path => "${apt_conf_d}/proxy",