From 5bb52a7f8c9a720a401074a06119ebe7b4f01d05 Mon Sep 17 00:00:00 2001
From: Ossi Salmi <osalmi@iki.fi>
Date: Thu, 8 Dec 2011 14:59:13 +0200
Subject: [PATCH] Fixed rsyslogd service startup and added rc script for
 OpenBSD 5.0

---
 syslog/files/rsyslogd.rc | 13 +++++++++++++
 syslog/manifests/init.pp | 20 +++++++++++++++++++-
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100755 syslog/files/rsyslogd.rc

diff --git a/syslog/files/rsyslogd.rc b/syslog/files/rsyslogd.rc
new file mode 100755
index 0000000..f918953
--- /dev/null
+++ b/syslog/files/rsyslogd.rc
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+daemon="/usr/local/sbin/rsyslogd"
+daemon_flags="-x -c 4 -i /var/run/syslog.pid"
+
+. /etc/rc.d/rc.subr
+
+rc_pre() {
+	pkill -f /usr/sbin/syslogd
+	return 0
+}
+
+rc_cmd $1
diff --git a/syslog/manifests/init.pp b/syslog/manifests/init.pp
index 920faba..6f8dbfc 100644
--- a/syslog/manifests/init.pp
+++ b/syslog/manifests/init.pp
@@ -157,11 +157,29 @@ class syslog::client::rsyslog {
         ensure => running,
         enable => true,
         start  => $operatingsystem ? {
-            "openbsd" => "pkill syslogd ; /usr/local/sbin/rsyslogd -c 4 -x -i /var/run/syslog.pid",
+            "openbsd" => $operatingsystemrelease ? {
+                /4\.[1-8]/ => "pkill syslogd; /usr/local/sbin/rsyslogd -c 4 -x -i /var/run/syslog.pid",
+                default    => undef,
+            },
             default   => undef,
         },
     }
 
+    if $operatingsystem == "OpenBSD" and $operatingsystemrelease !~ /4\.[1-8]/ {
+        file { "/etc/rc.d/syslogd":
+            ensure => present,
+            mode   => 0555,
+            owner  => "root",
+            group  => "wheel",
+            source => "puppet:///modules/syslog/rsyslogd.rc",
+            backup => ".orig",
+            before => Service["rsyslog"],
+        }
+        Service["rsyslog"] {
+            name => "syslogd",
+        }
+    }
+
 }