aboutsummaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
Diffstat (limited to 'manifests')
-rw-r--r--manifests/init.pp7
-rw-r--r--manifests/unattended_upgrades.pp11
2 files changed, 15 insertions, 3 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index 5722c6a..17d87c7 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -15,7 +15,8 @@ class apt(
$ubuntu_url = 'http://archive.ubuntu.com/ubuntu',
$repos = 'auto',
$custom_preferences = '',
- $disable_update = false
+ $disable_update = false,
+ $custom_key_dir = false
){
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/unattended_upgrades.pp b/manifests/unattended_upgrades.pp
index c538831..4f1eb20 100644
--- a/manifests/unattended_upgrades.pp
+++ b/manifests/unattended_upgrades.pp
@@ -19,4 +19,15 @@ class apt::unattended_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'],
+ }
+ }
}