diff options
author | intrigeri <intrigeri@boum.org> | 2010-11-10 10:11:18 +0100 |
---|---|---|
committer | intrigeri <intrigeri@boum.org> | 2010-11-10 10:19:06 +0100 |
commit | 2cd9496999af2dd00a203f38c4e1f4393c7f3f62 (patch) | |
tree | a74f18ccf51d7f48752b37d3a8f39705972eac05 /manifests/unattended_upgrades.pp | |
parent | c43bfac6b80489cf789fe448abb3561a6655a969 (diff) | |
parent | 5bf01f148d2c2db8523febc0d73591444c5965c9 (diff) | |
download | puppet-apt-2cd9496999af2dd00a203f38c4e1f4393c7f3f62.tar.gz puppet-apt-2cd9496999af2dd00a203f38c4e1f4393c7f3f62.tar.bz2 |
Merge remote branch 'nadir/master'
Conflicts:
README
manifests/custom_sources.pp
manifests/default_preferences.pp
manifests/init.pp
manifests/unattended_upgrades.pp
templates/Debian/sources.list.volatile.erb
Diffstat (limited to 'manifests/unattended_upgrades.pp')
-rw-r--r-- | manifests/unattended_upgrades.pp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/manifests/unattended_upgrades.pp b/manifests/unattended_upgrades.pp index 805b0ed..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/50unattended-upgrades": - source => ["puppet:///modules/site-apt/50unattended-upgrades", - "puppet:///modules/apt/50unattended-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], + # 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'], } } |