From 8a46265453503a5dfe04bf10d3019368fb032cf5 Mon Sep 17 00:00:00 2001
From: Michael DeHaan <mdehaan@mdehaan.rdu.redhat.com>
Date: Thu, 19 Apr 2007 15:24:08 -0400
Subject: Changes cobbler_syslogd to cobblerd, and this new daemon now offers
 koan info over XMLRPC, allowing koan to stop needing to grok YAML.  Older
 versions of koan will remain compatible over standard http://.

---
 scripts/cobbler_syslogd | 52 ----------------------------
 scripts/cobblerd        | 52 ++++++++++++++++++++++++++++
 scripts/cobblersyslogd  | 92 -------------------------------------------------
 3 files changed, 52 insertions(+), 144 deletions(-)
 delete mode 100755 scripts/cobbler_syslogd
 create mode 100755 scripts/cobblerd
 delete mode 100755 scripts/cobblersyslogd

(limited to 'scripts')

diff --git a/scripts/cobbler_syslogd b/scripts/cobbler_syslogd
deleted file mode 100755
index 86e77e1..0000000
--- a/scripts/cobbler_syslogd
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/usr/bin/python
-
-"""
-Wrapper for cobbler's remote syslog watching daemon.
-
-Copyright 2006, Red Hat, Inc
-Michael DeHaan <mdehaan@redhat.com>
-
-This software may be freely redistributed under the terms of the GNU
-general public license.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-"""
-
-import sys
-import os
-import cobbler.syslog_watcher as app
-
-if __name__ == "__main__":
-
-    #############################################
-    # daemonizing code:  http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/66012
-    try: 
-        pid = os.fork() 
-        if pid > 0:
-            # exit first parent
-            sys.exit(0) 
-    except OSError, e: 
-        print >>sys.stderr, "fork #1 failed: %d (%s)" % (e.errno, e.strerror) 
-        sys.exit(1)
-
-    # decouple from parent environment
-    os.chdir("/") 
-    os.setsid() 
-    os.umask(0) 
-
-    # do second fork
-    try: 
-        pid = os.fork() 
-        if pid > 0:
-            # print "Daemon PID %d" % pid 
-            sys.exit(0) 
-    except OSError, e: 
-        print >>sys.stderr, "fork #2 failed: %d (%s)" % (e.errno, e.strerror) 
-        sys.exit(1) 
-
-    #################
-
-    app.main()
-
diff --git a/scripts/cobblerd b/scripts/cobblerd
new file mode 100755
index 0000000..409f738
--- /dev/null
+++ b/scripts/cobblerd
@@ -0,0 +1,52 @@
+#!/usr/bin/python
+
+"""
+Wrapper for cobbler's remote syslog watching daemon.
+
+Copyright 2006, Red Hat, Inc
+Michael DeHaan <mdehaan@redhat.com>
+
+This software may be freely redistributed under the terms of the GNU
+general public license.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+"""
+
+import sys
+import os
+import cobbler.cobblerd as app
+
+if __name__ == "__main__":
+
+    #############################################
+    # daemonizing code:  http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/66012
+    try: 
+        pid = os.fork() 
+        if pid > 0:
+            # exit first parent
+            sys.exit(0) 
+    except OSError, e: 
+        print >>sys.stderr, "fork #1 failed: %d (%s)" % (e.errno, e.strerror) 
+        sys.exit(1)
+
+    # decouple from parent environment
+    os.chdir("/") 
+    os.setsid() 
+    os.umask(0) 
+
+    # do second fork
+    try: 
+        pid = os.fork() 
+        if pid > 0:
+            # print "Daemon PID %d" % pid 
+            sys.exit(0) 
+    except OSError, e: 
+        print >>sys.stderr, "fork #2 failed: %d (%s)" % (e.errno, e.strerror) 
+        sys.exit(1) 
+
+    #################
+
+    app.main()
+
diff --git a/scripts/cobblersyslogd b/scripts/cobblersyslogd
deleted file mode 100755
index b8bc3f7..0000000
--- a/scripts/cobblersyslogd
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/bin/sh
-#
-# cobblersyslogd    Cobbler kickstart status monitor
-#
-# chkconfig: 345 99 99 
-# description:  This is a daemon which monitors and logs remote syslog traffic \
-#               from machines being provisioned from cobbler.  \
-#               See http://cobbler.et.redhat.com
-#
-# processname: /usr/bin/cobbler_syslogd
-
-# Sanity checks.
-[ -x /usr/bin/cobbler_syslogd ] || exit 0
-
-# Source function library.
-. /etc/rc.d/init.d/functions
-
-RETVAL=0
-
-start() {
-    echo -n $"Starting cobbler remote syslog monitor: "
-    if test -f /var/lock/subsys/cobblersyslogd ; then
-        echo_failure
-        echo
-        return 1
-    fi
-    /usr/bin/cobbler_syslogd
-    RETVAL=$?
-    echo_success
-    echo
-    [ $RETVAL -eq 0 ] && touch /var/lock/subsys/cobblersyslogd
-    return $RETVAL
-}
-
-
-stop() {
-    echo -n $"Stopping cobbler remote syslog monitor: "
-    if ! test -f /var/lock/subsys/cobblersyslogd ; then
-        echo_failure
-        echo
-        return 1
-    fi
-    pkill cobbler_syslogd
-    RETVAL=$?
-    rm /var/lock/subsys/cobblersyslogd
-    echo_success
-    echo
-    return $RETVAL
-}
-
-mystatus() {
-    if test -f /var/lock/subsys/cobblersyslogd ; then
-        echo "cobbbler_syslogd is running..."
-        return 0
-    fi
-    echo "cobbler_syslogd is stopped"
-    echo
-    return 0
-}
-
-# See how we were called.
-case "$1" in
-    start)
-        start
-        ;;
-    stop)
-        stop
-        ;;
-    status)
-        mystatus
-        RETVAL=$?
-        ;;
-    restart)
-        stop
-        start
-        ;;
-    condrestart)
-        if [ -f /var/lock/subsys/cobblersyslogd ]; then
-            stop
-            start
-        fi
-        ;;
-    reload)
-        echo "can't reload configuration, you have to restart it"
-        RETVAL=$?
-        ;;
-    *)
-        echo $"Usage: $0 {start|stop|status|restart|condrestart|reload}"
-        ;;
-esac
-exit $RETVAL
-
-- 
cgit