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
Remove the preference file for all supported platforms when in purge mode
[puppet-modules/puppetlabs-apt.git]
/
manifests
/
init.pp
diff --git
a/manifests/init.pp
b/manifests/init.pp
index 7964eb7c08a14bac398059777e2964bfa78beaa5..c778b6fd4b17c0fe66344277edf0a4169c00adbc 100644
(file)
--- a/
manifests/init.pp
+++ b/
manifests/init.pp
@@
-39,6
+39,10
@@
class apt(
$sources = undef
) {
$sources = undef
) {
+ if $::osfamily != 'Debian' {
+ fail('This module only works on Debian or derivatives like Ubuntu')
+ }
+
include apt::params
include apt::update
include apt::params
include apt::update
@@
-50,13
+54,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,
@@
-89,13
+86,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 == true {
+ file { 'apt-preferences':
+ ensure => absent,
+ path => "${root}/preferences",
+ }
}
file { 'preferences.d':
}
file { 'preferences.d':
@@
-130,15
+125,21
@@
Package: bogus-package\n",
default => present
}
default => present
}
- file { '
configure-apt-
proxy':
+ file { '
01
proxy':
ensure => $proxy_set,
ensure => $proxy_set,
- path => "${apt_conf_d}/proxy",
+ path => "${apt_conf_d}/
01
proxy",
content => "Acquire::http::Proxy \"http://${proxy_host}:${proxy_port}\";\n",
notify => Exec['apt_update'],
mode => '0644',
owner => root,
group => root,
}
content => "Acquire::http::Proxy \"http://${proxy_host}:${proxy_port}\";\n",
notify => Exec['apt_update'],
mode => '0644',
owner => root,
group => root,
}
+
+ file { 'old-proxy-file':
+ ensure => absent,
+ path => "${apt_conf_d}/proxy",
+ notify => Exec['apt_update'],
+ }
# Need anchor to provide containment for dependencies.
anchor { 'apt::update':
# Need anchor to provide containment for dependencies.
anchor { 'apt::update':
@@
-147,7
+148,7
@@
Package: bogus-package\n",
# manage sources if present
if $sources != undef {
# manage sources if present
if $sources != undef {
- validate_hash($sources)
- create_resources('apt::source', $sources)
+
validate_hash($sources)
+
create_resources('apt::source', $sources)
}
}
}
}