diff options
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/init.pp | 7 | ||||
| -rw-r--r-- | manifests/params.pp | 1 | ||||
| -rw-r--r-- | manifests/unattended_upgrades.pp | 13 |
3 files changed, 17 insertions, 4 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index faddf09..33eac37 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -15,7 +15,8 @@ class apt( $ubuntu_url = $apt::params::ubuntu_url, $repos = $apt::params::repos, $custom_preferences = $apt::params::custom_preferences, - $disable_update = $apt::params::disable_update + $disable_update = $apt::params::disable_update, + $custom_key_dir = $apt::params::custom_key_dir ) inherits apt::params { case $::operatingsystem { 'debian': { @@ -113,9 +114,9 @@ class apt( $apt_base_dir = "${common::moduledir::module_dir_path}/apt" modules_dir { 'apt': } - if $::custom_key_dir { + if $custom_key_dir { file { "${apt_base_dir}/keys.d": - source => $::custom_key_dir, + source => $custom_key_dir, recurse => true, owner => root, group => root, diff --git a/manifests/params.pp b/manifests/params.pp index b210ff6..12273ac 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -14,4 +14,5 @@ class apt::params () { $repos = 'auto' $custom_preferences = '' $disable_update = false + $custom_key_dir = false } diff --git a/manifests/unattended_upgrades.pp b/manifests/unattended_upgrades.pp index 2f6c2a5..398a1a7 100644 --- a/manifests/unattended_upgrades.pp +++ b/manifests/unattended_upgrades.pp @@ -14,9 +14,20 @@ class apt::unattended_upgrades { require => Package['unattended-upgrades'], } - if $apt::custom_preferences != false { + if defined(File['apt_config']) { Apt_conf['50unattended-upgrades'] { before => File['apt_config'], } } + + if $operatingsystem == 'ubuntu' { + file { '/etc/apt/apt.conf.d/10periodic': + ensure => present, + owner => root, + group => root, + mode => 0644, + source => 'puppet:///modules/apt/10periodic', + require => Package['unattended-upgrades'], + } + } } |