[Oval-commits] r384 - in trunk/oval-infrastructure: debian debian.agent debian.server
Pavel Vinogradov
blaze-guest at alioth.debian.org
Thu Oct 2 18:15:37 UTC 2008
Author: blaze-guest
Date: 2008-10-02 18:15:37 +0000 (Thu, 02 Oct 2008)
New Revision: 384
Added:
trunk/oval-infrastructure/debian/oval-agent.init
trunk/oval-infrastructure/debian/oval-server.init
Removed:
trunk/oval-infrastructure/debian.agent/changelog
trunk/oval-infrastructure/debian.agent/compat
trunk/oval-infrastructure/debian.agent/oval-agent.init
trunk/oval-infrastructure/debian.agent/pycompat
trunk/oval-infrastructure/debian.server/changelog
trunk/oval-infrastructure/debian.server/oval-server.init
trunk/oval-infrastructure/debian.server/pycompat
Log:
Merge Debian dirs
Copied: trunk/oval-infrastructure/debian/oval-agent.init (from rev 383, trunk/oval-infrastructure/debian.agent/oval-agent.init)
===================================================================
--- trunk/oval-infrastructure/debian/oval-agent.init (rev 0)
+++ trunk/oval-infrastructure/debian/oval-agent.init 2008-10-02 18:15:37 UTC (rev 384)
@@ -0,0 +1,120 @@
+#! /bin/sh
+
+### BEGIN INIT INFO
+# Provides: oval-agent
+# Required-Start: $network
+# Required-Stop:
+# Should-Start: $named
+# Should-Stop:
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: oval-agent for OVAL definitions quering
+# Description: oval-agent is a program that communicate with
+# oval-server, receive oval-definitions, quering it
+# and sent results back to oval-server.
+### END INIT INFO
+
+# /etc/init.d/oval-agent: start and stop the oval-agent daemon
+
+DAEMON=/usr/bin/oval-agent
+NAME="oval-agent"
+DEFAULTSFILE=/etc/default/oval-agent
+PIDFILE=/var/run/oval-agent.pid
+
+OVALAGENT_ENABLE=false
+OVALAGENT_USER=oval-agent
+OVALAGENT_CONFIG_FILE=/etc/oval/agent.conf
+OVALAGENT_LOG_DIR=/var/log/oval
+
+test -x $DAEMON || exit 0
+
+if ! [ -x "/lib/lsb/init-functions" ]; then
+ . /lib/lsb/init-functions
+else
+ echo "E: /lib/lsb/init-functions not found, lsb-base (>= 3.0-6) needed"
+ exit 1
+fi
+
+if [ -s $DEFAULTSFILE ]; then
+ . $DEFAULTSFILE
+ case "x$OVALAGENT_ENABLE" in
+ xtrue|xfalse) ;;
+ *) log_failure_msg "Value of OVALAGENT_ENABLE in $DEFAULTSFILE must be either 'true' or 'false';"
+ log_failure_msg "not starting $NAME daemon."
+ exit 1
+ ;;
+ esac
+fi
+
+export PATH="${PATH:+$PATH:}/usr/sbin:/sbin"
+
+case "$1" in
+ start)
+ if "$OVALAGENT_ENABLE"; then
+ log_daemon_msg "Starting $NAME daemon" "$NAME"
+ if [ -s $PIDFILE ] && kill -0 $(cat $PIDFILE) >/dev/null 2>&1; then
+ log_progress_msg "apparently already running"
+ log_end_msg 0
+ exit 0
+ fi
+ if [ ! -s "$OVALAGENT_CONFIG_FILE" ]; then
+ log_failure_msg "missing or empty config file $OVALAGENT_CONFIG_FILE"
+ log_end_msg 1
+ exit 1
+ fi
+ start-stop-daemon --start --quiet --background \
+ --pidfile $PIDFILE --make-pidfile --chuid $OVALAGENT_USER\
+ --exec $DAEMON \
+ -- -c "$OVALAGENT_CONFIG_FILE"
+ log_end_msg $?
+ else
+ if [ -s "$OVALAGENT_CONFIG_FILE" ]; then
+ [ "$VERBOSE" != no ] && log_warning_msg "$NAME daemon not enabled in $DEFAULTSFILE, not starting..."
+ fi
+ fi
+ ;;
+ stop)
+ log_daemon_msg "Stopping $NAME daemon" "$NAME"
+ start-stop-daemon --stop --quiet --oknodo --pidfile $PIDFILE \
+ --signal INT
+ log_end_msg $?
+ rm -f $PIDFILE
+ ;;
+
+ reload)
+ log_warning_msg "Reloading $NAME daemon: not implemented, as the daemon"
+ log_warning_msg "cannot re-read the config file (use restart)."
+ ;;
+
+ restart|force-reload)
+ set +e
+ if $OVALAGENT_ENABLE; then
+ log_daemon_msg "Restarting $NAME daemon" "$NAME"
+ if [ -s $PIDFILE ] && kill -0 $(cat $PIDFILE) >/dev/null 2>&1; then
+ start-stop-daemon --stop --quiet --oknodo --pidfile $PIDFILE \
+ --signal INT || true
+ sleep 1
+ else
+ rm -f $PIDFILE
+ fi
+ if start-stop-daemon --start --quiet --background \
+ --pidfile $PIDFILE --make-pidfile --chuid $OVALAGENT_USER\
+ --exec $DAEMON \
+ -- -c "$OVALAGENT_CONFIG_FILE"
+ then
+ log_end_msg 0
+ else
+ log_end_msg 1
+ rm -f $PIDFILE
+ fi
+ else
+ [ "$VERBOSE" != no ] && log_warning_msg "$NAME daemon not enabled in $DEFAULTSFILE, not starting..."
+ fi
+ ;;
+
+ *)
+ echo "Usage: /etc/init.d/oval-agent {start|stop|reload|force-reload|restart}"
+ exit 1
+esac
+
+exit 0
Property changes on: trunk/oval-infrastructure/debian/oval-agent.init
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mergeinfo
+
Copied: trunk/oval-infrastructure/debian/oval-server.init (from rev 383, trunk/oval-infrastructure/debian.server/oval-server.init)
===================================================================
--- trunk/oval-infrastructure/debian/oval-server.init (rev 0)
+++ trunk/oval-infrastructure/debian/oval-server.init 2008-10-02 18:15:37 UTC (rev 384)
@@ -0,0 +1,122 @@
+#! /bin/sh
+
+### BEGIN INIT INFO
+# Provides: oval-server
+# Required-Start: $network
+# Required-Stop:
+# Should-Start: $named
+# Should-Stop:
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: oval-server for OVAL definitions quering
+# Description: oval-server is a program that communicate with
+# oval-agent's, generate OVAL definitions from
+# DSA, send them to clients, receive and store results.
+### END INIT INFO
+
+# /etc/init.d/oval-server: start and stop the oval-server daemon
+
+DAEMON=/usr/bin/oval-server
+NAME="oval-server"
+DEFAULTSFILE=/etc/default/oval-server
+PIDFILE=/var/run/oval-server.pid
+
+OVALSERVER_ENABLE=false
+OVALSERVER_USER=oval-server
+OVALSERVER_CONFIG_FILE=/etc/oval/server.conf
+OVALSERVER_LOG_DIR=/var/log/oval/
+
+test -x $DAEMON || exit 0
+
+if ! [ -x "/lib/lsb/init-functions" ]; then
+ . /lib/lsb/init-functions
+else
+ echo "E: /lib/lsb/init-functions not found, lsb-base (>= 3.0-6) needed"
+ exit 1
+fi
+
+. /etc/default/rcS
+
+if [ -s $DEFAULTSFILE ]; then
+ . $DEFAULTSFILE
+ case "x$OVALSERVER_ENABLE" in
+ xtrue|xfalse) ;;
+ *) log_failure_msg "Value of OVALSERVER_ENABLE in $DEFAULTSFILE must be either 'true' or 'false';"
+ log_failure_msg "not starting $NAME daemon."
+ exit 1
+ ;;
+ esac
+fi
+
+export PATH="${PATH:+$PATH:}/usr/sbin:/sbin"
+
+case "$1" in
+ start)
+ if "$OVALSERVER_ENABLE"; then
+ log_daemon_msg "Starting $NAME daemon" "$NAME"
+ if [ -s $PIDFILE ] && kill -0 $(cat $PIDFILE) >/dev/null 2>&1; then
+ log_progress_msg "apparently already running"
+ log_end_msg 0
+ exit 0
+ fi
+ if [ ! -s "$OVALSERVER_CONFIG_FILE" ]; then
+ log_failure_msg "missing or empty config file $OVALSERVER_CONFIG_FILE"
+ log_end_msg 1
+ exit 1
+ fi
+ start-stop-daemon --start --quiet --background \
+ --pidfile $PIDFILE --make-pidfile --chuid $OVALSERVER_USER\
+ --exec $DAEMON \
+ -- -c "$OVALSERVER_CONFIG_FILE"
+ log_end_msg $?
+ else
+ if [ -s "$OVALSERVER_CONFIG_FILE" ]; then
+ [ "$VERBOSE" != no ] && log_warning_msg "$NAME daemon not enabled in $DEFAULTSFILE, not starting..."
+ fi
+ fi
+ ;;
+ stop)
+ log_daemon_msg "Stopping $NAME daemon" "$NAME"
+ start-stop-daemon --stop --quiet --oknodo --pidfile $PIDFILE \
+ --retry INT/15/TERM/5/KILL/5
+ log_end_msg $?
+ rm -f $PIDFILE
+ ;;
+
+ reload)
+ log_warning_msg "Reloading $NAME daemon: not implemented, as the daemon"
+ log_warning_msg "cannot re-read the config file (use restart)."
+ ;;
+
+ restart|force-reload)
+ set +e
+ if $OVALSERVER_ENABLE; then
+ log_daemon_msg "Restarting $NAME daemon" "$NAME"
+ if [ -s $PIDFILE ] && kill -0 $(cat $PIDFILE) >/dev/null 2>&1; then
+ start-stop-daemon --stop --quiet --oknodo --pidfile $PIDFILE \
+ --retry INT/15/TERM/5/KILL/5 || true
+ sleep 1
+ else
+ rm -f $PIDFILE
+ fi
+ if start-stop-daemon --start --quiet --background \
+ --pidfile $PIDFILE --make-pidfile --chuid $OVALSERVER_USER\
+ --exec $DAEMON \
+ -- -c "$OVALSERVER_CONFIG_FILE"
+ then
+ log_end_msg 0
+ else
+ log_end_msg 1
+ rm -f $PIDFILE
+ fi
+ else
+ [ "$VERBOSE" != no ] && log_warning_msg "$NAME daemon not enabled in $DEFAULTSFILE, not starting..."
+ fi
+ ;;
+
+ *)
+ echo "Usage: /etc/init.d/oval-server {start|stop|reload|force-reload|restart}"
+ exit 1
+esac
+
+exit 0
Property changes on: trunk/oval-infrastructure/debian/oval-server.init
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mergeinfo
+
Deleted: trunk/oval-infrastructure/debian.agent/changelog
===================================================================
--- trunk/oval-infrastructure/debian.agent/changelog 2008-09-23 17:49:13 UTC (rev 383)
+++ trunk/oval-infrastructure/debian.agent/changelog 2008-10-02 18:15:37 UTC (rev 384)
@@ -1,5 +0,0 @@
-oval-agent (0.2) unstable; urgency=low
-
- * Initial Release. (Closes: #111111)
-
- -- Pavel Vinogradov <Pavel.Vinogradov at nixdev.net> Fri, 24 Aug 2007 21:03:27 +0500
Deleted: trunk/oval-infrastructure/debian.agent/compat
===================================================================
--- trunk/oval-infrastructure/debian.agent/compat 2008-09-23 17:49:13 UTC (rev 383)
+++ trunk/oval-infrastructure/debian.agent/compat 2008-10-02 18:15:37 UTC (rev 384)
@@ -1 +0,0 @@
-5
Deleted: trunk/oval-infrastructure/debian.agent/oval-agent.init
===================================================================
--- trunk/oval-infrastructure/debian.agent/oval-agent.init 2008-09-23 17:49:13 UTC (rev 383)
+++ trunk/oval-infrastructure/debian.agent/oval-agent.init 2008-10-02 18:15:37 UTC (rev 384)
@@ -1,120 +0,0 @@
-#! /bin/sh
-
-### BEGIN INIT INFO
-# Provides: oval-agent
-# Required-Start: $network
-# Required-Stop:
-# Should-Start: $named
-# Should-Stop:
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: oval-agent for OVAL definitions quering
-# Description: oval-agent is a program that communicate with
-# oval-server, receive oval-definitions, quering it
-# and sent results back to oval-server.
-### END INIT INFO
-
-# /etc/init.d/oval-agent: start and stop the oval-agent daemon
-
-DAEMON=/usr/bin/oval-agent
-NAME="oval-agent"
-DEFAULTSFILE=/etc/default/oval-agent
-PIDFILE=/var/run/oval-agent.pid
-
-OVALAGENT_ENABLE=false
-OVALAGENT_USER=oval-agent
-OVALAGENT_CONFIG_FILE=/etc/oval/agent.conf
-OVALAGENT_LOG_DIR=/var/log/oval
-
-test -x $DAEMON || exit 0
-
-if ! [ -x "/lib/lsb/init-functions" ]; then
- . /lib/lsb/init-functions
-else
- echo "E: /lib/lsb/init-functions not found, lsb-base (>= 3.0-6) needed"
- exit 1
-fi
-
-if [ -s $DEFAULTSFILE ]; then
- . $DEFAULTSFILE
- case "x$OVALAGENT_ENABLE" in
- xtrue|xfalse) ;;
- *) log_failure_msg "Value of OVALAGENT_ENABLE in $DEFAULTSFILE must be either 'true' or 'false';"
- log_failure_msg "not starting $NAME daemon."
- exit 1
- ;;
- esac
-fi
-
-export PATH="${PATH:+$PATH:}/usr/sbin:/sbin"
-
-case "$1" in
- start)
- if "$OVALAGENT_ENABLE"; then
- log_daemon_msg "Starting $NAME daemon" "$NAME"
- if [ -s $PIDFILE ] && kill -0 $(cat $PIDFILE) >/dev/null 2>&1; then
- log_progress_msg "apparently already running"
- log_end_msg 0
- exit 0
- fi
- if [ ! -s "$OVALAGENT_CONFIG_FILE" ]; then
- log_failure_msg "missing or empty config file $OVALAGENT_CONFIG_FILE"
- log_end_msg 1
- exit 1
- fi
- start-stop-daemon --start --quiet --background \
- --pidfile $PIDFILE --make-pidfile --chuid $OVALAGENT_USER\
- --exec $DAEMON \
- -- -c "$OVALAGENT_CONFIG_FILE"
- log_end_msg $?
- else
- if [ -s "$OVALAGENT_CONFIG_FILE" ]; then
- [ "$VERBOSE" != no ] && log_warning_msg "$NAME daemon not enabled in $DEFAULTSFILE, not starting..."
- fi
- fi
- ;;
- stop)
- log_daemon_msg "Stopping $NAME daemon" "$NAME"
- start-stop-daemon --stop --quiet --oknodo --pidfile $PIDFILE \
- --signal INT
- log_end_msg $?
- rm -f $PIDFILE
- ;;
-
- reload)
- log_warning_msg "Reloading $NAME daemon: not implemented, as the daemon"
- log_warning_msg "cannot re-read the config file (use restart)."
- ;;
-
- restart|force-reload)
- set +e
- if $OVALAGENT_ENABLE; then
- log_daemon_msg "Restarting $NAME daemon" "$NAME"
- if [ -s $PIDFILE ] && kill -0 $(cat $PIDFILE) >/dev/null 2>&1; then
- start-stop-daemon --stop --quiet --oknodo --pidfile $PIDFILE \
- --signal INT || true
- sleep 1
- else
- rm -f $PIDFILE
- fi
- if start-stop-daemon --start --quiet --background \
- --pidfile $PIDFILE --make-pidfile --chuid $OVALAGENT_USER\
- --exec $DAEMON \
- -- -c "$OVALAGENT_CONFIG_FILE"
- then
- log_end_msg 0
- else
- log_end_msg 1
- rm -f $PIDFILE
- fi
- else
- [ "$VERBOSE" != no ] && log_warning_msg "$NAME daemon not enabled in $DEFAULTSFILE, not starting..."
- fi
- ;;
-
- *)
- echo "Usage: /etc/init.d/oval-agent {start|stop|reload|force-reload|restart}"
- exit 1
-esac
-
-exit 0
Deleted: trunk/oval-infrastructure/debian.agent/pycompat
===================================================================
--- trunk/oval-infrastructure/debian.agent/pycompat 2008-09-23 17:49:13 UTC (rev 383)
+++ trunk/oval-infrastructure/debian.agent/pycompat 2008-10-02 18:15:37 UTC (rev 384)
@@ -1 +0,0 @@
-2
Deleted: trunk/oval-infrastructure/debian.server/changelog
===================================================================
--- trunk/oval-infrastructure/debian.server/changelog 2008-09-23 17:49:13 UTC (rev 383)
+++ trunk/oval-infrastructure/debian.server/changelog 2008-10-02 18:15:37 UTC (rev 384)
@@ -1,5 +0,0 @@
-oval-server (0.2) unstable; urgency=low
-
- * Initial Release. (Closes: #111112)
-
- -- Pavel Vinogradov <Pavel.Vinogradov at nixdev.net> Thu, 23 Aug 2007 17:37:09 +0500
Deleted: trunk/oval-infrastructure/debian.server/oval-server.init
===================================================================
--- trunk/oval-infrastructure/debian.server/oval-server.init 2008-09-23 17:49:13 UTC (rev 383)
+++ trunk/oval-infrastructure/debian.server/oval-server.init 2008-10-02 18:15:37 UTC (rev 384)
@@ -1,122 +0,0 @@
-#! /bin/sh
-
-### BEGIN INIT INFO
-# Provides: oval-server
-# Required-Start: $network
-# Required-Stop:
-# Should-Start: $named
-# Should-Stop:
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: oval-server for OVAL definitions quering
-# Description: oval-server is a program that communicate with
-# oval-agent's, generate OVAL definitions from
-# DSA, send them to clients, receive and store results.
-### END INIT INFO
-
-# /etc/init.d/oval-server: start and stop the oval-server daemon
-
-DAEMON=/usr/bin/oval-server
-NAME="oval-server"
-DEFAULTSFILE=/etc/default/oval-server
-PIDFILE=/var/run/oval-server.pid
-
-OVALSERVER_ENABLE=false
-OVALSERVER_USER=oval-server
-OVALSERVER_CONFIG_FILE=/etc/oval/server.conf
-OVALSERVER_LOG_DIR=/var/log/oval/
-
-test -x $DAEMON || exit 0
-
-if ! [ -x "/lib/lsb/init-functions" ]; then
- . /lib/lsb/init-functions
-else
- echo "E: /lib/lsb/init-functions not found, lsb-base (>= 3.0-6) needed"
- exit 1
-fi
-
-. /etc/default/rcS
-
-if [ -s $DEFAULTSFILE ]; then
- . $DEFAULTSFILE
- case "x$OVALSERVER_ENABLE" in
- xtrue|xfalse) ;;
- *) log_failure_msg "Value of OVALSERVER_ENABLE in $DEFAULTSFILE must be either 'true' or 'false';"
- log_failure_msg "not starting $NAME daemon."
- exit 1
- ;;
- esac
-fi
-
-export PATH="${PATH:+$PATH:}/usr/sbin:/sbin"
-
-case "$1" in
- start)
- if "$OVALSERVER_ENABLE"; then
- log_daemon_msg "Starting $NAME daemon" "$NAME"
- if [ -s $PIDFILE ] && kill -0 $(cat $PIDFILE) >/dev/null 2>&1; then
- log_progress_msg "apparently already running"
- log_end_msg 0
- exit 0
- fi
- if [ ! -s "$OVALSERVER_CONFIG_FILE" ]; then
- log_failure_msg "missing or empty config file $OVALSERVER_CONFIG_FILE"
- log_end_msg 1
- exit 1
- fi
- start-stop-daemon --start --quiet --background \
- --pidfile $PIDFILE --make-pidfile --chuid $OVALSERVER_USER\
- --exec $DAEMON \
- -- -c "$OVALSERVER_CONFIG_FILE"
- log_end_msg $?
- else
- if [ -s "$OVALSERVER_CONFIG_FILE" ]; then
- [ "$VERBOSE" != no ] && log_warning_msg "$NAME daemon not enabled in $DEFAULTSFILE, not starting..."
- fi
- fi
- ;;
- stop)
- log_daemon_msg "Stopping $NAME daemon" "$NAME"
- start-stop-daemon --stop --quiet --oknodo --pidfile $PIDFILE \
- --retry INT/15/TERM/5/KILL/5
- log_end_msg $?
- rm -f $PIDFILE
- ;;
-
- reload)
- log_warning_msg "Reloading $NAME daemon: not implemented, as the daemon"
- log_warning_msg "cannot re-read the config file (use restart)."
- ;;
-
- restart|force-reload)
- set +e
- if $OVALSERVER_ENABLE; then
- log_daemon_msg "Restarting $NAME daemon" "$NAME"
- if [ -s $PIDFILE ] && kill -0 $(cat $PIDFILE) >/dev/null 2>&1; then
- start-stop-daemon --stop --quiet --oknodo --pidfile $PIDFILE \
- --retry INT/15/TERM/5/KILL/5 || true
- sleep 1
- else
- rm -f $PIDFILE
- fi
- if start-stop-daemon --start --quiet --background \
- --pidfile $PIDFILE --make-pidfile --chuid $OVALSERVER_USER\
- --exec $DAEMON \
- -- -c "$OVALSERVER_CONFIG_FILE"
- then
- log_end_msg 0
- else
- log_end_msg 1
- rm -f $PIDFILE
- fi
- else
- [ "$VERBOSE" != no ] && log_warning_msg "$NAME daemon not enabled in $DEFAULTSFILE, not starting..."
- fi
- ;;
-
- *)
- echo "Usage: /etc/init.d/oval-server {start|stop|reload|force-reload|restart}"
- exit 1
-esac
-
-exit 0
Deleted: trunk/oval-infrastructure/debian.server/pycompat
===================================================================
--- trunk/oval-infrastructure/debian.server/pycompat 2008-09-23 17:49:13 UTC (rev 383)
+++ trunk/oval-infrastructure/debian.server/pycompat 2008-10-02 18:15:37 UTC (rev 384)
@@ -1 +0,0 @@
-2
More information about the Oval-commits
mailing list