diff options
Diffstat (limited to 'manifests/preferences.pp')
| -rw-r--r-- | manifests/preferences.pp | 37 |
1 files changed, 23 insertions, 14 deletions
diff --git a/manifests/preferences.pp b/manifests/preferences.pp index 548098f..a1e78ee 100644 --- a/manifests/preferences.pp +++ b/manifests/preferences.pp @@ -2,13 +2,19 @@ class apt::preferences { if ($apt::manage_preferences == true) and ($apt::custom_preferences != undef) { - file { '/etc/apt/preferences.d/custom': - ensure => present, - alias => 'apt_config', - # only update together - content => $custom_preferences, - require => File['/etc/apt/sources.list'], - owner => root, group => 0, mode => '0644'; + file { + '/etc/apt/preferences.d/custom': + ensure => present, + alias => 'apt_config', + content => template(${apt::custom_preferences}), + require => File['/etc/apt/sources.list'], + owner => root, group => 0, mode => '0644'; + + [ '/etc/apt/preferences.d/stable', + '/etc/apt/preferences.d/volatile', + '/etc/apt/preferences.d/lts', + '/etc/apt/preferences.d/nextcodename' ]: + ensure => absent; } } @@ -16,13 +22,16 @@ class apt::preferences { if $::operatingsystem == "Debian" { - file { '/etc/apt/preferences.d/stable': - ensure => present, - alias => 'apt_config', - # only update together - content => template('apt/Debian/stable.erb'), - require => File['/etc/apt/sources.list'], - owner => root, group => 0, mode => '0644'; + file { + '/etc/apt/preferences.d/stable': + ensure => present, + alias => 'apt_config', + content => template('apt/Debian/stable.erb'), + require => File['/etc/apt/sources.list'], + owner => root, group => 0, mode => '0644'; + + '/etc/apt/preferences.d/custom': + ensure => absent; } if $apt::use_volatile { |