From 4ebb7d463ed6e85a715f0a311378bf673a907042 Mon Sep 17 00:00:00 2001 From: Gabriel Filion Date: Mon, 25 Oct 2010 12:17:50 -0400 Subject: Fix apt::preferences::absent Currently, setting the $custom_preferences variable to false fails because of the /etc/apt/preferences concatenated_file being re-defined. Fix this by setting dependencies on the resource only when we expect to create the /etc/apt/preferences file. Also, since there is no "ensure" parameter to concatenated_file, use a simple file resource to ensure that it is removed. Signed-off-by: Gabriel Filion --- manifests/preferences/absent.pp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'manifests/preferences/absent.pp') diff --git a/manifests/preferences/absent.pp b/manifests/preferences/absent.pp index 3131aff..d8b2e10 100644 --- a/manifests/preferences/absent.pp +++ b/manifests/preferences/absent.pp @@ -1,8 +1,5 @@ class apt::preferences::absent { - include common::moduledir - $apt_preferences_dir = "${common::moduledir::module_dir_path}/apt/preferences" - concatenated_file{'/etc/apt/preferences': - dir => $apt_preferences_dir, + file {'/etc/apt/preferences': ensure => absent, } } -- cgit v1.2.3 From e15283b781f35779a75415725cd315104879aa67 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Tue, 7 Dec 2010 13:18:41 -0500 Subject: format standardization --- manifests/apt_conf.pp | 6 ++++-- manifests/cron/base.pp | 3 ++- manifests/dselect.pp | 1 + manifests/init.pp | 33 ++++++++++++++------------------- manifests/preferences.pp | 4 ++-- manifests/preferences/absent.pp | 3 ++- manifests/preferences_snippet.pp | 5 +++-- manifests/preseeded_package.pp | 2 +- manifests/sources_list.pp | 5 +++-- manifests/unattended_upgrades.pp | 3 ++- manifests/upgrade_package.pp | 1 + 11 files changed, 35 insertions(+), 31 deletions(-) (limited to 'manifests/preferences/absent.pp') diff --git a/manifests/apt_conf.pp b/manifests/apt_conf.pp index 62e4377..a18a9bd 100644 --- a/manifests/apt_conf.pp +++ b/manifests/apt_conf.pp @@ -1,11 +1,13 @@ define apt::apt_conf( $ensure = 'present', $source = '', - $content = undef -){ + $content = undef ) +{ + if $source == '' and $content == undef { fail("One of \$source or \$content must be specified for apt_conf ${name}") } + if $source != '' and $content != undef { fail("Only one of \$source or \$content must specified for apt_conf ${name}") } diff --git a/manifests/cron/base.pp b/manifests/cron/base.pp index 2cfbefb..de55772 100644 --- a/manifests/cron/base.pp +++ b/manifests/cron/base.pp @@ -1,3 +1,4 @@ class apt::cron::base { - package { cron-apt: ensure => installed } + + package { cron-apt: ensure => installed } } diff --git a/manifests/dselect.pp b/manifests/dselect.pp index 52c66cb..45a5ddc 100644 --- a/manifests/dselect.pp +++ b/manifests/dselect.pp @@ -1,4 +1,5 @@ class apt::dselect { + # suppress annoying help texts of dselect append_if_no_such_line { dselect_expert: file => "/etc/dpkg/dselect.cfg", diff --git a/manifests/init.pp b/manifests/init.pp index e7eac33..4ca2b2e 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -88,23 +88,23 @@ class apt { } apt_conf { "02show_upgraded": - source => ["puppet:///modules/site-apt/${fqdn}/02show_upgraded", - "puppet:///modules/site-apt/02show_upgraded", - "puppet:///modules/apt/02show_upgraded"] + source => [ "puppet:///modules/site-apt/${fqdn}/02show_upgraded", + "puppet:///modules/site-apt/02show_upgraded", + "puppet:///modules/apt/02show_upgraded" ] } if ( $virtual == "vserver" ) { apt_conf { "03clean_vserver": - source => ["puppet:///modules/site-apt/${fqdn}/03clean_vserver", - "puppet:///modules/site-apt/03clean_vserver", - "puppet:///modules/apt/03clean_vserver"] + source => [ "puppet:///modules/site-apt/${fqdn}/03clean_vserver", + "puppet:///modules/site-apt/03clean_vserver", + "puppet:///modules/apt/03clean_vserver" ] } } else { apt_conf { "03clean": - source => ["puppet:///modules/site-apt/${fqdn}/03clean", - "puppet:///modules/site-apt/03clean", - "puppet:///modules/apt/03clean"] + source => [ "puppet:///modules/site-apt/${fqdn}/03clean", + "puppet:///modules/site-apt/03clean", + "puppet:///modules/apt/03clean" ] } } @@ -121,13 +121,9 @@ class apt { # backward compatibility: upgrade from previous versions of this module. file { - ["/etc/apt/apt.conf.d/from_puppet", - "/etc/apt/apt.conf.d/99from_puppet" - ]: + [ "/etc/apt/apt.conf.d/from_puppet", "/etc/apt/apt.conf.d/99from_puppet" ]: ensure => 'absent', - require => [ Apt_conf['02show_upgraded'], - Apt_conf['03clean'], - ], + require => [ Apt_conf['02show_upgraded'], Apt_conf['03clean'] ]; } # watch .d directories and ensure they are present @@ -143,13 +139,12 @@ class apt { 'refresh_apt': command => '/usr/bin/apt-get update && sleep 1', refreshonly => true, - subscribe => [ File['/etc/apt/apt.conf.d'], - Config_file['/etc/apt/sources.list'] ]; + subscribe => [ File['/etc/apt/apt.conf.d'], Config_file['/etc/apt/sources.list'] ]; + 'update_apt': command => '/usr/bin/apt-get update && /usr/bin/apt-get autoclean', refreshonly => true, - require => [ File['/etc/apt/apt.conf.d', - '/etc/apt/preferences'], + require => [ File['/etc/apt/apt.conf.d', '/etc/apt/preferences' ], Config_file['/etc/apt/sources.list'] ], loglevel => info, # Another Semaphor for all packages to reference diff --git a/manifests/preferences.pp b/manifests/preferences.pp index 4acfdaf..4c93542 100644 --- a/manifests/preferences.pp +++ b/manifests/preferences.pp @@ -3,7 +3,7 @@ class apt::preferences { include common::moduledir $apt_preferences_dir = "${common::moduledir::module_dir_path}/apt/preferences" module_dir{'apt/preferences': } - file{"${apt_preferences_dir}_header": + file { "${apt_preferences_dir}_header": content => $custom_preferences ? { '' => $operatingsystem ? { 'debian' => template("apt/${operatingsystem}/preferences_${codename}.erb"), @@ -13,7 +13,7 @@ class apt::preferences { }, } - concatenated_file{'/etc/apt/preferences': + concatenated_file { '/etc/apt/preferences': dir => $apt_preferences_dir, header => "${apt_preferences_dir}_header", # use Concatenated_file[apt_config] to reference a completed configuration diff --git a/manifests/preferences/absent.pp b/manifests/preferences/absent.pp index d8b2e10..0e96119 100644 --- a/manifests/preferences/absent.pp +++ b/manifests/preferences/absent.pp @@ -1,5 +1,6 @@ class apt::preferences::absent { - file {'/etc/apt/preferences': + + file { '/etc/apt/preferences': ensure => absent, } } diff --git a/manifests/preferences_snippet.pp b/manifests/preferences_snippet.pp index fd2956d..4b8e575 100644 --- a/manifests/preferences_snippet.pp +++ b/manifests/preferences_snippet.pp @@ -2,8 +2,9 @@ define apt::preferences_snippet( $ensure = 'present', $source = '', $release, - $priority -){ + $priority ) +{ + if $custom_preferences == false { fail("Trying to define a preferences_snippet with \$custom_preferences set to false.") } diff --git a/manifests/preseeded_package.pp b/manifests/preseeded_package.pp index 76c432e..8f3bcbd 100644 --- a/manifests/preseeded_package.pp +++ b/manifests/preseeded_package.pp @@ -5,7 +5,7 @@ define apt::preseeded_package ($content = "", $ensure = "installed") { default => $content } - file{ $seedfile: + file { $seedfile: content => $real_content, mode => 0600, owner => root, group => root, } diff --git a/manifests/sources_list.pp b/manifests/sources_list.pp index bbf887a..ff8f21a 100644 --- a/manifests/sources_list.pp +++ b/manifests/sources_list.pp @@ -1,8 +1,9 @@ define apt::sources_list ( $ensure = 'present', $source = '', - $content = undef -) { + $content = undef ) +{ + if $source == '' and $content == undef { fail("One of \$source or \$content must be specified for apt_sources_snippet ${name}") } diff --git a/manifests/unattended_upgrades.pp b/manifests/unattended_upgrades.pp index f52448d..e2992f8 100644 --- a/manifests/unattended_upgrades.pp +++ b/manifests/unattended_upgrades.pp @@ -1,5 +1,6 @@ class apt::unattended_upgrades { - package{'unattended-upgrades': + + package { 'unattended-upgrades': ensure => present, require => undef, } diff --git a/manifests/upgrade_package.pp b/manifests/upgrade_package.pp index 41d5d52..99e9c2a 100644 --- a/manifests/upgrade_package.pp +++ b/manifests/upgrade_package.pp @@ -1,4 +1,5 @@ define apt::upgrade_package ($version = "") { + case $version { '': { exec { "aptitude -y install $name": -- cgit v1.2.3