diff options
author | mh <mh@immerda.ch> | 2012-04-15 13:18:59 +0200 |
---|---|---|
committer | mh <mh@immerda.ch> | 2012-04-15 13:19:45 +0200 |
commit | bdc244667161c3fa9140632c535921db61468800 (patch) | |
tree | 2940f0ca9d034cdaae8136d3da68aecb407e812d /manifests/init.pp | |
parent | 7727549c02c97e6a20dffcbf996bce90c252c793 (diff) | |
parent | ee33741aa1fb892cacd93d816f43093a201044a6 (diff) |
Merge remote-tracking branch 'shared/master'
Conflicts:
README
Diffstat (limited to 'manifests/init.pp')
-rw-r--r-- | manifests/init.pp | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index 3a816d2..960f18d 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -85,7 +85,8 @@ class apt { '' => template( "apt/$operatingsystem/sources.list.erb"), default => $custom_sources_list }, - require => Package['lsb']; + require => Package['lsb'], + notify => Exec['refresh_apt'], } apt_conf { "02show_upgraded": @@ -128,21 +129,7 @@ class apt { require => [ Apt_conf['02show_upgraded'], Apt_conf['03clean'] ]; } - # watch .d directories and ensure they are present - file { "/etc/apt/apt.conf.d": ensure => directory, checksum => mtime; } - file { "/etc/apt/sources.list.d": - ensure => directory, - checksum => mtime, - notify => Exec['refresh_apt'], - } - - exec { - # "&& sleep 1" is workaround for older(?) clients - 'refresh_apt': - command => '/usr/bin/apt-get update && sleep 1', - refreshonly => true, - subscribe => [ File['/etc/apt/apt.conf.d'], Config_file['/etc/apt/sources.list'] ]; - } + include apt::dot_d_directories ## This package should really always be current package { "debian-archive-keyring": ensure => latest } |