Bug#508048: Another set of proposed patches for Virtuoso packaging
On Wed, Dec 02, 2009 at 12:45:48AM +0100, Obey Arthur Liu wrote:
> > >
> > > I set up a git repo on collab-maint with Miriam Ruiz:
> > > <http://git.debian.org/?p=collab-maint/virtuoso-opensource.git;a=summary>
> > >
> Thank you!
> I imported your patches locally (minus the last one, which doesn't
> seem to break anything if removed here) and everything seems to be
> working smoothly.
> I will update the copyright file, fix up a few things and upload .deb
> somewhere to try out.
>
Here's another set of patches in attachment that you'd like to review and cherry-pick.
The main problem I encountered is the isql and isqlw that wouldn't be renamed as -vt during install.
I also propose the renaming of vos-server-5.0 to vos-server-6.0.
There are some less important changes also, but you'll see for yourself.
Hope this helps.
Of course, if you'd push that to a git tree, I could rebase in an easier way ;)
Best regards,
>From d981cc7fd9084c71b895034b274481616be6eff0 Mon Sep 17 00:00:00 2001
From: Olivier Berger <olivier.berger@it-sudparis.eu>
Date: Wed, 2 Dec 2009 19:40:23 +0100
Subject: [PATCH 1/5] Renaming for vos-server-6.0
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="------------1.6.5"
This is a multi-part message in MIME format.
--------------1.6.5
Content-Type: text/plain; charset=UTF-8; format=fixed
Content-Transfer-Encoding: 8bit
Signed-off-by: Olivier Berger <olivier.berger@it-sudparis.eu>
---
debian/vos-server-5.0.config | 48 ------
debian/vos-server-5.0.default | 15 --
debian/vos-server-5.0.dirs | 8 -
debian/vos-server-5.0.init | 302 ---------------------------------------
debian/vos-server-5.0.install | 4 -
debian/vos-server-5.0.logrotate | 7 -
debian/vos-server-5.0.manpages | 1 -
debian/vos-server-5.0.postinst | 167 ---------------------
debian/vos-server-5.0.postrm | 23 ---
debian/vos-server-5.0.prerm | 46 ------
debian/vos-server-5.0.templates | 105 --------------
debian/vos-server-6.0.config | 48 ++++++
debian/vos-server-6.0.default | 15 ++
debian/vos-server-6.0.dirs | 8 +
debian/vos-server-6.0.init | 302 +++++++++++++++++++++++++++++++++++++++
debian/vos-server-6.0.install | 4 +
debian/vos-server-6.0.logrotate | 7 +
debian/vos-server-6.0.manpages | 1 +
debian/vos-server-6.0.postinst | 167 +++++++++++++++++++++
debian/vos-server-6.0.postrm | 23 +++
debian/vos-server-6.0.prerm | 46 ++++++
debian/vos-server-6.0.templates | 105 ++++++++++++++
22 files changed, 726 insertions(+), 726 deletions(-)
delete mode 100644 debian/vos-server-5.0.config
delete mode 100644 debian/vos-server-5.0.default
delete mode 100644 debian/vos-server-5.0.dirs
delete mode 100644 debian/vos-server-5.0.init
delete mode 100644 debian/vos-server-5.0.install
delete mode 100644 debian/vos-server-5.0.logrotate
delete mode 100644 debian/vos-server-5.0.manpages
delete mode 100644 debian/vos-server-5.0.postinst
delete mode 100644 debian/vos-server-5.0.postrm
delete mode 100644 debian/vos-server-5.0.prerm
delete mode 100644 debian/vos-server-5.0.templates
create mode 100644 debian/vos-server-6.0.config
create mode 100644 debian/vos-server-6.0.default
create mode 100644 debian/vos-server-6.0.dirs
create mode 100644 debian/vos-server-6.0.init
create mode 100644 debian/vos-server-6.0.install
create mode 100644 debian/vos-server-6.0.logrotate
create mode 100644 debian/vos-server-6.0.manpages
create mode 100644 debian/vos-server-6.0.postinst
create mode 100644 debian/vos-server-6.0.postrm
create mode 100644 debian/vos-server-6.0.prerm
create mode 100644 debian/vos-server-6.0.templates
--------------1.6.5
Content-Type: text/x-patch; name="0001-Renaming-for-vos-server-6.0.patch"
Content-Transfer-Encoding: 8bit
Content-Disposition: attachment; filename="0001-Renaming-for-vos-server-6.0.patch"
diff --git a/debian/vos-server-5.0.config b/debian/vos-server-5.0.config
deleted file mode 100644
index 556f0c8..0000000
--- a/debian/vos-server-5.0.config
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/bash -e
-
-. /usr/share/debconf/confmodule
-
-PKG_NAME="vos-server-5.0"
-
-if [ -n "$DEBIAN_SCRIPT_DEBUG" ]; then set -v -x; DEBIAN_SCRIPT_TRACE=1; fi
-${DEBIAN_SCRIPT_TRACE:+ echo "#42#DEBUG# RUNNING $0 $*" 1>&2 }
-
-# get a new password for DBA and DAV users
-while :; do
- RET=""
- db_input high $PKG_NAME/dba-password || true
- db_go
- db_get $PKG_NAME/dba-password
- DBA_PW="$RET"
- if [ -z "$DBA_PW" ]; then
- # if no password is given, leave it to postint to handle
- break
- fi
- # otherwise prompt to confirm the password
- db_input high $PKG_NAME/dba-password-again || true
- db_go
- db_get $PKG_NAME/dba-password-again
- if [ "$RET" == "$DBA_PW" ]; then
- DBA_PW=''
- break
- fi
- # no match, so try again...
- db_input critical $PKG_NAME/password-mismatch
- db_set $PKG_NAME/dba-password ""
- db_set $PKG_NAME/dba-password-again ""
- db_go
-done
-
-# see if they want to change the ports in advance
-db_input low $PKG_NAME/http-server-port || true
-db_input low $PKG_NAME/db-server-port || true
-
-# maybe register a DSN for the default instance?
-db_get libvirtodbc0/register-odbc-driver || true
-if [ "$RET" = "true" ] && [ -e /usr/bin/odbcinst ]; then
- # default to true since odbcinst is available
- db_set $PKG_NAME/register-odbc-dsn "true" || true
- db_input low $PKG_NAME/register-odbc-dsn || true
-fi
-
-db_go || true
diff --git a/debian/vos-server-5.0.default b/debian/vos-server-5.0.default
deleted file mode 100644
index 33c78da..0000000
--- a/debian/vos-server-5.0.default
+++ /dev/null
@@ -1,15 +0,0 @@
-# Defaults for the virtuoso initscript, from virtuoso-opensource
-
-# This is the directory from where the database files are
-# placed, defined by a relative path in the configfile
-DBPATH=/var/lib/vos-server-5.0/db
-
-# Please edit /etc/vos-server-5.0/virtuoso.ini first
-# Removing the +wait breaks the init script!
-DAEMON_OPTS="+wait +configfile /etc/vos-server-5.0/virtuoso.ini"
-
-# Remember to change passwords right after startup.
-# Read README.Debian for information on how to do so.
-
-# Set to 'yes' to start virtuoso, set to 'no' otherwise
-RUN=yes
diff --git a/debian/vos-server-5.0.dirs b/debian/vos-server-5.0.dirs
deleted file mode 100644
index e9fcd18..0000000
--- a/debian/vos-server-5.0.dirs
+++ /dev/null
@@ -1,8 +0,0 @@
-usr/share/vos-server-5.0/
-usr/lib/vos-server-5.0/
-usr/lib/vos-server-5.0/hosting/
-var/log/vos-server-5.0/
-var/lib/vos-server-5.0/
-var/lib/vos-server-5.0/db
-var/lib/vos-server-5.0/vsp
-etc/vos-server-5.0/
diff --git a/debian/vos-server-5.0.init b/debian/vos-server-5.0.init
deleted file mode 100644
index c2aec1e..0000000
--- a/debian/vos-server-5.0.init
+++ /dev/null
@@ -1,302 +0,0 @@
-#!/bin/sh
-#
-# Example init.d script with LSB support.
-#
-# Please read this init.d carefully and modify the sections to
-# adjust it to the program you want to run.
-#
-# Copyright (c) 2007 Javier Fernandez-Sanguino <jfs@debian.org>
-#
-# This is free software; you may redistribute it and/or modify
-# it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2,
-# or (at your option) any later version.
-#
-# This is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License with
-# the Debian operating system, in /usr/share/common-licenses/GPL; if
-# not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA 02111-1307 USA
-#
-### BEGIN INIT INFO
-# Provides: vos-server-5.0
-# Required-Start: $network $local_fs
-# Required-Stop:
-# Should-Start: $named
-# Should-Stop:
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: Virtuoso OpenSource Edition
-# Description: This file should be used to start/stop the virtuoso-t
-# daemon for the default installed database.
-### END INIT INFO
-
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-
-DAEMON=/usr/bin/virtuoso-t
-NAME=vos-server-5.0
-SHORTNAME=virtuoso
-DESC="Virtuoso OpenSource Edition 5.0"
-DBPATH=/var/lib/vos-server-5.0/db
-LOGDIR=/var/log/vos-server-5.0 # Log directory to use
-
-PIDFILE=/var/run/$NAME.pid
-
-test -x $DAEMON || exit 0
-
-. /lib/lsb/init-functions
-
-# Default options, these can be overriden by the information
-# at /etc/default/$NAME
-DAEMON_OPTS="" # Additional options given to the server
-
-DIETIME=60 # 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
-
-STARTTIME=1 # Time to wait for the server to start, in seconds
- # If this value is set each time the server is
- # started (on start or restart) the script will
- # stall to try to determine if it is running
- # If it is not set and the server takes time
- # to setup a pid file the log message might
- # be a false positive (says it did not start
- # when it actually did)
-
-LOGFILE=$LOGDIR/$NAME.log # Server logfile
-# DAEMONUSER=$NAME # Users to run the daemons as. If this value
- # is set start-stop-daemon will chuid the server
-
-# Include defaults if available
-if [ -f /etc/default/$NAME ] ; then
- . /etc/default/$NAME
-fi
-
-# Use this if you want the user to explicitly set 'RUN' in
-# /etc/default/
-if [ "x$RUN" != "xyes" ] ; then
- log_failure_msg "$NAME disabled, please adjust the configuration to your needs "
- log_failure_msg "and then set RUN to 'yes' in /etc/default/$NAME to enable it."
- exit 0
-fi
-
-# Check that the user exists (if we set a user)
-# Does the user exist?
-if [ -n "$DAEMONUSER" ] ; then
- if getent passwd | grep -q "^$DAEMONUSER:"; then
- # Obtain the uid and gid
- DAEMONUID=`getent passwd |grep "^$DAEMONUSER:" | awk -F : '{print $3}'`
- DAEMONGID=`getent passwd |grep "^$DAEMONUSER:" | awk -F : '{print $4}'`
- else
- log_failure_msg "The user $DAEMONUSER, required to run $NAME does not exist."
- exit 1
- fi
-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 server
- [ "$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
- pid=`cat $PIDFILE`
- running_pid $pid $DAEMON || return 1
- return 0
-}
-
-start_server() {
-# Start the process using the wrapper
- if [ -z "$DAEMONUSER" ] ; then
- start-stop-daemon --start --quiet \
- --chdir $DBPATH --exec $DAEMON \
- -- $DAEMON_OPTS
- errcode=$?
- else
-# if we are using a daemonuser then change the user id
- start-stop-daemon --start --quiet \
- --chuid $DAEMONUSER \
- --chdir $DBPATH --exec $DAEMON \
- -- $DAEMON_OPTS
- errcode=$?
- fi
- # Write the pid file using the process id from virtuoso.lck
- sed 's/VIRT_PID=//' $DBPATH/$SHORTNAME.lck > /var/run/$NAME.pid
- return $errcode
-}
-
-stop_server() {
-# Stop the process using the wrapper
- if [ -z "$DAEMONUSER" ] ; then
- killproc -p $PIDFILE $DAEMON
- errcode=$?
- else
-# if we are using a daemonuser then look for process that match
- start-stop-daemon --stop --quiet --pidfile $PIDFILE \
- --user $DAEMONUSER \
- --exec $DAEMON
- errcode=$?
- fi
-
- return $errcode
-}
-
-reload_server() {
- [ ! -f "$PIDFILE" ] && return 1
- pid=pidofproc $PIDFILE # This is the daemon's pid
- # Send a SIGHUP
- kill -1 $pid
- return $?
-}
-
-force_stop() {
-# Force the process to die killing it manually
- [ ! -e "$PIDFILE" ] && return
- if running ; then
- kill -15 $pid
- # Is it really dead?
- sleep "$DIETIME"s
- if running ; then
- kill -9 $pid
- sleep "$DIETIME"s
- if running ; then
- echo "Cannot kill $NAME (pid=$pid)!"
- exit 1
- fi
- fi
- fi
- rm -f $PIDFILE
-}
-
-
-case "$1" in
- start)
- log_daemon_msg "Starting $DESC " "$NAME"
- # Check if it's running first
- if running ; then
- log_progress_msg "apparently already running"
- log_end_msg 0
- exit 0
- fi
- if start_server ; then
- # NOTE: Some servers might die some time after they start,
- # this code will detect this issue if STARTTIME is set
- # to a reasonable value
- [ -n "$STARTTIME" ] && sleep $STARTTIME # Wait some time
- if running ; then
- # It's ok, the server started and is running
- log_end_msg 0
- else
- # It is not running after we did start
- log_end_msg 1
- fi
- else
- # Either we could not start it
- log_end_msg 1
- fi
- ;;
- stop)
- log_daemon_msg "Stopping $DESC" "$NAME"
- if running ; then
- # Only stop the server if we see it running
- errcode=0
- stop_server || errcode=$?
- log_end_msg $errcode
- else
- # If it's not running don't do anything
- log_progress_msg "apparently not running"
- log_end_msg 0
- exit 0
- fi
- ;;
- force-stop)
- # First try to stop gracefully the program
- $0 stop
- if running; then
- # If it's still running try to kill it more forcefully
- log_daemon_msg "Stopping (force) $DESC" "$NAME"
- errcode=0
- force_stop || errcode=$?
- log_end_msg $errcode
- fi
- ;;
- restart|force-reload)
- log_daemon_msg "Restarting $DESC" "$NAME"
- errcode=0
- stop_server || errcode=$?
- # Wait some sensible amount, some server need this
- [ -n "$DIETIME" ] && sleep $DIETIME
- start_server || errcode=$?
- [ -n "$STARTTIME" ] && sleep $STARTTIME
- running || errcode=$?
- log_end_msg $errcode
- ;;
- status)
-
- log_daemon_msg "Checking status of $DESC" "$NAME"
- if running ; then
- log_progress_msg "running"
- log_end_msg 0
- else
- log_progress_msg "apparently not running"
- log_end_msg 1
- exit 1
- fi
- ;;
- # Use this if the daemon cannot reload
- reload)
- log_warning_msg "Reloading $NAME daemon: not implemented, as the daemon"
- log_warning_msg "cannot re-read the config file (use restart)."
- ;;
- # And this if it cann
- #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.
- #
- # log_daemon_msg "Reloading $DESC configuration files" "$NAME"
- # if running ; then
- # reload_server
- # if ! running ; then
- # Process died after we tried to reload
- # log_progress_msg "died on reload"
- # log_end_msg 1
- # exit 1
- # fi
- # else
- # log_progress_msg "server is not running"
- # log_end_msg 1
- # exit 1
- # fi
- #;;
-
- *)
- N=/etc/init.d/$NAME
- echo "Usage: $N {start|stop|force-stop|restart|force-reload|status}" >&2
- exit 1
- ;;
-esac
-
-exit 0
diff --git a/debian/vos-server-5.0.install b/debian/vos-server-5.0.install
deleted file mode 100644
index b05a0fa..0000000
--- a/debian/vos-server-5.0.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/bin/*
-usr/lib/virtuoso/hosting/*.so usr/lib/vos-server-5.0/hosting/
-var/lib/virtuoso/db/virtuoso.ini etc/vos-server-5.0/
-debian/odbc.ini usr/share/vos-server-5.0/
diff --git a/debian/vos-server-5.0.logrotate b/debian/vos-server-5.0.logrotate
deleted file mode 100644
index 5d1fb2b..0000000
--- a/debian/vos-server-5.0.logrotate
+++ /dev/null
@@ -1,7 +0,0 @@
-/var/log/vos-server-5.0/*.log {
-rotate 12
-weekly
-compress
-postrotate
-endscript
-}
diff --git a/debian/vos-server-5.0.manpages b/debian/vos-server-5.0.manpages
deleted file mode 100644
index 0f65186..0000000
--- a/debian/vos-server-5.0.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/*.1
diff --git a/debian/vos-server-5.0.postinst b/debian/vos-server-5.0.postinst
deleted file mode 100644
index 308ab40..0000000
--- a/debian/vos-server-5.0.postinst
+++ /dev/null
@@ -1,167 +0,0 @@
-#!/bin/bash -e
-
-. /usr/share/debconf/confmodule
-
-if [ -n "$DEBIAN_SCRIPT_DEBUG" ]; then set -v -x; DEBIAN_SCRIPT_TRACE=1; fi
-${DEBIAN_SCRIPT_TRACE:+ echo "#42#DEBUG# RUNNING $0 $*" 1>&2 }
-
-# must be some way to get this from vars already I expect
-PKG_NAME="vos-server-5.0"
-
-FILE_INI="/etc/$PKG_NAME/virtuoso.ini"
-FILE_ODBC_DSN="/usr/share/$PKG_NAME/odbc.ini"
-
-# import existing defaults if we have them (to check run state)
-if [ -f /etc/default/$PKG_NAME ] ; then
- . /etc/default/$PKG_NAME
-fi
-
-# are we changing the web server port?
-db_get $PKG_NAME/db-server-port && DB_PORT="$RET"
-if DB_PORT=$(printf "%d" $DB_PORT 2> /dev/null); then
- inifile +inifile $FILE_INI +section Parameters \
- +key ServerPort +value $DB_PORT || true
-fi
-
-# are we changing the database server port?
-db_get $PKG_NAME/http-server-port && HTTP_PORT="$RET"
-if HTTP_PORT=$(printf "%d" $HTTP_PORT 2> /dev/null); then
- inifile +inifile $FILE_INI +section HTTPServer \
- +key ServerPort +value $HTTP_PORT || true
-fi
-
-# update the list of potential default servers
-db_metaget virtuoso-opensource/primary-server owners && OWNERS="$RET"
-db_metaget virtuoso-opensource/primary-server choices && CHOICES="$RET"
-if [ "$OWNERS" != "$CHOICES" ]; then
- db_subst virtuoso-opensource/primary-server choices $OWNERS
- db_fset virtuoso-opensource/primary-server seen false
-fi
-
-# if there's more than one option then prompt user to choose
-if [ "$CHOICES" != "$PKG_NAME" ]; then
- db_input medium virtuoso-opensource/primary-server || true
- db_go || true
-fi
-
-# update default links to point to the chosen version
-rm -f /etc/init.d/virtuoso
-db_get virtuoso-opensource/primary-server && VOS_SERVER="$RET"
-if [ -n "$VOS_SERVER" ]; then
- ln -s /etc/init.d/$VOS_SERVER /etc/init.d/virtuoso
-else
- ln -s /etc/init.d/$PKG_NAME /etc/init.d/virtuoso
-fi
-
-# there doesn't seem to be a way to set the log file path globally or
-# in configure so this will have to suffice for now:
-INI_LOG_FILE="inifile +inifile $FILE_INI +section Database +key ErrorLogFile"
-
-# if we have a default relative filename here then move under /var/log
-LOG_FILE="$($INI_LOG_FILE)"
-if [ "$LOG_FILE" == "virtuoso.log" ]; then
- $INI_LOG_FILE +value /var/log/$PKG_NAME/$LOG_FILE || true
-fi
-
-INI_VSP_ROOT="inifile +inifile $FILE_INI +section HTTPServer +key ServerRoot"
-INI_PLUGINS="inifile +inifile $FILE_INI +section Plugins +key LoadPath"
-INI_DSN_SERVER="inifile +inifile $FILE_ODBC_DSN +section VOS +key Address"
-
-# relocate libs etc. under the private versioned package dir
-$INI_VSP_ROOT +value /var/lib/$PKG_NAME/vsp || true
-$INI_PLUGINS +value /usr/lib/$PKG_NAME/hosting || true
-
-# we need to start the service to change the passwords so the
-# debhelper code gets dumped and we'll do it here instead...
-if [ -x "/etc/init.d/$PKG_NAME" ]; then
- sed "s/RUN=no/RUN=yes/" -i /etc/default/$PKG_NAME
- update-rc.d $PKG_NAME defaults > /dev/null
- if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
- invoke-rc.d $PKG_NAME start && VT_EXIT=$?
- else
- /etc/init.d/$PKG_NAME start && VT_EXIT=$?
- fi
-fi
-
-# get the new admin password
-db_get $PKG_NAME/dba-password && DBA_PW="$RET"
-
-# clear password from debconf db
-db_set $PKG_NAME/dba-password ""
-db_set $PKG_NAME/dba-password-again ""
-
-# Forget +pwdold dba +pwdba $DBA_PW +pwddav $DBA_PW (does work but
-# always exits 101 EVEN IF THE PASSWORD WAS NOT CHANGED)
-# So we're going to change the passwords via isql:
-SQL_DBAPW="EXEC=SET PASSWORD dba $DBA_PW;"
-SQL_DAVPW="EXEC=UPDATE SYS_USERS SET U_PASSWORD='$DBA_PW' WHERE U_NAME='dav';"
-
-# There seems to be a bug in 5.0.11 where the password change is lost
-# with an error on the Roll Forward (SQL Error: 22023 : SR005) if we
-# don't push it to the db before shutting down the server.
-SQL_CHECKPOINT="EXEC=checkpoint;"
-
-# if we have a new password, change it...
-if [ $VT_EXIT ] && [ -n "$DBA_PW" ]; then
- # first see if we can change the dba password:
- if isql-vt $DB_PORT dba dba "$SQL_DBAPW" &> /dev/null; then
- # now change the DAV admin password also:
- if isql-vt $DB_PORT dba $DBA_PW "$SQL_DAVPW" &> /dev/null; then
- # the new password works, so everything seems to be ok!
- isql-vt $DB_PORT dba $DBA_PW "$SQL_CHECKPOINT" &> /dev/null || true
-
- # register this default instance as a DSN then we're done here
- db_get $PKG_NAME/register-odbc-dsn || true
- if [ "$RET" = "true" ]; then
- $INI_DSN_SERVER +value "localhost:$DB_PORT" || true
- odbcinst -i -s -l -f $FILE_ODBC_DSN 1>&2 || true
-
- if [ -e /usr/bin/iodbcadm-gtk ]; then
- # iODBC GUI seems to want an extra section and it doesn't
- # appear to do unixODBC any real harm, so let's have it...
- inifile +inifile /etc/odbc.ini +section "ODBC Data Sources" \
- +key VOS +value Virtuoso
- fi
- fi
- else
- # the password was not changed for some reason
- sed "s/RUN=yes/RUN=no/" -i /etc/default/$PKG_NAME
- db_input critical $PKG_NAME/error-setting-password || true
- fi
- else
- # error connecting to server or non-default password
- sed "s/RUN=yes/RUN=no/" -i /etc/default/$PKG_NAME
- db_input critical $PKG_NAME/error-setting-password || true
- fi
-
-# default install process (i.e. no new admin password was given)...
-else
- if [ $VT_EXIT ]; then
- # let's check to see if the password is actually default
- # (could be manual reconfigure or re-install after changing it)
- if isql-vt $DB_PORT dba dba -K &> /dev/null; then
- # it's a default pw so make sure the daemon is disabled
- sed "s/RUN=yes/RUN=no/" -i /etc/default/$PKG_NAME
- echo "Warning: The current Virtuoso database uses default passwords."
- echo "The Virtuoso daemon has been disabled for security reasons."
- echo "You can reconfigure the package to change these passwords."
- db_input high $PKG_NAME/note-disabled || true
- else
- # should only get here on a reconfigure with no new password;
- # looks safe, so let's just put everything back how we found it
- if [ -n $RUN ]; then
- sed "s/RUN=yes/RUN=$RUN/" -i /etc/default/$PKG_NAME
- fi
- fi
- else
- # couldn't even start the daemon, something's broken!
- sed "s/RUN=yes/RUN=no/" -i /etc/default/$PKG_NAME
- db_input critical $PKG_NAME/error-setting-password || true
- fi
-fi
-
-db_go || true
-db_stop && exit
-
-# dh tag retained to prevent warnings only:
-#DEBHELPER#
diff --git a/debian/vos-server-5.0.postrm b/debian/vos-server-5.0.postrm
deleted file mode 100644
index 4406232..0000000
--- a/debian/vos-server-5.0.postrm
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash -e
-
-. /usr/share/debconf/confmodule
-
-if [ -n "$DEBIAN_SCRIPT_DEBUG" ]; then set -v -x; DEBIAN_SCRIPT_TRACE=1; fi
-${DEBIAN_SCRIPT_TRACE:+ echo "#42#DEBUG# RUNNING $0 $*" 1>&2 }
-
-PKG_NAME="vos-server-5.0"
-
-if [ "$1" == "purge" ]; then
- # log files can go without warning...
- rm -rf /var/log/$PKG_NAME
-
- # ...but get explicit confirmation before removing databases
- db_input high $PKG_NAME/check-remove-databases || true
- db_go || true
- db_get $PKG_NAME/check-remove-databases || true
- if [ "$RET" == "true" ]; then
- rm -rf /var/lib/$PKG_NAME
- fi
-fi
-
-#DEBHELPER#
diff --git a/debian/vos-server-5.0.prerm b/debian/vos-server-5.0.prerm
deleted file mode 100644
index eabaf1b..0000000
--- a/debian/vos-server-5.0.prerm
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/bash -e
-
-. /usr/share/debconf/confmodule
-
-PKG_NAME="vos-server-5.0"
-
-if [ -n "$DEBIAN_SCRIPT_DEBUG" ]; then set -v -x; DEBIAN_SCRIPT_TRACE=1; fi
-${DEBIAN_SCRIPT_TRACE:+ echo "#42#DEBUG# RUNNING $0 $*" 1>&2 }
-
-db_get $PKG_NAME/register-odbc-dsn || true
-if [ "$RET" = "true" ]; then
- odbcinst -u -s -l -n VOS || true
- inifile +inifile /etc/odbc.ini +section "ODBC Data Sources" \
- +key VOS +value - || true
-fi
-
-# removing from list of owners of this question removes us from it's choices
-db_unregister virtuoso-opensource/primary-server
-
-# now check to see if we were the current default vos-server
-# (if so we need to delete the broken links)
-if db_get virtuoso-opensource/primary-server; then
- db_metaget virtuoso-opensource/primary-server owners
- db_subst virtuoso-opensource/primary-server choices $RET
- db_metaget virtuoso-opensource/primary-server value
- if [ "$PKG_NAME" = "$RET" ] ; then
- # prompt the user for a new choice
- db_fset virtuoso-opensource/primary-server seen false
- db_input virtuoso-opensource/primary-server || true
- db_go || true
- fi
-
- # either update the links or remove them
- db_get virtuoso-opensource/primary-server && VOS_SERVER="$RET"
- if [ -n "$VOS_SERVER" ]; then
- ln -s /etc/init.d/$VOS_SERVER /etc/init.d/virtuoso
- else
- # not sure if we could ever get here
- rm -f /etc/init.d/virtuoso
- fi
-else
- # question no longer exists (i.e. no more virtual-vos-server providers)
- rm -f /etc/init.d/virtuoso
-fi
-
-#DEBHELPER#
diff --git a/debian/vos-server-5.0.templates b/debian/vos-server-5.0.templates
deleted file mode 100644
index 75f0c48..0000000
--- a/debian/vos-server-5.0.templates
+++ /dev/null
@@ -1,105 +0,0 @@
-Template: vos-server-5.0/dba-password
-Type: password
-_Description: Password for DBA and DAV users:
- Following installation, users and passwords in Virtuoso can be managed
- using the command line tools (see the full documentation) or via
- the Conductor web application which is installed by default at:
- .
- http://localhost:8890/conductor
- .
- There are two default users (DBA and DAV) created with administrative
- access to Virtuoso and you should now set secure passwords for these users
- to complete the installation.
- .
- If you do not enter a new password the daemon will be disabled initially
- (unless a non-default password is found to already exist).
-
-Template: vos-server-5.0/dba-password-again
-Type: password
-_Description: Repeat password for the admin users to confirm:
-
-Template: vos-server-5.0/password-mismatch
-Type: error
-_Description: Password confirmation error
- The two passwords you entered were not the same. Please try again.
-
-Template: vos-server-5.0/note-disabled
-Type: note
-_Description: No initial password set, daemon disabled
- For security reasons the default Virtuoso instance is disabled because
- no administration password was provided.
- .
- You can enable the daemon manually by setting RUN to 'yes' in the file
- /etc/default/vos-server-5.0, in which case the default DBA user
- password will be 'dba'.
-
-Template: vos-server-5.0/error-setting-password
-Type: error
-_Description: Unable to set password for the Virtuoso 'dba' user
- An error occurred while setting the password for the Virtuoso
- administrative user. This may have happened because the account
- already has a password, or because of a communication problem with
- the Virtuoso server.
- .
- If the database already existed then it will have retained the original
- password. If there was some other problem then the default password
- 'dba' (same as the username) will apply.
- .
- You should check immediately following installation that both the
- 'dba' and 'dav' users have secure non-default passwords set.
-
-Template: vos-server-5.0/check-remove-databases
-Type: boolean
-Default: false
-_Description: Remove all Virtuoso databases?
- The /var/lib/virtuoso directory which contains the Virtuoso databases is
- about to be removed.
- .
- If you're removing the Virtuoso package in order to later install a more
- recent version, or if a different Virtuoso package is already using it,
- the data should be kept.
-
-Template: vos-server-5.0/http-server-port
-Type: string
-Default: 8890
-_Description: Default HTTP (Web) Server Port
- Virtuoso incorporates a web server capable of hosting HTML and VSP pages
- (with optional support for other languages). If you are installing this
- instance as a public web server directly on the internet, you probably want
- to set the port here to the default 80 used for http:// addresses.
- .
- NB: The default web root is created at /var/lib/virtuoso/vsp and will be
- empty unless you also install the package containing the standard Virtuoso
- start page.
-
-Template: vos-server-5.0/db-server-port
-Type: string
-Default: 1111
-_Description: Default Database Server Port
- You may change here the default port on which the Virtuoso database server
- will listen for connections.
- .
- Sometimes it is better to use non-default ports to improve security on
- servers that might be targets for unauthorised intrusion.
-
-Template: vos-server-5.0/register-odbc-dsn
-Type: boolean
-Default: false
-_Description: Do you want to register an ODBC System DSN for Virtuoso?
- You appear to have an ODBC manager (unixodbc or iODBC) installed on your
- system, and the Virtuoso ODBC driver is installed.
- .
- If you wish, the default Virtuoso instance will be automatically added to
- the list of available System Data Sources (and automatically deleted from
- the list when you remove this package).
- .
- If you elect to register the DSN it will be named VOS and DSN list is
- maintained using the /usr/bin/odbcinst program from unixodbc. User and
- password details are omitted from the DSN for security.
-
-Template: virtuoso-opensource/primary-server
-Type: select
-Choices: ${choices}
-_Description: Select the default Virtuoso Server package:
- Please choose the version of vos-server that will be linked to by the
- default (unversioned) names for init scripts and client tools.
diff --git a/debian/vos-server-6.0.config b/debian/vos-server-6.0.config
new file mode 100644
index 0000000..556f0c8
--- /dev/null
+++ b/debian/vos-server-6.0.config
@@ -0,0 +1,48 @@
+#!/bin/bash -e
+
+. /usr/share/debconf/confmodule
+
+PKG_NAME="vos-server-5.0"
+
+if [ -n "$DEBIAN_SCRIPT_DEBUG" ]; then set -v -x; DEBIAN_SCRIPT_TRACE=1; fi
+${DEBIAN_SCRIPT_TRACE:+ echo "#42#DEBUG# RUNNING $0 $*" 1>&2 }
+
+# get a new password for DBA and DAV users
+while :; do
+ RET=""
+ db_input high $PKG_NAME/dba-password || true
+ db_go
+ db_get $PKG_NAME/dba-password
+ DBA_PW="$RET"
+ if [ -z "$DBA_PW" ]; then
+ # if no password is given, leave it to postint to handle
+ break
+ fi
+ # otherwise prompt to confirm the password
+ db_input high $PKG_NAME/dba-password-again || true
+ db_go
+ db_get $PKG_NAME/dba-password-again
+ if [ "$RET" == "$DBA_PW" ]; then
+ DBA_PW=''
+ break
+ fi
+ # no match, so try again...
+ db_input critical $PKG_NAME/password-mismatch
+ db_set $PKG_NAME/dba-password ""
+ db_set $PKG_NAME/dba-password-again ""
+ db_go
+done
+
+# see if they want to change the ports in advance
+db_input low $PKG_NAME/http-server-port || true
+db_input low $PKG_NAME/db-server-port || true
+
+# maybe register a DSN for the default instance?
+db_get libvirtodbc0/register-odbc-driver || true
+if [ "$RET" = "true" ] && [ -e /usr/bin/odbcinst ]; then
+ # default to true since odbcinst is available
+ db_set $PKG_NAME/register-odbc-dsn "true" || true
+ db_input low $PKG_NAME/register-odbc-dsn || true
+fi
+
+db_go || true
diff --git a/debian/vos-server-6.0.default b/debian/vos-server-6.0.default
new file mode 100644
index 0000000..33c78da
--- /dev/null
+++ b/debian/vos-server-6.0.default
@@ -0,0 +1,15 @@
+# Defaults for the virtuoso initscript, from virtuoso-opensource
+
+# This is the directory from where the database files are
+# placed, defined by a relative path in the configfile
+DBPATH=/var/lib/vos-server-5.0/db
+
+# Please edit /etc/vos-server-5.0/virtuoso.ini first
+# Removing the +wait breaks the init script!
+DAEMON_OPTS="+wait +configfile /etc/vos-server-5.0/virtuoso.ini"
+
+# Remember to change passwords right after startup.
+# Read README.Debian for information on how to do so.
+
+# Set to 'yes' to start virtuoso, set to 'no' otherwise
+RUN=yes
diff --git a/debian/vos-server-6.0.dirs b/debian/vos-server-6.0.dirs
new file mode 100644
index 0000000..e9fcd18
--- /dev/null
+++ b/debian/vos-server-6.0.dirs
@@ -0,0 +1,8 @@
+usr/share/vos-server-5.0/
+usr/lib/vos-server-5.0/
+usr/lib/vos-server-5.0/hosting/
+var/log/vos-server-5.0/
+var/lib/vos-server-5.0/
+var/lib/vos-server-5.0/db
+var/lib/vos-server-5.0/vsp
+etc/vos-server-5.0/
diff --git a/debian/vos-server-6.0.init b/debian/vos-server-6.0.init
new file mode 100644
index 0000000..c2aec1e
--- /dev/null
+++ b/debian/vos-server-6.0.init
@@ -0,0 +1,302 @@
+#!/bin/sh
+#
+# Example init.d script with LSB support.
+#
+# Please read this init.d carefully and modify the sections to
+# adjust it to the program you want to run.
+#
+# Copyright (c) 2007 Javier Fernandez-Sanguino <jfs@debian.org>
+#
+# This is free software; you may redistribute it and/or modify
+# it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2,
+# or (at your option) any later version.
+#
+# This is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License with
+# the Debian operating system, in /usr/share/common-licenses/GPL; if
+# not, write to the Free Software Foundation, Inc., 59 Temple Place,
+# Suite 330, Boston, MA 02111-1307 USA
+#
+### BEGIN INIT INFO
+# Provides: vos-server-5.0
+# Required-Start: $network $local_fs
+# Required-Stop:
+# Should-Start: $named
+# Should-Stop:
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: Virtuoso OpenSource Edition
+# Description: This file should be used to start/stop the virtuoso-t
+# daemon for the default installed database.
+### END INIT INFO
+
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+
+DAEMON=/usr/bin/virtuoso-t
+NAME=vos-server-5.0
+SHORTNAME=virtuoso
+DESC="Virtuoso OpenSource Edition 5.0"
+DBPATH=/var/lib/vos-server-5.0/db
+LOGDIR=/var/log/vos-server-5.0 # Log directory to use
+
+PIDFILE=/var/run/$NAME.pid
+
+test -x $DAEMON || exit 0
+
+. /lib/lsb/init-functions
+
+# Default options, these can be overriden by the information
+# at /etc/default/$NAME
+DAEMON_OPTS="" # Additional options given to the server
+
+DIETIME=60 # 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
+
+STARTTIME=1 # Time to wait for the server to start, in seconds
+ # If this value is set each time the server is
+ # started (on start or restart) the script will
+ # stall to try to determine if it is running
+ # If it is not set and the server takes time
+ # to setup a pid file the log message might
+ # be a false positive (says it did not start
+ # when it actually did)
+
+LOGFILE=$LOGDIR/$NAME.log # Server logfile
+# DAEMONUSER=$NAME # Users to run the daemons as. If this value
+ # is set start-stop-daemon will chuid the server
+
+# Include defaults if available
+if [ -f /etc/default/$NAME ] ; then
+ . /etc/default/$NAME
+fi
+
+# Use this if you want the user to explicitly set 'RUN' in
+# /etc/default/
+if [ "x$RUN" != "xyes" ] ; then
+ log_failure_msg "$NAME disabled, please adjust the configuration to your needs "
+ log_failure_msg "and then set RUN to 'yes' in /etc/default/$NAME to enable it."
+ exit 0
+fi
+
+# Check that the user exists (if we set a user)
+# Does the user exist?
+if [ -n "$DAEMONUSER" ] ; then
+ if getent passwd | grep -q "^$DAEMONUSER:"; then
+ # Obtain the uid and gid
+ DAEMONUID=`getent passwd |grep "^$DAEMONUSER:" | awk -F : '{print $3}'`
+ DAEMONGID=`getent passwd |grep "^$DAEMONUSER:" | awk -F : '{print $4}'`
+ else
+ log_failure_msg "The user $DAEMONUSER, required to run $NAME does not exist."
+ exit 1
+ fi
+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 server
+ [ "$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
+ pid=`cat $PIDFILE`
+ running_pid $pid $DAEMON || return 1
+ return 0
+}
+
+start_server() {
+# Start the process using the wrapper
+ if [ -z "$DAEMONUSER" ] ; then
+ start-stop-daemon --start --quiet \
+ --chdir $DBPATH --exec $DAEMON \
+ -- $DAEMON_OPTS
+ errcode=$?
+ else
+# if we are using a daemonuser then change the user id
+ start-stop-daemon --start --quiet \
+ --chuid $DAEMONUSER \
+ --chdir $DBPATH --exec $DAEMON \
+ -- $DAEMON_OPTS
+ errcode=$?
+ fi
+ # Write the pid file using the process id from virtuoso.lck
+ sed 's/VIRT_PID=//' $DBPATH/$SHORTNAME.lck > /var/run/$NAME.pid
+ return $errcode
+}
+
+stop_server() {
+# Stop the process using the wrapper
+ if [ -z "$DAEMONUSER" ] ; then
+ killproc -p $PIDFILE $DAEMON
+ errcode=$?
+ else
+# if we are using a daemonuser then look for process that match
+ start-stop-daemon --stop --quiet --pidfile $PIDFILE \
+ --user $DAEMONUSER \
+ --exec $DAEMON
+ errcode=$?
+ fi
+
+ return $errcode
+}
+
+reload_server() {
+ [ ! -f "$PIDFILE" ] && return 1
+ pid=pidofproc $PIDFILE # This is the daemon's pid
+ # Send a SIGHUP
+ kill -1 $pid
+ return $?
+}
+
+force_stop() {
+# Force the process to die killing it manually
+ [ ! -e "$PIDFILE" ] && return
+ if running ; then
+ kill -15 $pid
+ # Is it really dead?
+ sleep "$DIETIME"s
+ if running ; then
+ kill -9 $pid
+ sleep "$DIETIME"s
+ if running ; then
+ echo "Cannot kill $NAME (pid=$pid)!"
+ exit 1
+ fi
+ fi
+ fi
+ rm -f $PIDFILE
+}
+
+
+case "$1" in
+ start)
+ log_daemon_msg "Starting $DESC " "$NAME"
+ # Check if it's running first
+ if running ; then
+ log_progress_msg "apparently already running"
+ log_end_msg 0
+ exit 0
+ fi
+ if start_server ; then
+ # NOTE: Some servers might die some time after they start,
+ # this code will detect this issue if STARTTIME is set
+ # to a reasonable value
+ [ -n "$STARTTIME" ] && sleep $STARTTIME # Wait some time
+ if running ; then
+ # It's ok, the server started and is running
+ log_end_msg 0
+ else
+ # It is not running after we did start
+ log_end_msg 1
+ fi
+ else
+ # Either we could not start it
+ log_end_msg 1
+ fi
+ ;;
+ stop)
+ log_daemon_msg "Stopping $DESC" "$NAME"
+ if running ; then
+ # Only stop the server if we see it running
+ errcode=0
+ stop_server || errcode=$?
+ log_end_msg $errcode
+ else
+ # If it's not running don't do anything
+ log_progress_msg "apparently not running"
+ log_end_msg 0
+ exit 0
+ fi
+ ;;
+ force-stop)
+ # First try to stop gracefully the program
+ $0 stop
+ if running; then
+ # If it's still running try to kill it more forcefully
+ log_daemon_msg "Stopping (force) $DESC" "$NAME"
+ errcode=0
+ force_stop || errcode=$?
+ log_end_msg $errcode
+ fi
+ ;;
+ restart|force-reload)
+ log_daemon_msg "Restarting $DESC" "$NAME"
+ errcode=0
+ stop_server || errcode=$?
+ # Wait some sensible amount, some server need this
+ [ -n "$DIETIME" ] && sleep $DIETIME
+ start_server || errcode=$?
+ [ -n "$STARTTIME" ] && sleep $STARTTIME
+ running || errcode=$?
+ log_end_msg $errcode
+ ;;
+ status)
+
+ log_daemon_msg "Checking status of $DESC" "$NAME"
+ if running ; then
+ log_progress_msg "running"
+ log_end_msg 0
+ else
+ log_progress_msg "apparently not running"
+ log_end_msg 1
+ exit 1
+ fi
+ ;;
+ # Use this if the daemon cannot reload
+ reload)
+ log_warning_msg "Reloading $NAME daemon: not implemented, as the daemon"
+ log_warning_msg "cannot re-read the config file (use restart)."
+ ;;
+ # And this if it cann
+ #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.
+ #
+ # log_daemon_msg "Reloading $DESC configuration files" "$NAME"
+ # if running ; then
+ # reload_server
+ # if ! running ; then
+ # Process died after we tried to reload
+ # log_progress_msg "died on reload"
+ # log_end_msg 1
+ # exit 1
+ # fi
+ # else
+ # log_progress_msg "server is not running"
+ # log_end_msg 1
+ # exit 1
+ # fi
+ #;;
+
+ *)
+ N=/etc/init.d/$NAME
+ echo "Usage: $N {start|stop|force-stop|restart|force-reload|status}" >&2
+ exit 1
+ ;;
+esac
+
+exit 0
diff --git a/debian/vos-server-6.0.install b/debian/vos-server-6.0.install
new file mode 100644
index 0000000..b05a0fa
--- /dev/null
+++ b/debian/vos-server-6.0.install
@@ -0,0 +1,4 @@
+usr/bin/*
+usr/lib/virtuoso/hosting/*.so usr/lib/vos-server-5.0/hosting/
+var/lib/virtuoso/db/virtuoso.ini etc/vos-server-5.0/
+debian/odbc.ini usr/share/vos-server-5.0/
diff --git a/debian/vos-server-6.0.logrotate b/debian/vos-server-6.0.logrotate
new file mode 100644
index 0000000..5d1fb2b
--- /dev/null
+++ b/debian/vos-server-6.0.logrotate
@@ -0,0 +1,7 @@
+/var/log/vos-server-5.0/*.log {
+rotate 12
+weekly
+compress
+postrotate
+endscript
+}
diff --git a/debian/vos-server-6.0.manpages b/debian/vos-server-6.0.manpages
new file mode 100644
index 0000000..0f65186
--- /dev/null
+++ b/debian/vos-server-6.0.manpages
@@ -0,0 +1 @@
+debian/*.1
diff --git a/debian/vos-server-6.0.postinst b/debian/vos-server-6.0.postinst
new file mode 100644
index 0000000..308ab40
--- /dev/null
+++ b/debian/vos-server-6.0.postinst
@@ -0,0 +1,167 @@
+#!/bin/bash -e
+
+. /usr/share/debconf/confmodule
+
+if [ -n "$DEBIAN_SCRIPT_DEBUG" ]; then set -v -x; DEBIAN_SCRIPT_TRACE=1; fi
+${DEBIAN_SCRIPT_TRACE:+ echo "#42#DEBUG# RUNNING $0 $*" 1>&2 }
+
+# must be some way to get this from vars already I expect
+PKG_NAME="vos-server-5.0"
+
+FILE_INI="/etc/$PKG_NAME/virtuoso.ini"
+FILE_ODBC_DSN="/usr/share/$PKG_NAME/odbc.ini"
+
+# import existing defaults if we have them (to check run state)
+if [ -f /etc/default/$PKG_NAME ] ; then
+ . /etc/default/$PKG_NAME
+fi
+
+# are we changing the web server port?
+db_get $PKG_NAME/db-server-port && DB_PORT="$RET"
+if DB_PORT=$(printf "%d" $DB_PORT 2> /dev/null); then
+ inifile +inifile $FILE_INI +section Parameters \
+ +key ServerPort +value $DB_PORT || true
+fi
+
+# are we changing the database server port?
+db_get $PKG_NAME/http-server-port && HTTP_PORT="$RET"
+if HTTP_PORT=$(printf "%d" $HTTP_PORT 2> /dev/null); then
+ inifile +inifile $FILE_INI +section HTTPServer \
+ +key ServerPort +value $HTTP_PORT || true
+fi
+
+# update the list of potential default servers
+db_metaget virtuoso-opensource/primary-server owners && OWNERS="$RET"
+db_metaget virtuoso-opensource/primary-server choices && CHOICES="$RET"
+if [ "$OWNERS" != "$CHOICES" ]; then
+ db_subst virtuoso-opensource/primary-server choices $OWNERS
+ db_fset virtuoso-opensource/primary-server seen false
+fi
+
+# if there's more than one option then prompt user to choose
+if [ "$CHOICES" != "$PKG_NAME" ]; then
+ db_input medium virtuoso-opensource/primary-server || true
+ db_go || true
+fi
+
+# update default links to point to the chosen version
+rm -f /etc/init.d/virtuoso
+db_get virtuoso-opensource/primary-server && VOS_SERVER="$RET"
+if [ -n "$VOS_SERVER" ]; then
+ ln -s /etc/init.d/$VOS_SERVER /etc/init.d/virtuoso
+else
+ ln -s /etc/init.d/$PKG_NAME /etc/init.d/virtuoso
+fi
+
+# there doesn't seem to be a way to set the log file path globally or
+# in configure so this will have to suffice for now:
+INI_LOG_FILE="inifile +inifile $FILE_INI +section Database +key ErrorLogFile"
+
+# if we have a default relative filename here then move under /var/log
+LOG_FILE="$($INI_LOG_FILE)"
+if [ "$LOG_FILE" == "virtuoso.log" ]; then
+ $INI_LOG_FILE +value /var/log/$PKG_NAME/$LOG_FILE || true
+fi
+
+INI_VSP_ROOT="inifile +inifile $FILE_INI +section HTTPServer +key ServerRoot"
+INI_PLUGINS="inifile +inifile $FILE_INI +section Plugins +key LoadPath"
+INI_DSN_SERVER="inifile +inifile $FILE_ODBC_DSN +section VOS +key Address"
+
+# relocate libs etc. under the private versioned package dir
+$INI_VSP_ROOT +value /var/lib/$PKG_NAME/vsp || true
+$INI_PLUGINS +value /usr/lib/$PKG_NAME/hosting || true
+
+# we need to start the service to change the passwords so the
+# debhelper code gets dumped and we'll do it here instead...
+if [ -x "/etc/init.d/$PKG_NAME" ]; then
+ sed "s/RUN=no/RUN=yes/" -i /etc/default/$PKG_NAME
+ update-rc.d $PKG_NAME defaults > /dev/null
+ if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
+ invoke-rc.d $PKG_NAME start && VT_EXIT=$?
+ else
+ /etc/init.d/$PKG_NAME start && VT_EXIT=$?
+ fi
+fi
+
+# get the new admin password
+db_get $PKG_NAME/dba-password && DBA_PW="$RET"
+
+# clear password from debconf db
+db_set $PKG_NAME/dba-password ""
+db_set $PKG_NAME/dba-password-again ""
+
+# Forget +pwdold dba +pwdba $DBA_PW +pwddav $DBA_PW (does work but
+# always exits 101 EVEN IF THE PASSWORD WAS NOT CHANGED)
+# So we're going to change the passwords via isql:
+SQL_DBAPW="EXEC=SET PASSWORD dba $DBA_PW;"
+SQL_DAVPW="EXEC=UPDATE SYS_USERS SET U_PASSWORD='$DBA_PW' WHERE U_NAME='dav';"
+
+# There seems to be a bug in 5.0.11 where the password change is lost
+# with an error on the Roll Forward (SQL Error: 22023 : SR005) if we
+# don't push it to the db before shutting down the server.
+SQL_CHECKPOINT="EXEC=checkpoint;"
+
+# if we have a new password, change it...
+if [ $VT_EXIT ] && [ -n "$DBA_PW" ]; then
+ # first see if we can change the dba password:
+ if isql-vt $DB_PORT dba dba "$SQL_DBAPW" &> /dev/null; then
+ # now change the DAV admin password also:
+ if isql-vt $DB_PORT dba $DBA_PW "$SQL_DAVPW" &> /dev/null; then
+ # the new password works, so everything seems to be ok!
+ isql-vt $DB_PORT dba $DBA_PW "$SQL_CHECKPOINT" &> /dev/null || true
+
+ # register this default instance as a DSN then we're done here
+ db_get $PKG_NAME/register-odbc-dsn || true
+ if [ "$RET" = "true" ]; then
+ $INI_DSN_SERVER +value "localhost:$DB_PORT" || true
+ odbcinst -i -s -l -f $FILE_ODBC_DSN 1>&2 || true
+
+ if [ -e /usr/bin/iodbcadm-gtk ]; then
+ # iODBC GUI seems to want an extra section and it doesn't
+ # appear to do unixODBC any real harm, so let's have it...
+ inifile +inifile /etc/odbc.ini +section "ODBC Data Sources" \
+ +key VOS +value Virtuoso
+ fi
+ fi
+ else
+ # the password was not changed for some reason
+ sed "s/RUN=yes/RUN=no/" -i /etc/default/$PKG_NAME
+ db_input critical $PKG_NAME/error-setting-password || true
+ fi
+ else
+ # error connecting to server or non-default password
+ sed "s/RUN=yes/RUN=no/" -i /etc/default/$PKG_NAME
+ db_input critical $PKG_NAME/error-setting-password || true
+ fi
+
+# default install process (i.e. no new admin password was given)...
+else
+ if [ $VT_EXIT ]; then
+ # let's check to see if the password is actually default
+ # (could be manual reconfigure or re-install after changing it)
+ if isql-vt $DB_PORT dba dba -K &> /dev/null; then
+ # it's a default pw so make sure the daemon is disabled
+ sed "s/RUN=yes/RUN=no/" -i /etc/default/$PKG_NAME
+ echo "Warning: The current Virtuoso database uses default passwords."
+ echo "The Virtuoso daemon has been disabled for security reasons."
+ echo "You can reconfigure the package to change these passwords."
+ db_input high $PKG_NAME/note-disabled || true
+ else
+ # should only get here on a reconfigure with no new password;
+ # looks safe, so let's just put everything back how we found it
+ if [ -n $RUN ]; then
+ sed "s/RUN=yes/RUN=$RUN/" -i /etc/default/$PKG_NAME
+ fi
+ fi
+ else
+ # couldn't even start the daemon, something's broken!
+ sed "s/RUN=yes/RUN=no/" -i /etc/default/$PKG_NAME
+ db_input critical $PKG_NAME/error-setting-password || true
+ fi
+fi
+
+db_go || true
+db_stop && exit
+
+# dh tag retained to prevent warnings only:
+#DEBHELPER#
diff --git a/debian/vos-server-6.0.postrm b/debian/vos-server-6.0.postrm
new file mode 100644
index 0000000..4406232
--- /dev/null
+++ b/debian/vos-server-6.0.postrm
@@ -0,0 +1,23 @@
+#!/bin/bash -e
+
+. /usr/share/debconf/confmodule
+
+if [ -n "$DEBIAN_SCRIPT_DEBUG" ]; then set -v -x; DEBIAN_SCRIPT_TRACE=1; fi
+${DEBIAN_SCRIPT_TRACE:+ echo "#42#DEBUG# RUNNING $0 $*" 1>&2 }
+
+PKG_NAME="vos-server-5.0"
+
+if [ "$1" == "purge" ]; then
+ # log files can go without warning...
+ rm -rf /var/log/$PKG_NAME
+
+ # ...but get explicit confirmation before removing databases
+ db_input high $PKG_NAME/check-remove-databases || true
+ db_go || true
+ db_get $PKG_NAME/check-remove-databases || true
+ if [ "$RET" == "true" ]; then
+ rm -rf /var/lib/$PKG_NAME
+ fi
+fi
+
+#DEBHELPER#
diff --git a/debian/vos-server-6.0.prerm b/debian/vos-server-6.0.prerm
new file mode 100644
index 0000000..eabaf1b
--- /dev/null
+++ b/debian/vos-server-6.0.prerm
@@ -0,0 +1,46 @@
+#!/bin/bash -e
+
+. /usr/share/debconf/confmodule
+
+PKG_NAME="vos-server-5.0"
+
+if [ -n "$DEBIAN_SCRIPT_DEBUG" ]; then set -v -x; DEBIAN_SCRIPT_TRACE=1; fi
+${DEBIAN_SCRIPT_TRACE:+ echo "#42#DEBUG# RUNNING $0 $*" 1>&2 }
+
+db_get $PKG_NAME/register-odbc-dsn || true
+if [ "$RET" = "true" ]; then
+ odbcinst -u -s -l -n VOS || true
+ inifile +inifile /etc/odbc.ini +section "ODBC Data Sources" \
+ +key VOS +value - || true
+fi
+
+# removing from list of owners of this question removes us from it's choices
+db_unregister virtuoso-opensource/primary-server
+
+# now check to see if we were the current default vos-server
+# (if so we need to delete the broken links)
+if db_get virtuoso-opensource/primary-server; then
+ db_metaget virtuoso-opensource/primary-server owners
+ db_subst virtuoso-opensource/primary-server choices $RET
+ db_metaget virtuoso-opensource/primary-server value
+ if [ "$PKG_NAME" = "$RET" ] ; then
+ # prompt the user for a new choice
+ db_fset virtuoso-opensource/primary-server seen false
+ db_input virtuoso-opensource/primary-server || true
+ db_go || true
+ fi
+
+ # either update the links or remove them
+ db_get virtuoso-opensource/primary-server && VOS_SERVER="$RET"
+ if [ -n "$VOS_SERVER" ]; then
+ ln -s /etc/init.d/$VOS_SERVER /etc/init.d/virtuoso
+ else
+ # not sure if we could ever get here
+ rm -f /etc/init.d/virtuoso
+ fi
+else
+ # question no longer exists (i.e. no more virtual-vos-server providers)
+ rm -f /etc/init.d/virtuoso
+fi
+
+#DEBHELPER#
diff --git a/debian/vos-server-6.0.templates b/debian/vos-server-6.0.templates
new file mode 100644
index 0000000..75f0c48
--- /dev/null
+++ b/debian/vos-server-6.0.templates
@@ -0,0 +1,105 @@
+Template: vos-server-5.0/dba-password
+Type: password
+_Description: Password for DBA and DAV users:
+ Following installation, users and passwords in Virtuoso can be managed
+ using the command line tools (see the full documentation) or via
+ the Conductor web application which is installed by default at:
+ .
+ http://localhost:8890/conductor
+ .
+ There are two default users (DBA and DAV) created with administrative
+ access to Virtuoso and you should now set secure passwords for these users
+ to complete the installation.
+ .
+ If you do not enter a new password the daemon will be disabled initially
+ (unless a non-default password is found to already exist).
+
+Template: vos-server-5.0/dba-password-again
+Type: password
+_Description: Repeat password for the admin users to confirm:
+
+Template: vos-server-5.0/password-mismatch
+Type: error
+_Description: Password confirmation error
+ The two passwords you entered were not the same. Please try again.
+
+Template: vos-server-5.0/note-disabled
+Type: note
+_Description: No initial password set, daemon disabled
+ For security reasons the default Virtuoso instance is disabled because
+ no administration password was provided.
+ .
+ You can enable the daemon manually by setting RUN to 'yes' in the file
+ /etc/default/vos-server-5.0, in which case the default DBA user
+ password will be 'dba'.
+
+Template: vos-server-5.0/error-setting-password
+Type: error
+_Description: Unable to set password for the Virtuoso 'dba' user
+ An error occurred while setting the password for the Virtuoso
+ administrative user. This may have happened because the account
+ already has a password, or because of a communication problem with
+ the Virtuoso server.
+ .
+ If the database already existed then it will have retained the original
+ password. If there was some other problem then the default password
+ 'dba' (same as the username) will apply.
+ .
+ You should check immediately following installation that both the
+ 'dba' and 'dav' users have secure non-default passwords set.
+
+Template: vos-server-5.0/check-remove-databases
+Type: boolean
+Default: false
+_Description: Remove all Virtuoso databases?
+ The /var/lib/virtuoso directory which contains the Virtuoso databases is
+ about to be removed.
+ .
+ If you're removing the Virtuoso package in order to later install a more
+ recent version, or if a different Virtuoso package is already using it,
+ the data should be kept.
+
+Template: vos-server-5.0/http-server-port
+Type: string
+Default: 8890
+_Description: Default HTTP (Web) Server Port
+ Virtuoso incorporates a web server capable of hosting HTML and VSP pages
+ (with optional support for other languages). If you are installing this
+ instance as a public web server directly on the internet, you probably want
+ to set the port here to the default 80 used for http:// addresses.
+ .
+ NB: The default web root is created at /var/lib/virtuoso/vsp and will be
+ empty unless you also install the package containing the standard Virtuoso
+ start page.
+
+Template: vos-server-5.0/db-server-port
+Type: string
+Default: 1111
+_Description: Default Database Server Port
+ You may change here the default port on which the Virtuoso database server
+ will listen for connections.
+ .
+ Sometimes it is better to use non-default ports to improve security on
+ servers that might be targets for unauthorised intrusion.
+
+Template: vos-server-5.0/register-odbc-dsn
+Type: boolean
+Default: false
+_Description: Do you want to register an ODBC System DSN for Virtuoso?
+ You appear to have an ODBC manager (unixodbc or iODBC) installed on your
+ system, and the Virtuoso ODBC driver is installed.
+ .
+ If you wish, the default Virtuoso instance will be automatically added to
+ the list of available System Data Sources (and automatically deleted from
+ the list when you remove this package).
+ .
+ If you elect to register the DSN it will be named VOS and DSN list is
+ maintained using the /usr/bin/odbcinst program from unixodbc. User and
+ password details are omitted from the DSN for security.
+
+Template: virtuoso-opensource/primary-server
+Type: select
+Choices: ${choices}
+_Description: Select the default Virtuoso Server package:
+ Please choose the version of vos-server that will be linked to by the
+ default (unversioned) names for init scripts and client tools.
--------------1.6.5--
>From 083e9a55873a890df4cb575debe9be6a7d9ee95b Mon Sep 17 00:00:00 2001
From: Olivier Berger <olivier.berger@it-sudparis.eu>
Date: Wed, 2 Dec 2009 19:42:39 +0100
Subject: [PATCH 2/5] Changing the package version 5.0 -> 6.0
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="------------1.6.5"
This is a multi-part message in MIME format.
--------------1.6.5
Content-Type: text/plain; charset=UTF-8; format=fixed
Content-Transfer-Encoding: 8bit
Signed-off-by: Olivier Berger <olivier.berger@it-sudparis.eu>
---
debian/control | 6 +++---
debian/po/POTFILES.in | 2 +-
debian/rules | 8 ++++----
debian/virtuoso-vsp-startpage.install | 2 +-
debian/vos-server-6.0.config | 2 +-
debian/vos-server-6.0.default | 6 +++---
debian/vos-server-6.0.dirs | 16 ++++++++--------
debian/vos-server-6.0.init | 8 ++++----
debian/vos-server-6.0.install | 6 +++---
debian/vos-server-6.0.logrotate | 2 +-
debian/vos-server-6.0.postinst | 2 +-
debian/vos-server-6.0.postrm | 2 +-
debian/vos-server-6.0.prerm | 2 +-
debian/vos-server-6.0.templates | 20 ++++++++++----------
14 files changed, 42 insertions(+), 42 deletions(-)
--------------1.6.5
Content-Type: text/x-patch; name="0002-Changing-the-package-version-5.0-6.0.patch"
Content-Transfer-Encoding: 8bit
Content-Disposition: attachment; filename="0002-Changing-the-package-version-5.0-6.0.patch"
diff --git a/debian/control b/debian/control
index 2a923fc..69dbaa9 100644
--- a/debian/control
+++ b/debian/control
@@ -36,10 +36,10 @@ Description: OpenLink Virtuoso Open-Source Edition
Package: vos-server
Architecture: all
-Depends: vos-server-5.0, ${misc:Depends}
+Depends: vos-server-6.0, ${misc:Depends}
Description: Virtuoso OSE Server (metapackage depending on the latest version)
This is an empty package that depends on the current "best" version
- of vos-server (currently vos-server-5.0), as determined by the
+ of vos-server (currently vos-server-6.0), as determined by the
Virtuoso maintainers. Install this package if in doubt about which
Virtuoso OSE version you need. That will install the version
recommended by the package maintainers.
@@ -50,7 +50,7 @@ Description: Virtuoso OSE Server (metapackage depending on the latest version)
hosting, hot backup, SQL-99 support and more. It has all major
data-access interfaces, such as ODBC, JDBC, ADO .Net and OLE/DB.
-Package: vos-server-5.0
+Package: vos-server-6.0
Architecture: any
Pre-Depends: libvirtodbc0
Depends: ${shlibs:Depends}, ${misc:Depends}
diff --git a/debian/po/POTFILES.in b/debian/po/POTFILES.in
index 2bf65ea..80da2dd 100644
--- a/debian/po/POTFILES.in
+++ b/debian/po/POTFILES.in
@@ -1,2 +1,2 @@
-[type: gettext/rfc822deb] vos-server-5.0.templates
+[type: gettext/rfc822deb] vos-server-6.0.templates
[type: gettext/rfc822deb] libvirtodbc0.templates
diff --git a/debian/rules b/debian/rules
index c144145..fe6a14f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
-DEB_ALL_PACKAGES = virtuoso-opensource vos-server-5.0 \
+DEB_ALL_PACKAGES = virtuoso-opensource vos-server-6.0 \
virtuoso-vad-conductor virtuoso-vad-doc virtuoso-vad-demo \
virtuoso-vad-tutorial virtuoso-vad-rdfmappers virtuoso-vad-sparqldemo \
virtuoso-vad-syncml virtuoso-vad-bpel virtuoso-vad-isparql \
@@ -15,7 +15,7 @@ DEB_INDEP_PACKAGES = virtuoso-vad-conductor virtuoso-vad-doc virtuoso-vad-demo \
virtuoso-vad-syncml virtuoso-vad-bpel virtuoso-vad-isparql \
virtuoso-vad-ods libvirtuoso-java libvirtuoso5.5-cil virtuoso-vsp-startpage
-DEB_ARCH_PACKAGES = virtuoso-opensource vos-server-5.0 libvirtodbc0
+DEB_ARCH_PACKAGES = virtuoso-opensource vos-server-6.0 libvirtodbc0
DEB_AUTO_UPDATE_AUTOCONF = 2.61
@@ -36,10 +36,10 @@ DEB_CONFIGURE_SCRIPT_ENV += \
#DEB_MAKE_INVOKE += -j
#.NOTPARALLEL:
-build/vos-server-5.0::
+build/vos-server-6.0::
cd debian; find . -name "*.?.xml" -exec docbook2x-man --solinks {} \;
-cleanbuilddir/vos-server-5.0::
+cleanbuilddir/vos-server-6.0::
rm -f debian/*.1
makebuilddir::
diff --git a/debian/virtuoso-vsp-startpage.install b/debian/virtuoso-vsp-startpage.install
index 711c297..5f636d3 100644
--- a/debian/virtuoso-vsp-startpage.install
+++ b/debian/virtuoso-vsp-startpage.install
@@ -1 +1 @@
-var/lib/virtuoso/vsp/* var/lib/vos-server-5.0/vsp/
+var/lib/virtuoso/vsp/* var/lib/vos-server-6.0/vsp/
diff --git a/debian/vos-server-6.0.config b/debian/vos-server-6.0.config
index 556f0c8..1646891 100644
--- a/debian/vos-server-6.0.config
+++ b/debian/vos-server-6.0.config
@@ -2,7 +2,7 @@
. /usr/share/debconf/confmodule
-PKG_NAME="vos-server-5.0"
+PKG_NAME="vos-server-6.0"
if [ -n "$DEBIAN_SCRIPT_DEBUG" ]; then set -v -x; DEBIAN_SCRIPT_TRACE=1; fi
${DEBIAN_SCRIPT_TRACE:+ echo "#42#DEBUG# RUNNING $0 $*" 1>&2 }
diff --git a/debian/vos-server-6.0.default b/debian/vos-server-6.0.default
index 33c78da..6a864f4 100644
--- a/debian/vos-server-6.0.default
+++ b/debian/vos-server-6.0.default
@@ -2,11 +2,11 @@
# This is the directory from where the database files are
# placed, defined by a relative path in the configfile
-DBPATH=/var/lib/vos-server-5.0/db
+DBPATH=/var/lib/vos-server-6.0/db
-# Please edit /etc/vos-server-5.0/virtuoso.ini first
+# Please edit /etc/vos-server-6.0/virtuoso.ini first
# Removing the +wait breaks the init script!
-DAEMON_OPTS="+wait +configfile /etc/vos-server-5.0/virtuoso.ini"
+DAEMON_OPTS="+wait +configfile /etc/vos-server-6.0/virtuoso.ini"
# Remember to change passwords right after startup.
# Read README.Debian for information on how to do so.
diff --git a/debian/vos-server-6.0.dirs b/debian/vos-server-6.0.dirs
index e9fcd18..23fbe25 100644
--- a/debian/vos-server-6.0.dirs
+++ b/debian/vos-server-6.0.dirs
@@ -1,8 +1,8 @@
-usr/share/vos-server-5.0/
-usr/lib/vos-server-5.0/
-usr/lib/vos-server-5.0/hosting/
-var/log/vos-server-5.0/
-var/lib/vos-server-5.0/
-var/lib/vos-server-5.0/db
-var/lib/vos-server-5.0/vsp
-etc/vos-server-5.0/
+usr/share/vos-server-6.0/
+usr/lib/vos-server-6.0/
+usr/lib/vos-server-6.0/hosting/
+var/log/vos-server-6.0/
+var/lib/vos-server-6.0/
+var/lib/vos-server-6.0/db
+var/lib/vos-server-6.0/vsp
+etc/vos-server-6.0/
diff --git a/debian/vos-server-6.0.init b/debian/vos-server-6.0.init
index c2aec1e..4b64093 100644
--- a/debian/vos-server-6.0.init
+++ b/debian/vos-server-6.0.init
@@ -23,7 +23,7 @@
# Suite 330, Boston, MA 02111-1307 USA
#
### BEGIN INIT INFO
-# Provides: vos-server-5.0
+# Provides: vos-server-6.0
# Required-Start: $network $local_fs
# Required-Stop:
# Should-Start: $named
@@ -38,11 +38,11 @@
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
DAEMON=/usr/bin/virtuoso-t
-NAME=vos-server-5.0
+NAME=vos-server-6.0
SHORTNAME=virtuoso
DESC="Virtuoso OpenSource Edition 5.0"
-DBPATH=/var/lib/vos-server-5.0/db
-LOGDIR=/var/log/vos-server-5.0 # Log directory to use
+DBPATH=/var/lib/vos-server-6.0/db
+LOGDIR=/var/log/vos-server-6.0 # Log directory to use
PIDFILE=/var/run/$NAME.pid
diff --git a/debian/vos-server-6.0.install b/debian/vos-server-6.0.install
index b05a0fa..06e8c49 100644
--- a/debian/vos-server-6.0.install
+++ b/debian/vos-server-6.0.install
@@ -1,4 +1,4 @@
usr/bin/*
-usr/lib/virtuoso/hosting/*.so usr/lib/vos-server-5.0/hosting/
-var/lib/virtuoso/db/virtuoso.ini etc/vos-server-5.0/
-debian/odbc.ini usr/share/vos-server-5.0/
+usr/lib/virtuoso/hosting/*.so usr/lib/vos-server-6.0/hosting/
+var/lib/virtuoso/db/virtuoso.ini etc/vos-server-6.0/
+debian/odbc.ini usr/share/vos-server-6.0/
diff --git a/debian/vos-server-6.0.logrotate b/debian/vos-server-6.0.logrotate
index 5d1fb2b..0260636 100644
--- a/debian/vos-server-6.0.logrotate
+++ b/debian/vos-server-6.0.logrotate
@@ -1,4 +1,4 @@
-/var/log/vos-server-5.0/*.log {
+/var/log/vos-server-6.0/*.log {
rotate 12
weekly
compress
diff --git a/debian/vos-server-6.0.postinst b/debian/vos-server-6.0.postinst
index 308ab40..4c6541d 100644
--- a/debian/vos-server-6.0.postinst
+++ b/debian/vos-server-6.0.postinst
@@ -6,7 +6,7 @@ if [ -n "$DEBIAN_SCRIPT_DEBUG" ]; then set -v -x; DEBIAN_SCRIPT_TRACE=1; fi
${DEBIAN_SCRIPT_TRACE:+ echo "#42#DEBUG# RUNNING $0 $*" 1>&2 }
# must be some way to get this from vars already I expect
-PKG_NAME="vos-server-5.0"
+PKG_NAME="vos-server-6.0"
FILE_INI="/etc/$PKG_NAME/virtuoso.ini"
FILE_ODBC_DSN="/usr/share/$PKG_NAME/odbc.ini"
diff --git a/debian/vos-server-6.0.postrm b/debian/vos-server-6.0.postrm
index 4406232..3d755a7 100644
--- a/debian/vos-server-6.0.postrm
+++ b/debian/vos-server-6.0.postrm
@@ -5,7 +5,7 @@
if [ -n "$DEBIAN_SCRIPT_DEBUG" ]; then set -v -x; DEBIAN_SCRIPT_TRACE=1; fi
${DEBIAN_SCRIPT_TRACE:+ echo "#42#DEBUG# RUNNING $0 $*" 1>&2 }
-PKG_NAME="vos-server-5.0"
+PKG_NAME="vos-server-6.0"
if [ "$1" == "purge" ]; then
# log files can go without warning...
diff --git a/debian/vos-server-6.0.prerm b/debian/vos-server-6.0.prerm
index eabaf1b..06dfbb2 100644
--- a/debian/vos-server-6.0.prerm
+++ b/debian/vos-server-6.0.prerm
@@ -2,7 +2,7 @@
. /usr/share/debconf/confmodule
-PKG_NAME="vos-server-5.0"
+PKG_NAME="vos-server-6.0"
if [ -n "$DEBIAN_SCRIPT_DEBUG" ]; then set -v -x; DEBIAN_SCRIPT_TRACE=1; fi
${DEBIAN_SCRIPT_TRACE:+ echo "#42#DEBUG# RUNNING $0 $*" 1>&2 }
diff --git a/debian/vos-server-6.0.templates b/debian/vos-server-6.0.templates
index 75f0c48..0da2246 100644
--- a/debian/vos-server-6.0.templates
+++ b/debian/vos-server-6.0.templates
@@ -1,4 +1,4 @@
-Template: vos-server-5.0/dba-password
+Template: vos-server-6.0/dba-password
Type: password
_Description: Password for DBA and DAV users:
Following installation, users and passwords in Virtuoso can be managed
@@ -14,26 +14,26 @@ _Description: Password for DBA and DAV users:
If you do not enter a new password the daemon will be disabled initially
(unless a non-default password is found to already exist).
-Template: vos-server-5.0/dba-password-again
+Template: vos-server-6.0/dba-password-again
Type: password
_Description: Repeat password for the admin users to confirm:
-Template: vos-server-5.0/password-mismatch
+Template: vos-server-6.0/password-mismatch
Type: error
_Description: Password confirmation error
The two passwords you entered were not the same. Please try again.
-Template: vos-server-5.0/note-disabled
+Template: vos-server-6.0/note-disabled
Type: note
_Description: No initial password set, daemon disabled
For security reasons the default Virtuoso instance is disabled because
no administration password was provided.
.
You can enable the daemon manually by setting RUN to 'yes' in the file
- /etc/default/vos-server-5.0, in which case the default DBA user
+ /etc/default/vos-server-6.0, in which case the default DBA user
password will be 'dba'.
-Template: vos-server-5.0/error-setting-password
+Template: vos-server-6.0/error-setting-password
Type: error
_Description: Unable to set password for the Virtuoso 'dba' user
An error occurred while setting the password for the Virtuoso
@@ -48,7 +48,7 @@ _Description: Unable to set password for the Virtuoso 'dba' user
You should check immediately following installation that both the
'dba' and 'dav' users have secure non-default passwords set.
-Template: vos-server-5.0/check-remove-databases
+Template: vos-server-6.0/check-remove-databases
Type: boolean
Default: false
_Description: Remove all Virtuoso databases?
@@ -59,7 +59,7 @@ _Description: Remove all Virtuoso databases?
recent version, or if a different Virtuoso package is already using it,
the data should be kept.
-Template: vos-server-5.0/http-server-port
+Template: vos-server-6.0/http-server-port
Type: string
Default: 8890
_Description: Default HTTP (Web) Server Port
@@ -72,7 +72,7 @@ _Description: Default HTTP (Web) Server Port
empty unless you also install the package containing the standard Virtuoso
start page.
-Template: vos-server-5.0/db-server-port
+Template: vos-server-6.0/db-server-port
Type: string
Default: 1111
_Description: Default Database Server Port
@@ -82,7 +82,7 @@ _Description: Default Database Server Port
Sometimes it is better to use non-default ports to improve security on
servers that might be targets for unauthorised intrusion.
-Template: vos-server-5.0/register-odbc-dsn
+Template: vos-server-6.0/register-odbc-dsn
Type: boolean
Default: false
_Description: Do you want to register an ODBC System DSN for Virtuoso?
--------------1.6.5--
>From 8f52378dff475c6dcba8207113af7473c7a4c2c7 Mon Sep 17 00:00:00 2001
From: Olivier Berger <olivier.berger@it-sudparis.eu>
Date: Wed, 2 Dec 2009 19:43:16 +0100
Subject: [PATCH 3/5] Better names and details in descriptions
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="------------1.6.5"
This is a multi-part message in MIME format.
--------------1.6.5
Content-Type: text/plain; charset=UTF-8; format=fixed
Content-Transfer-Encoding: 8bit
Signed-off-by: Olivier Berger <olivier.berger@it-sudparis.eu>
---
debian/control | 34 +++++++++++++++++++++++-----------
debian/copyright | 4 ++--
2 files changed, 25 insertions(+), 13 deletions(-)
--------------1.6.5
Content-Type: text/x-patch; name="0003-Better-names-and-details-in-descriptions.patch"
Content-Transfer-Encoding: 8bit
Content-Disposition: attachment; filename="0003-Better-names-and-details-in-descriptions.patch"
diff --git a/debian/control b/debian/control
index 69dbaa9..4587625 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,7 @@ Recommends: vos-server, virtuoso-vsp-startpage, virtuoso-vad-conductor
Suggests: virtuoso-vad-doc, virtuoso-vad-demo, virtuoso-vad-tutorial,
virtuoso-vad-rdfmappers, virtuoso-vad-sparqldemo, virtuoso-vad-syncml,
virtuoso-vad-bpel, virtuoso-vad-isparql, virtuoso-vad-ods
-Description: OpenLink Virtuoso Open-Source Edition
+Description: OpenLink Virtuoso Open-Source Edition (OSE)
Virtuoso is a high-performance object-relational SQL database. As a
database, it provides transactions, a smart SQL compiler, powerful
stored-procedure language with optional Java and .Net server-side
@@ -33,6 +33,8 @@ Description: OpenLink Virtuoso Open-Source Edition
data stored in Virtuoso's database. SPARQL benefits from low-level
support in the engine itself, such as SPARQL-aware type-casting rules
and a dedicated IRI data type.
+ .
+ This is the Virtuoso's Open-Source Edition (Virtuoso OSE).
Package: vos-server
Architecture: all
@@ -88,7 +90,8 @@ Description: OpenLink Virtuoso Open-Source Edition - Conductor
hosting, hot backup, SQL-99 support and more. It has all major
data-access interfaces, such as ODBC, JDBC, ADO .Net and OLE/DB.
.
- This package contains the administration interface VAD package.
+ This package contains the administration interface VAD (Virtuoso
+ Application Distribution) package.
Package: virtuoso-vad-doc
Section: doc
@@ -101,7 +104,8 @@ Description: OpenLink Virtuoso Open-Source Edition - Documentation
hosting, hot backup, SQL-99 support and more. It has all major
data-access interfaces, such as ODBC, JDBC, ADO .Net and OLE/DB.
.
- This package contains the documentation VAD package.
+ This package contains the documentation VAD (Virtuoso Application
+ Distribution) package.
Package: virtuoso-vad-demo
Section: doc
@@ -114,7 +118,8 @@ Description: OpenLink Virtuoso Open-Source Edition - Demo
hosting, hot backup, SQL-99 support and more. It has all major
data-access interfaces, such as ODBC, JDBC, ADO .Net and OLE/DB.
.
- This package contains the demo application VAD package.
+ This package contains the demo application VAD (Virtuoso Application
+ Distribution) package.
Package: virtuoso-vad-tutorial
Section: doc
@@ -127,7 +132,8 @@ Description: OpenLink Virtuoso Open-Source Edition - Tutorial
hosting, hot backup, SQL-99 support and more. It has all major
data-access interfaces, such as ODBC, JDBC, ADO .Net and OLE/DB.
.
- This package contains the tutorial application VAD package.
+ This package contains the tutorial application VAD (Virtuoso
+ Application Distribution) package.
Package: virtuoso-vad-rdfmappers
Architecture: all
@@ -139,7 +145,8 @@ Description: OpenLink Virtuoso Open-Source Edition - RDF Mappers
hosting, hot backup, SQL-99 support and more. It has all major
data-access interfaces, such as ODBC, JDBC, ADO .Net and OLE/DB.
.
- This package contains the RDF Mappers application VAD package.
+ This package contains the RDF Mappers application VAD (Virtuoso
+ Application Distribution) package.
Package: virtuoso-vad-sparqldemo
Architecture: all
@@ -151,7 +158,8 @@ Description: OpenLink Virtuoso Open-Source Edition - SPARQL Demo
hosting, hot backup, SQL-99 support and more. It has all major
data-access interfaces, such as ODBC, JDBC, ADO .Net and OLE/DB.
.
- This package contains the SPARQL Demo application VAD package.
+ This package contains the SPARQL Demo application VAD (Virtuoso
+ Application Distribution) package.
Package: virtuoso-vad-syncml
Architecture: all
@@ -163,7 +171,8 @@ Description: OpenLink Virtuoso Open-Source Edition - SyncML
hosting, hot backup, SQL-99 support and more. It has all major
data-access interfaces, such as ODBC, JDBC, ADO .Net and OLE/DB.
.
- This package contains the SyncML application VAD package.
+ This package contains the SyncML application VAD (Virtuoso
+ Application Distribution) package.
Package: virtuoso-vad-bpel
Architecture: all
@@ -175,7 +184,8 @@ Description: OpenLink Virtuoso Open-Source Edition - BPEL
hosting, hot backup, SQL-99 support and more. It has all major
data-access interfaces, such as ODBC, JDBC, ADO .Net and OLE/DB.
.
- This package contains the BPEL application VAD package.
+ This package contains the BPEL application VAD (Virtuoso Application
+ Distribution) package.
Package: virtuoso-vad-isparql
Architecture: all
@@ -187,7 +197,8 @@ Description: OpenLink Virtuoso Open-Source Edition - iSPARQL
hosting, hot backup, SQL-99 support and more. It has all major
data-access interfaces, such as ODBC, JDBC, ADO .Net and OLE/DB.
.
- This package contains the iSPARQL application VAD package.
+ This package contains the iSPARQL application VAD (Virtuoso
+ Application Distribution) package.
Package: virtuoso-vad-ods
Architecture: all
@@ -199,7 +210,8 @@ Description: OpenLink Virtuoso Open-Source Edition - Open Data Spaces
hosting, hot backup, SQL-99 support and more. It has all major
data-access interfaces, such as ODBC, JDBC, ADO .Net and OLE/DB.
.
- This package contains Open Data Spaces (ODS) VAD packages.
+ This package contains Open Data Spaces (ODS) VAD (Virtuoso
+ Application Distribution) packages.
Package: libvirtodbc0
Architecture: any
diff --git a/debian/copyright b/debian/copyright
index bbbf2f1..831a6a6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -8,12 +8,12 @@ It was downloaded from:
Upstream Authors:
- OpenLink Software's Virtuoso Open-Source (VOS) project
+ OpenLink Software's Virtuoso Open-Source Edition project
OpenLink Virtuoso Maintainer <vos.admin@openlinksw.com>
Copyright:
- <Copyright (C) 2008 OpenLink Software>
+ <Copyright (C) 2009 OpenLink Software>
License:
--------------1.6.5--
>From 4652ca5881c61209f1eaa9573e4a7543dc5ddd16 Mon Sep 17 00:00:00 2001
From: Olivier Berger <olivier.berger@it-sudparis.eu>
Date: Wed, 2 Dec 2009 19:43:27 +0100
Subject: [PATCH 4/5] Add Python
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="------------1.6.5"
This is a multi-part message in MIME format.
--------------1.6.5
Content-Type: text/plain; charset=UTF-8; format=fixed
Content-Transfer-Encoding: 8bit
Signed-off-by: Olivier Berger <olivier.berger@it-sudparis.eu>
---
debian/TODO.Debian | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
--------------1.6.5
Content-Type: text/x-patch; name="0004-Add-Python.patch"
Content-Transfer-Encoding: 8bit
Content-Disposition: attachment; filename="0004-Add-Python.patch"
diff --git a/debian/TODO.Debian b/debian/TODO.Debian
index 4cb6ce3..f41ceb5 100644
--- a/debian/TODO.Debian
+++ b/debian/TODO.Debian
@@ -35,6 +35,6 @@ Severity: Unknown
PREFIX parameter from the ./configure script.
Severity: Wishlist
- * Package runtime hosting for Mono (ASP.NET), Java and PHP.
+ * Package runtime hosting for Mono (ASP.NET), Java, PHP and Python.
Not sure how much work this will be, but currently Mono at least needs a
custom patched build.
--------------1.6.5--
>From 3e0ad3bc38ed7eed696e5d4a1f253dcc67d7dbae Mon Sep 17 00:00:00 2001
From: Olivier Berger <olivier.berger@it-sudparis.eu>
Date: Wed, 2 Dec 2009 23:00:26 +0100
Subject: [PATCH 5/5] Fix -vt renaming of isql and isqlw that would no longer work
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="------------1.6.5"
This is a multi-part message in MIME format.
--------------1.6.5
Content-Type: text/plain; charset=UTF-8; format=fixed
Content-Transfer-Encoding: 8bit
Signed-off-by: Olivier Berger <olivier.berger@it-sudparis.eu>
---
debian/rules | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
--------------1.6.5
Content-Type: text/x-patch; name="0005-Fix-vt-renaming-of-isql-and-isqlw-that-would-no-long.patch"
Content-Transfer-Encoding: 8bit
Content-Disposition: attachment; filename="0005-Fix-vt-renaming-of-isql-and-isqlw-that-would-no-long.patch"
diff --git a/debian/rules b/debian/rules
index fe6a14f..243cf25 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,7 +26,7 @@ DEB_AUTO_UPDATE_LIBTOOL = pre
DEB_AUTOMAKE_ARGS += -Wno-portability
DEB_CONFIGURE_EXTRA_FLAGS = --with-layout=debian \
- --program-transform-name='s/isql[-]*\(w\)*/isql\1-vt/' \
+ --program-transform-name='s/isql$$/isql-vt/;s/isqlw/isqlw-vt/' \
--with-readline --without-internal-zlib
DEB_CONFIGURE_SCRIPT_ENV += \
--------------1.6.5--
Reply to: