Remove the preference file for all supported platforms when in purge mode

This commit is contained in:
Daniel Paulus 2014-05-02 23:35:54 +02:00
parent d3d6fde6e7
commit e337a24389
2 changed files with 6 additions and 33 deletions

View file

@ -54,18 +54,6 @@ class apt(
true => "# Repos managed by puppet.\n",
}
if $lsbdistcodename == 'wheezy' {
$preferences_content = undef
}
else {
$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,
@ -98,13 +86,11 @@ Package: bogus-package\n",
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':

View file

@ -93,21 +93,8 @@ describe 'apt', :type => :class do
it {
if param_hash[:purge_preferences]
should create_file('apt-preferences').with({
:ensure => 'present',
:ensure => 'absent',
:path => '/etc/apt/preferences',
:owner => 'root',
:group => 'root',
:mode => '0644',
:content => /Explanation/,
})
else
should create_file('apt-preferences').with({
:ensure => 'present',
:path => '/etc/apt/preferences',
:owner => 'root',
:group => 'root',
:mode => '0644',
:content => nil,
})
end
}