diff options
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/custom_sources.pp | 10 | ||||
| -rw-r--r-- | manifests/default_sources_list.pp | 2 | ||||
| -rw-r--r-- | manifests/init.pp | 4 | ||||
| -rw-r--r-- | manifests/unattended_upgrades.pp | 14 |
4 files changed, 22 insertions, 8 deletions
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/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']; } } diff --git a/manifests/init.pp b/manifests/init.pp index 4db120d..1011e65 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', @@ -94,4 +96,4 @@ class apt { # workaround for preseeded_package component file { [ "/var/cache", "/var/cache/local", "/var/cache/local/preseeding" ]: ensure => directory } -} +} diff --git a/manifests/unattended_upgrades.pp b/manifests/unattended_upgrades.pp index 9a6c13b..e1080a0 100644 --- a/manifests/unattended_upgrades.pp +++ b/manifests/unattended_upgrades.pp @@ -5,11 +5,13 @@ 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 => Concatenated_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" ], + + # err: Could not run Puppet configuration client: Could not find dependent Config_file[apt_config] for Config_file[/etc/apt/apt.conf.d/50unattended-upgrades] at /etc/puppet/modules/apt/manifests/unattended_upgrades.pp:14 + + #before => Config_file[apt_config], + require => Package['unattended-upgrades'], } } |