X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmanifests%2Finit.pp;h=19fbd60606b6231ebf01d0d00bb6bcce0c125f43;hb=bfadb0dacfb052cfe3e9d8837cc4ec63da74b7c8;hp=a31ee2923ac07b643c9df6ffffe53b53e8e48fc5;hpb=f30cae69e4b599f88fb50a562095ee0de56a612e;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index a31ee2923..19fbd6060 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -1,3 +1,21 @@
+define sysctl($key, $value, $ensure=present) {
+    file { "/etc/sysctl.d/$name.conf":
+        ensure  => $ensure,
+        owner   => root,
+        group   => root,
+        mode    => 0644,
+        content => "$key = $value\n",
+        notify  => Exec["procps restart"],
+    }
+}
+
+define set_alternatives($linkto) {
+        exec { "/usr/sbin/update-alternatives --set $name $linkto":
+            unless => "/bin/sh -c '! [ -e $linkto ] || ! [ -e /etc/alternatives/$name ] || ([ -L /etc/alternatives/$name ] && [ /etc/alternatives/$name -ef $linkto ])'"
+        }
+}
+
+
 class debian-org {
    package { "userdir-ldap": ensure => installed;
              "zsh": ensure => installed;
@@ -50,9 +68,11 @@ class debian-org {
              source => "puppet:///files/etc/timezone",
              notify => Exec["dpkg-reconfigure tzdata -pcritical -fnoninteractive"];
       "/etc/puppet/puppet.conf":
-             source => "puppet:///files/etc/puppet/puppet.conf",
+             source => "puppet:///files/etc/puppet/puppet.conf"
+             ;
       "/etc/default/puppet":
-             source => "puppet:///files/etc/default/puppet",
+             source => "puppet:///files/etc/default/puppet"
+             ;
 
       "/etc/syslog-ng/syslog-ng.conf":
              source => "puppet:///files/etc/syslog-ng/syslog-ng.conf",
@@ -85,6 +105,17 @@ class debian-org {
         default: {}
    }
 
+   # set mmap_min_addr to 4096 to mitigate
+   # Linux NULL-pointer dereference exploits
+   sysctl { "mmap_min_addr" :
+             key         => "vm.mmap_min_addr",
+             value       => 4096,
+   }
+
+   set_alternatives { "editor":
+           linkto => "/usr/bin/vim.basic",
+   }
+
    exec { "syslog-ng reload":
              path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
              refreshonly => true,
@@ -98,6 +129,14 @@ class debian-org {
              path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
              refreshonly => true
    }
+   exec { "puppetmaster restart":
+             path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
+             refreshonly => true,
+   }
+   exec { "procps restart":
+             path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
+             refreshonly => true,
+   }
 }
 
 class debian-proliant inherits debian-org {