Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet

diff --git a/files/etc/apt/preferences b/files/etc/apt/preferences
new file mode 100644 (file)
index 0000000..dc11ad8
--- /dev/null
+++ b/files/etc/apt/preferences
@@ -0,0 +1,7 @@
+Explanation:
+Explanation: THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+Explanation: USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
+Explanation:
+Package: *
+Pin: release o=Backports.org archive
+Pin-Priority: 200

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 5806ab1..b8a8f8d 100644 (file)
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -22,50 +22,56 @@ class debian-org {
              "dsa-nagios-nrpe-config": ensure => latest;
    }
    file {
+      "/etc/apt/preferences":
+             owner   => root,
+             group   => root,
+             mode    => 444,
+             ensure  => file,
+             source => "puppet:///files/etc/apt/preferences";
       "/etc/apt/sources.list.d/backports.org.list":
              owner   => root,
              group   => root,
-             mode    => 644,
+             mode    => 444,
              ensure  => file,
              source => "puppet:///files/etc/apt/sources.list.d/backports.org.list";
 
       "/etc/apt/sources.list.d/debian.org.list":
              owner   => root,
              group   => root,
-             mode    => 644,
+             mode    => 444,
              ensure  => file,
              source => "puppet:///files/etc/apt/sources.list.d/debian.org.list";
 
       "/etc/apt/sources.list.d/security.list":
              owner   => root,
              group   => root,
-             mode    => 644,
+             mode    => 444,
              ensure  => file,
              source => "puppet:///files/etc/apt/sources.list.d/security.list";
 
       "/etc/apt/sources.list.d/volatile.list":
              owner   => root,
              group   => root,
-             mode    => 644,
+             mode    => 444,
              ensure  => file,
              source => "puppet:///files/etc/apt/sources.list.d/volatile.list";
       "/etc/apt/apt.conf.d/local-recommends":
              owner   => root,
              group   => root,
-             mode    => 644,
+             mode    => 444,
              ensure  => file,
              source => "puppet:///files/etc/apt/apt.conf.d/local-recommends";
       "/etc/puppet/puppet.conf":
              owner   => root,
              group   => root,
-             mode    => 644,
+             mode    => 444,
              ensure  => file,
              source => "puppet:///files/etc/puppet/puppet.conf",
              notify  => Exec["puppet reload"];
       "/etc/default/puppet":
              owner   => root,
              group   => root,
-             mode    => 644,
+             mode    => 444,
              ensure  => file,
              source => "puppet:///files/etc/default/puppet",
              notify  => Exec["puppet restart"];
@@ -90,7 +96,7 @@ class debian-proliant inherits debian-org {
       "/etc/apt/sources.list.d/debian.restricted.list":
              owner   => root,
              group   => root,
-             mode    => 644,
+             mode    => 444,
              ensure  => file,
              source => "puppet:///files/etc/apt/sources.list.d/debian.restricted.list";
    }

diff --git a/modules/samhain/files/common/samhainrc b/modules/samhain/files/common/samhainrc
index b5b467f..ccc4312 100644 (file)
--- a/modules/samhain/files/common/samhainrc
+++ b/modules/samhain/files/common/samhainrc
@@ -198,6 +198,7 @@ file=/etc/exim4/rcpthosts
 file=/etc/exim4/rhsbllist
 file=/etc/exim4/virtualdomains
 file=/etc/exim4/whitelist
+file=/etc/apt/preferences
 file=/etc/apt/sources.list.d/volatile.list
 file=/etc/apt/sources.list.d/security.list
 file=/etc/apt/sources.list.d/debian.org.list