X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fdebian-org%2Fmanifests%2Finit.pp;h=da3d1846280754a5418cde506f7989fdbefba397;hb=2c5c020b4d26583ec015f3ca45da29b6801280c2;hp=9a46d1c3900a930160fab2bda271617fc25ddce9;hpb=e8d69944e7abdcbe489b595f2b54f87fa5ee73b2;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 9a46d1c39..da3d18462 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -39,7 +39,7 @@ define linux_module ($ensure) {
 
 
 class debian-org {
-    $debianadmin = [ "debian-archive-debian-samhain-reports@master.debian.org", "debian-admin@ftbfs.de", "weasel@debian.org", "steve@lobefin.net" ]
+    $debianadmin = [ "debian-archive-debian-samhain-reports@master.debian.org", "debian-admin@ftbfs.de", "weasel@debian.org", "steve@lobefin.net", "paravoid@debian.org" ]
     package {
         "apt-utils": ensure => installed;
         "bash-completion": ensure => installed;
@@ -55,6 +55,14 @@ class debian-org {
         "rsyslog": ensure => purged;
         "sysklogd": ensure => purged;
     }
+    case $debarchitecture {
+        "armhf":
+        default:
+            file {
+                "/etc/apt/sources.list.d/security.list":
+                    content => template("debian-org/etc/apt/sources.list.d/security.list.erb"),
+                    notify  => Exec["apt-get update"];
+            }
     file {
         "/etc/apt/preferences":
             source => "puppet:///modules/debian-org/apt.preferences";
@@ -64,9 +72,6 @@ class debian-org {
         "/etc/apt/sources.list.d/debian.org.list":
             content => template("debian-org/etc/apt/sources.list.d/debian.org.list.erb"),
             notify  => Exec["apt-get update"];
-        "/etc/apt/sources.list.d/security.list":
-            content => template("debian-org/etc/apt/sources.list.d/security.list.erb"),
-            notify  => Exec["apt-get update"];
         "/etc/apt/sources.list.d/volatile.list":
             content => template("debian-org/etc/apt/sources.list.d/volatile.list.erb"),
             notify  => Exec["apt-get update"];