move all files to explicit new-style module/ paths

[dsa-puppet.git] / modules / apt-keys / manifests / init.pp

diff --git a/modules/apt-keys/manifests/init.pp b/modules/apt-keys/manifests/init.pp
index 666b8f6866396dc45b9b66821dffa41a63c86685..c296ec55ef1a1bc89e07d112b3673e2ca2b19d01 100644 (file)
--- a/modules/apt-keys/manifests/init.pp
+++ b/modules/apt-keys/manifests/init.pp
@@ -1,21 +1,29 @@
 class apt-keys {
     file {
         "/etc/apt/trusted-keys.d/":
-          ensure  => directory,
-          purge   => true,
-          notify  => Exec["updatekeys"],
-          ;
+            ensure  => directory,
+            purge   => true,
+            notify  => Exec["apt-keys-update"],
+            ;
 
+        "/etc/apt/trusted-keys.d/backports.org.asc":
+            source  => "puppet:///modules/apt-keys/backports.org.asc",
+            mode    => 664,
+            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"],
-          ;
+            source  => "puppet:///modules/apt-keys/db.debian.org.asc",
+            mode    => 664,
+            notify  => Exec["apt-keys-update"],
+            ;
     }
 
-    exec { "updatekeys":
-         command => "for keyfile in /etc/apt/trusted-keys.d/*; do apt-key add $keyfile; done",
+    exec { "apt-keys-update":
+         command => 'for keyfile in /etc/apt/trusted-keys.d/*; do apt-key add $keyfile; done',
          refreshonly => true
     }
 }
 
+# vim:set et:
+# vim:set sts=4 ts=4:
+# vim:set shiftwidth=4: