From ce99e46cd81e7063517cb246bbd070abb2a10964 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sun, 26 Apr 2009 19:22:23 +0200 Subject: [PATCH] Apparently (and fortunately) exec names are site-wide and not just per module. This also means we better call it something other than just "update" or so. How about apt-keys-update --- modules/apt-keys/manifests/init.pp | 6 +++--- modules/buildd/manifests/init.pp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/apt-keys/manifests/init.pp b/modules/apt-keys/manifests/init.pp index 6ecdca64..45e94f99 100644 --- a/modules/apt-keys/manifests/init.pp +++ b/modules/apt-keys/manifests/init.pp @@ -3,17 +3,17 @@ class apt-keys { "/etc/apt/trusted-keys.d/": ensure => directory, purge => true, - notify => Exec["updatekeys"], + notify => Exec["apt-keys-update"], ; "/etc/apt/trusted-keys.d/db.debian.org.asc": source => "puppet:///apt-keys/db.debian.org.asc", mode => 664, - notify => Exec["updatekeys"], + notify => Exec["apt-keys-update"], ; } - exec { "updatekeys": + exec { "apt-keys-update": command => 'for keyfile in /etc/apt/trusted-keys.d/*; do apt-key add $keyfile; done', refreshonly => true } diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp index 825f436b..8ca128e7 100644 --- a/modules/buildd/manifests/init.pp +++ b/modules/buildd/manifests/init.pp @@ -16,7 +16,7 @@ class buildd { "/etc/apt/trusted-keys.d/buildd.debian.org.asc": source => "puppet:///buildd/buildd.debian.org.asc", mode => 664, - notify => Exec["updatekeys"], + notify => Exec["apt-keys-update"], ; } } -- 2.39.2