diff options
author | varac <varacanero@zeromail.org> | 2016-02-26 13:07:37 +0100 |
---|---|---|
committer | varac <varacanero@zeromail.org> | 2016-02-26 13:07:37 +0100 |
commit | 33c61e8df59db1abbed379a9e9790946060a8f1e (patch) | |
tree | 1ba5e08c285dbf2b60e7be2f59934e6abd5f866c /manifests | |
parent | d997142b0cb55b23ed85ee32bbbb72d4456465d1 (diff) | |
parent | 8c8bd7bb1e5cc0f5297db9629ece783452233d1f (diff) |
Merge remote-tracking branch 'shared/master' into leap_master
Diffstat (limited to 'manifests')
-rw-r--r-- | manifests/init.pp | 1 | ||||
-rw-r--r-- | manifests/unattended_upgrades.pp | 10 |
2 files changed, 10 insertions, 1 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index 85f44f0..4c44af2 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -142,7 +142,6 @@ class apt( require => [ File['/etc/apt/apt.conf.d', '/etc/apt/preferences' ], File['/etc/apt/sources.list'] ], - loglevel => 'info', refreshonly => true, # Another Semaphor for all packages to reference alias => [ 'apt_updated', 'refresh_apt'] diff --git a/manifests/unattended_upgrades.pp b/manifests/unattended_upgrades.pp index ffb5fad..52d7542 100644 --- a/manifests/unattended_upgrades.pp +++ b/manifests/unattended_upgrades.pp @@ -11,6 +11,16 @@ class apt::unattended_upgrades ( ensure => $ensure_version } + # For some reason, this directory is sometimes absent, which causes + # unattended-upgrades to crash. + file { '/var/log/unattended-upgrades': + ensure => directory, + owner => 'root', + group => 0, + mode => '0755', + require => Package['unattended-upgrades'], + } + $file_content = $config_content ? { undef => template($config_template), default => $config_content |