From 521ccfec19d40fa5d78162727afa26c15778c173 Mon Sep 17 00:00:00 2001 From: mh Date: Wed, 15 Sep 2010 22:31:42 +0200 Subject: improve decision handling, remove unnecessary exec --- manifests/init.pp | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) (limited to 'manifests') diff --git a/manifests/init.pp b/manifests/init.pp index af860f7..78ae6c5 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -110,27 +110,20 @@ class apt { } } - case $custom_key_dir { - '': { - exec { "/bin/true # no_custom_keydir": } + if $custom_key_dir { + file { "${apt_base_dir}/keys.d": + source => "$custom_key_dir", + recurse => true, + mode => 0755, owner => root, group => root, } - default: { - file { "${apt_base_dir}/keys.d": - source => "$custom_key_dir", - recurse => true, - mode => 0755, owner => root, group => root, - } - exec { "find ${apt_base_dir}/keys.d -type f -exec apt-key add '{}' \\; && apt-get update": - alias => "custom_keys", - subscribe => File["${apt_base_dir}/keys.d"], - refreshonly => true, - before => Config_file[apt_config]; - } + exec { "find ${apt_base_dir}/keys.d -type f -exec apt-key add '{}' \\; && apt-get update": + alias => "custom_keys", + subscribe => File["${apt_base_dir}/keys.d"], + refreshonly => true, + before => Config_file[apt_config]; } } # workaround for preseeded_package component - file { "/var/cache": ensure => directory } - file { "/var/cache/local": ensure => directory } - file { "/var/cache/local/preseeding": ensure => directory } + file { [ "/var/cache", "/var/cache/local", "/var/cache/local/preseeding" ]: ensure => directory } } -- cgit v1.2.3 From 32d230c62c20f11d6d079ad53a446d61183c4a3d Mon Sep 17 00:00:00 2001 From: nadir Date: Sat, 9 Oct 2010 13:36:30 +0200 Subject: files in /etc/apt/apt.conf.d should be numbered --- manifests/default_preferences.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'manifests') diff --git a/manifests/default_preferences.pp b/manifests/default_preferences.pp index 3cdb355..671abdd 100644 --- a/manifests/default_preferences.pp +++ b/manifests/default_preferences.pp @@ -9,7 +9,7 @@ class apt::default_preferences { # only update together require => File["/etc/apt/sources.list"]; # little default settings which keep the system sane - "/etc/apt/apt.conf.d/from_puppet": + "/etc/apt/apt.conf.d/99from_puppet": content => "APT::Get::Show-Upgraded true;\nDSelect::Clean $real_apt_clean;\n", before => Config_file[apt_config]; } -- cgit v1.2.3 From 9fa9bfd9d8c5df468ee8f39a6d951947f7b9d1c5 Mon Sep 17 00:00:00 2001 From: nadir Date: Sat, 9 Oct 2010 13:39:39 +0200 Subject: added possibility to have a custom 50unattended-upgrades --- manifests/unattended_upgrades.pp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'manifests') diff --git a/manifests/unattended_upgrades.pp b/manifests/unattended_upgrades.pp index c984c40..27942b3 100644 --- a/manifests/unattended_upgrades.pp +++ b/manifests/unattended_upgrades.pp @@ -5,11 +5,11 @@ class apt::unattended_upgrades { } config_file { - "/etc/apt/apt.conf.d/unattended_upgrades": - content => 'APT::Periodic::Update-Package-Lists "1"; -APT::Periodic::Unattended-Upgrade "1"; -', - before => Config_file[apt_config], - require => Package['unattended-upgrades'], + "/etc/apt/apt.conf.d/50unattended-upgrades": + source => ["puppet:///modules/site-apt/50unattended-upgrades", + "puppet:///modules/apt/50unattended-upgrades" ], + + before => Config_file[apt_config], + require => Package['unattended-upgrades'], } } -- cgit v1.2.3 From ed9263cd3dbb6ada17d2ac56a4fb5198f54bac85 Mon Sep 17 00:00:00 2001 From: nadir Date: Sat, 9 Oct 2010 13:41:23 +0200 Subject: distribution specific sources.list.erb --- manifests/default_sources_list.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'manifests') diff --git a/manifests/default_sources_list.pp b/manifests/default_sources_list.pp index 7db6535..cf7d523 100644 --- a/manifests/default_sources_list.pp +++ b/manifests/default_sources_list.pp @@ -4,7 +4,7 @@ class apt::default_sources_list { # include main, security and backports # additional sources could be included via an array "/etc/apt/sources.list": - content => template("apt/sources.list.erb"), + content => template( "apt/$operatingsystem/sources.list.erb"), require => Package['lsb']; } } -- cgit v1.2.3 From eae01000c1db8bcfa7de17b2a9a8370289b801bc Mon Sep 17 00:00:00 2001 From: nadir Date: Sat, 9 Oct 2010 14:39:11 +0200 Subject: re-added apt::custom_sources_template to deploy custom sources.list.d/xyz.list --- manifests/custom_sources.pp | 10 ++++++++++ manifests/init.pp | 2 ++ 2 files changed, 12 insertions(+) create mode 100644 manifests/custom_sources.pp (limited to 'manifests') diff --git a/manifests/custom_sources.pp b/manifests/custom_sources.pp new file mode 100644 index 0000000..cd7b8fc --- /dev/null +++ b/manifests/custom_sources.pp @@ -0,0 +1,10 @@ +define apt::custom_sources_template ($sources_file = "") { + file { "/etc/apt/sources.list.d/$sources_file": + content => template($name), + } + exec { "/usr/bin/apt-get update": + subscribe => File["/etc/apt/sources.list.d/$sources_file"], + refreshonly => true, + } + } + diff --git a/manifests/init.pp b/manifests/init.pp index 78ae6c5..9c33b4d 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -5,6 +5,8 @@ class apt { + import "custom_sources.pp" + # See README $real_apt_clean = $apt_clean ? { '' => 'auto', -- cgit v1.2.3