[Lunar-commits] <moonbase-other> virtuoso: A little clean up here. We don't use init.d anymore so getting rid of that.
Dennis Veatch
dennisveatch at bellsouth.net
Sat Sep 13 14:58:47 CEST 2014
commit adc366b7936b8ae8523e368bbd52c3159cb673b9
Author: Dennis Veatch <dennisveatch at bellsouth.net>
Date: Sat, 13 Sep 2014 08:57:44 -0400
URL: https://github.com/lunar-linux/moonbase-other/commit/adc366b7936b8ae8523e368bbd52c3159cb673b9
virtuoso: A little clean up here. We don't use init.d anymore so getting rid of that.
Adding a PRE_BUILD and adjusting the BUILD accordingly.
---
sql/virtuoso/BUILD | +1/-14
sql/virtuoso/DEPENDS | +1/-1
sql/virtuoso/POST_INSTALL | +3/-3
sql/virtuoso/PRE_BUILD | +14/-0
sql/virtuoso/init.d/virtuosod | +0/-164
5 files changed, 19 insertions(+), 182 deletions(-)
--- a/sql/virtuoso/BUILD
+++ b/sql/virtuoso/BUILD
@@ -1,17 +1,4 @@
- sedit "s:AM_CONFIG_HEADER:AC_CONFIG_HEADER:" configure.in &&
- autoreconf -i &&
-
- sedit "s:\(test \"\${with_editline+set\}\" = set\):\1 -a \"\${with_editline}\" != no": configure &&
-
- sedit "s:iodbcext.h:libiodbc/iodbcext.h:g" libsrc/Wi/odbcinc.h &&
- sedit "s:iodbcinst.h:libiodbc/iodbcinst.h:g" libsrc/Wi/odbcinc.h &&
-
- if [ -f /var/lib/virtuoso/db/virtuoso.lck ] ; then
- /etc/init.d/virtuosod stop
- fi &&
-
- OPTS+=" --without-debug --with-pthreads --program-transform-name='s/isql*/vt-isql/' \
- --with-iodbc" &&
+ OPTS+=" --without-debug --with-pthreads --program-transform-name='s/isql*/vt-isql/'" &&
default_build
--- a/sql/virtuoso/DEPENDS
+++ b/sql/virtuoso/DEPENDS
@@ -1,4 +1,4 @@
-depends libiodbc
+#depends libiodbc
#Leaving perl commented out. Make failes if this is enabled.
#optional_depends perl "--enable-perl" "--disable-perl" "for perl hosting support"
--- a/sql/virtuoso/POST_INSTALL
+++ b/sql/virtuoso/POST_INSTALL
@@ -1,9 +1,9 @@
if [ ! -f /var/lib/virtuoso/db/virtuoso.ini ]
then cp /var/lib/virtuoso/db/virtuoso.ini.sample /var/lib/virtuoso/db/virtuoso.ini
- fi
+ fi &&
if [ -f /var/lib/virtuoso/db/virtuoso.db ]
then
- printf "${PROBLEM_COLOR}Point a broswer to http://localhost:8890/index.html and change the default passwords for users: \n
- dba (passwd dba) and dav (passwd dav). \n" "${DEFAULT_COLOR}"
+ message "${PROBLEM_COLOR}Point a broswer to http://localhost:8890/index.html and change the default passwords for users: \n
+ dba (passwd dba) and dav (passwd dav). \n ${DEFAULT_COLOR}"
fi
--- /dev/null
+++ b/sql/virtuoso/PRE_BUILD
@@ -0,0 +1,14 @@
+ default_pre_build &&
+
+ sedit "s:AM_CONFIG_HEADER:AC_CONFIG_HEADER:" configure.in &&
+ mv configure.in configure.ac &&
+ autoreconf -i &&
+
+ sedit "s:\(test \"\${with_editline+set\}\" = set\):\1 -a \"\${with_editline}\" != no": configure &&
+
+ sedit "s:iodbcext.h:libiodbc/iodbcext.h:g" libsrc/Wi/odbcinc.h &&
+ sedit "s:iodbcinst.h:libiodbc/iodbcinst.h:g" libsrc/Wi/odbcinc.h &&
+
+ if [ -f /var/lib/virtuoso/db/virtuoso.lck ] ; then
+ systemctl stop virtuoso.service
+ fi
--- a/sql/virtuoso/init.d/virtuosod
+++ /dev/null
@@ -1,164 +0,0 @@
-#! /bin/sh
-#
-# virtuoso OpenLink Virtuoso Open-Source Edition
-#
-# Written by OpenLink Virtuoso Maintainer
-# <vos.admin at openlinksw.com>
-#
-# Version: @(#)virtuoso 6.1.0 03-Feb-2010 vos.admin at openlinksw.com
-#
-
-### BEGIN INIT INFO
-# Provides: virtuoso
-# Required-Start: $syslog
-# Required-Stop: $syslog
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: Start Virtuoso database server on startup
-# Description: Start and stop the primary instance of Virtuoso running
-# in /var/lib/virtuoso/db/. The first time this runs, it loads the
-# Conductor administrative package.
-# chkconfig: 2345 90 20
-###
-
-
-PATH=/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/bin/virtuoso-t
-NAME=virtuoso
-DESC="OpenLink Virtuoso Open-Source Edition"
-DBBASE=/var/lib/virtuoso/db
-
-test -x $DAEMON || exit 0
-
-LOGDIR=/var/log/virtuoso-opensource
-PIDFILE=$DBBASE/$NAME.lck
-DODTIME=1 # Time to wait for the server to die, in seconds
- # If this value is set too low you might not
- # let some servers to die gracefully and
- # 'restart' will not work
-
-# Include virtuoso-opensource defaults if available
-if [ -f /etc/default/virtuoso-opensource ] ; then
- . /etc/default/virtuoso-opensource
-fi
-
-set -e
-
-running_pid()
-{
- # Check if a given process pid's cmdline matches a given name
- pid=$1
- name=$2
- [ -z "$pid" ] && return 1
- [ ! -d /proc/$pid ] && return 1
- cmd=`cat /proc/$pid/cmdline | tr "\000" "\n"|head -n 1 |cut -d : -f 1`
- # Is this the expected child?
- [ "$cmd" != "$name" ] && return 1
- return 0
-}
-
-running()
-{
-# Check if the process is running looking at /proc
-# (works for all users)
-
- # No pidfile, probably no daemon present
- [ ! -f "$PIDFILE" ] && return 1
- # Obtain the pid and check it against the binary name
- . $PIDFILE
- pid="$VIRT_PID"
- running_pid $pid $DAEMON || return 1
- return 0
-}
-
-force_stop() {
-# Forcefully kill the process
- [ ! -f "$PIDFILE" ] && return
- if running ; then
- kill -15 $pid
- # Is it really dead?
- [ -n "$DODTIME" ] && sleep "$DODTIME"s
- if running ; then
- kill -9 $pid
- [ -n "$DODTIME" ] && sleep "$DODTIME"s
- if running ; then
- echo "Cannot kill $LABEL (pid=$pid)!"
- exit 1
- fi
- fi
- fi
- rm -f $PIDFILE
- return 0
-}
-
-case "$1" in
- start)
- echo -n "Starting $DESC: "
- cd "$DBBASE" || exit -1
- $DAEMON -c $NAME +wait
- if running ; then
- echo "$NAME."
- else
- echo " ERROR."
- fi
- ;;
- stop)
- echo -n "Stopping $DESC: "
- cd "$DBBASE" || exit -1
- . ./virtuoso.lck
- if running ; then
- kill $VIRT_PID
- fi
- echo "$NAME."
- ;;
- force-stop)
- echo -n "Forcefully stopping $DESC: "
- force_stop
- if ! running ; then
- echo "$NAME."
- else
- echo " ERROR."
- fi
- ;;
- #reload)
- #
- # If the daemon can reload its config files on the fly
- # for example by sending it SIGHUP, do it here.
- #
- # If the daemon responds to changes in its config file
- # directly anyway, make this a do-nothing entry.
- #
- # echo "Reloading $DESC configuration files."
- # start-stop-daemon --stop --signal 1 --quiet --pidfile \
- # /var/run/$NAME.pid --exec $DAEMON
- #;;
- force-reload)
- #
- # If the "reload" option is implemented, move the "force-reload"
- # option to the "reload" entry above. If not, "force-reload" is
- # just the same as "restart" except that it does nothing if the
- # daemon isn't already running.
- # check wether $DAEMON is running. If so, restart
- start-stop-daemon --stop --test --quiet --pidfile \
- /var/run/$NAME.pid --exec $DAEMON \
- && $0 restart \
- || exit 0
- ;;
- status)
- echo -n "$LABEL is "
- if running ; then
- echo "running"
- else
- echo " not running."
- exit 1
- fi
- ;;
- *)
- N=/etc/init.d/$NAME
- # echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2
- echo "Usage: $N {start|stop|restart|force-reload|status|force-stop}" >&2
- exit 1
- ;;
-esac
-
-exit 0
More information about the Lunar-commits
mailing list