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

* 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  move 0755 for rc.local
  Samhain ignore /etc/rc.local
  Add puppet boilerplate comment to rc.local
  a better try
  First stab at managing rc.local

diff --git a/modules/debian-org/files/rc.local b/modules/debian-org/files/rc.local
new file mode 100755 (executable)
index 0000000..c43038a
--- /dev/null
+++ b/modules/debian-org/files/rc.local
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+##
+## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
+##
+
+if [ -e /proc/sys/kernel/modules_disabled ]; then
+       echo 1 > /proc/sys/kernel/modules_disabled || true
+fi

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 7af2230..3a3c8b2 100644 (file)
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -92,6 +92,11 @@ class debian-org {
             require => Package["libpam-pwdfile"],
             source => "puppet:///files/etc/pam.d/common-session",
             ;
+        "/etc/rc.local":
+            mode   => 0755,
+            source => "puppet:///modules/debian-org/rc.local",
+            notify => Exec["rc.local start"],
+            ;
     }
     case $hostname {
         handel: {
@@ -129,6 +134,9 @@ class debian-org {
         "puppetmaster restart":
             path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
             refreshonly => true;
+        "rc.local start":
+            path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
+            refreshonly => true;
         "procps restart":
             path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
             refreshonly => true;

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index 00e7659..d9c46b4 100644 (file)
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -149,6 +149,7 @@ file=/etc/syslog-ng
 file=/etc/ferm/
 file=/etc/ferm/conf.d
 file=/etc/ferm/dsa.d
+file=/etc/rc.local
 
 
 [LogFiles]