diff options
| author | intrigeri <intrigeri@boum.org> | 2010-10-17 01:57:55 +0200 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2010-10-17 01:57:55 +0200 |
| commit | bcfb35c969de53aa2972a9d2415be5a258a01be8 (patch) | |
| tree | 9666e083c5391235f97c86032e979973ef299ee6 /manifests/unattended_upgrades.pp | |
| parent | e2f80db7b76171e5945127e2fd42fb35043990fb (diff) | |
| parent | eae01000c1db8bcfa7de17b2a9a8370289b801bc (diff) | |
| download | puppet-apt-bcfb35c969de53aa2972a9d2415be5a258a01be8.tar.gz puppet-apt-bcfb35c969de53aa2972a9d2415be5a258a01be8.tar.bz2 | |
Merge remote branch 'nadir/master' into wip
Conflicts:
manifests/default_preferences.pp
manifests/default_sources_list.pp
manifests/init.pp
templates/Debian/sources.list.deb-src.erb
templates/Debian/sources.list.erb
templates/Debian/sources.list.volatile.erb
templates/Ubuntu/sources.list.erb
Diffstat (limited to 'manifests/unattended_upgrades.pp')
| -rw-r--r-- | manifests/unattended_upgrades.pp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/manifests/unattended_upgrades.pp b/manifests/unattended_upgrades.pp index c984c40..805b0ed 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'], } } |