Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel

This commit is contained in:
Jan Steemann 2012-09-25 12:55:26 +02:00
parent d92f359bda c7c89b2661
commit 19f5b8fb9e
6 changed files with 46 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Installation/Linux/rc.arangod.Centos
View File

@ -25,7 +25,7 @@ RETVAL=0
start() { start() {
echo -n $"Starting $ARANGO_BIN: " echo -n $"Starting $ARANGO_BIN: "
$ARANGO_BIN -c $ARANGO_SYSCONFIG --pid-file "$pidfile" --supervisor --uid arango $ARANGO_BIN -c $ARANGO_SYSCONFIG --pid-file "$pidfile" --supervisor --uid arangodb
RETVAL=$? RETVAL=$?
echo echo

2
Installation/Linux/rc.arangod.Debian
View File

@ -33,7 +33,7 @@ case "$1" in
exit 0 exit 0
fi fi
$DAEMON -c $CONF --pid-file "$PIDFILE" --supervisor --uid arango $DAEMON -c $CONF --pid-file "$PIDFILE" --supervisor --uid arangodb
log_end_msg $? log_end_msg $?
;; ;;

16
Installation/Linux/rc.arangod.OpenSuSE
View File

@ -3,14 +3,14 @@
# #
# Author: Achim Brandt <a.brandt@triagens.de> # Author: Achim Brandt <a.brandt@triagens.de>
# #
# /etc/init.d/arangod # /etc/init.d/arangodb
# #
# and symbolic its link # and symbolic its link
# #
# /usr/sbin/rcarangod # /usr/sbin/rcarangodb
# #
### BEGIN INIT INFO ### BEGIN INIT INFO
# Provides: arangod # Provides: arangodb
# Required-Start: $network $remote_fs # Required-Start: $network $remote_fs
# Required-Stop: $network $remote_fs # Required-Stop: $network $remote_fs
# Default-Start: 3 5 # Default-Start: 3 5
@ -51,12 +51,12 @@ case "$1" in
################################################################################ ################################################################################
start) start)
echo -n "Starting ARANGO daemon" echo -n "Starting ARANGODB daemon"
ARANGO_PIDDIR=`dirname $ARANGO_PIDFILE` ARANGO_PIDDIR=`dirname $ARANGO_PIDFILE`
test -d $ARANGO_PIDDIR || (mkdir $ARANGO_PIDDIR && chown arango $ARANGO_PIDDIR) test -d $ARANGO_PIDDIR || (mkdir $ARANGO_PIDDIR && chown arango $ARANGO_PIDDIR)
$ARANGO_BIN -c $ARANGO_SYSCONFIG --pid-file "$ARANGO_PIDFILE" --supervisor --uid arango $ARANGO_BIN -c $ARANGO_SYSCONFIG --pid-file "$ARANGO_PIDFILE" --supervisor --uid arangodb
# Remember status and be verbose # Remember status and be verbose
rc_status -v rc_status -v
@ -68,7 +68,7 @@ case "$1" in
################################################################################ ################################################################################
stop) stop)
echo -n "Shutting down ARANGO daemon" echo -n "Shutting down ARANGODB daemon"
killproc -t $ARANGO_TIMEOUT -p $ARANGO_PIDFILE -TERM $ARANGO_BIN killproc -t $ARANGO_TIMEOUT -p $ARANGO_PIDFILE -TERM $ARANGO_BIN
@ -108,7 +108,7 @@ case "$1" in
################################################################################ ################################################################################
force-reload|reload) force-reload|reload)
echo -n "Reload service ARANGO" echo -n "Reload service ARANGODB"
echo "reload is currently not supported" echo "reload is currently not supported"
@ -128,7 +128,7 @@ case "$1" in
################################################################################ ################################################################################
status) status)
echo -n "Checking for service ARANGO " echo -n "Checking for service ARANGODB"
checkproc -p $ARANGO_PIDFILE $ARANGO_BIN checkproc -p $ARANGO_PIDFILE $ARANGO_BIN

10
Installation/Linux/rc.arangod.Ubuntu
View File

@ -1,13 +1,13 @@
#! /bin/sh #! /bin/sh
### BEGIN INIT INFO ### BEGIN INIT INFO
# Provides: arango # Provides: arangodb
# Required-Start: # Required-Start:
# Required-Stop: # Required-Stop:
# Default-Start: 2 3 4 5 # Default-Start: 2 3 4 5
# Default-Stop: # Default-Stop:
# Short-Description: arango # Short-Description: arangodb
# Description: arango database server # Description: arangodb database server
### END INIT INFO ### END INIT INFO
. /lib/lsb/init-functions . /lib/lsb/init-functions
@ -16,7 +16,7 @@
PATH=/bin:/usr/bin:/sbin:/usr/sbin PATH=/bin:/usr/bin:/sbin:/usr/sbin
DAEMON=/usr/sbin/arangod DAEMON=/usr/sbin/arangod
DESC="ArangoDB" DESC="ArangoDB"
NAME="arangod" NAME="arangodb"
PIDDIR=/var/run/arangodb PIDDIR=/var/run/arangodb
PIDFILE=${PIDDIR}/arangod.pid PIDFILE=${PIDDIR}/arangod.pid
CONF=/etc/arangodb/arangod.conf CONF=/etc/arangodb/arangod.conf
@ -30,7 +30,7 @@ case "$1" in
test -d $PIDDIR || mkdir $PIDDIR test -d $PIDDIR || mkdir $PIDDIR
chown arango $PIDDIR chown arango $PIDDIR
$DAEMON -c $CONF --pid-file "$PIDFILE" --supervisor --uid arango $DAEMON -c $CONF --pid-file "$PIDFILE" --supervisor --uid arangodb
log_end_msg $? log_end_msg $?
;; ;;

26
Installation/epm/arangodb.list
View File

@ -49,7 +49,7 @@ d 0755 ${susr} ${sgrp} /var/run/arangodb -
# logfile directory # logfile directory
d 0755 ${susr} ${sgrp} /var/log/arangodb - d 0755 ${susr} ${sgrp} /var/log/arangodb -
%include ${project_dir}/Installation/arangodb.sublist %include ${project_dir}/Installation/epm/arangodb.sublist
################################################################################ ################################################################################
## Pre/Post Install ## Pre/Post Install
@ -80,8 +80,8 @@ EOF
%else %else
%preinstall <<EOF %preinstall <<EOF
getent group arango >/dev/null || groupadd -r arango getent group arangodb >/dev/null || groupadd -r arangodb
getent passwd arango >/dev/null || useradd -r -g arango -d ${static_dir}/arangodb -s /bin/false -c "ArangoDB Application User" arango getent passwd arangodb >/dev/null || useradd -r -g arangodb -d ${static_dir}/arangodb -s /bin/false -c "ArangoDB Application User" arangodb
EOF EOF
%endif %endif
@ -90,16 +90,16 @@ EOF
## ----------------------------------------------------------------------------- ## -----------------------------------------------------------------------------
%ifdef chkconf %ifdef chkconf
f 0755 ${rusr} ${rgrp} ${initdir}/arangod ${project_dir}/Installation/${START_SCRIPT} f 0755 ${rusr} ${rgrp} ${initdir}/arangodb ${project_dir}/Installation/Linux/${START_SCRIPT}
%postinstall <<EOF %postinstall <<EOF
chkconfig --level ${runlevels} arangod on chkconfig --level ${runlevels} arangodb on
exit 0 exit 0
EOF EOF
%preremove <<EOF %preremove <<EOF
${initdir}/arangod stop 2&>1 > /dev/null || true ${initdir}/arangodb stop 2&>1 > /dev/null || true
chkconfig --del arangod chkconfig --del arangodb
exit 0 exit 0
EOF EOF
@ -108,16 +108,16 @@ EOF
## ----------------------------------------------------------------------------- ## -----------------------------------------------------------------------------
%elseifdef insserv %elseifdef insserv
f 0755 ${rusr} ${rgrp} ${initdir}/arangod ${project_dir}/Installation/${START_SCRIPT} f 0755 ${rusr} ${rgrp} ${initdir}/arangodb ${project_dir}/Installation/Linux/${START_SCRIPT}
%postinstall <<EOF %postinstall <<EOF
test -x /sbin/insserv && /sbin/insserv /etc/init.d/arangod 2&>1 > /dev/null test -x /sbin/insserv && /sbin/insserv /etc/init.d/arangodb 2&>1 > /dev/null
exit 0 exit 0
EOF EOF
%preremove <<EOF %preremove <<EOF
${initdir}/arangod stop 2&>1 > /dev/null || true ${initdir}/arangodb stop 2&>1 > /dev/null || true
test -x /sbin/insserv && /sbin/insserv -r /etc/init.d/arangod 2&>1 > /dev/null test -x /sbin/insserv && /sbin/insserv -r /etc/init.d/arangodb 2&>1 > /dev/null
exit 0 exit 0
EOF EOF
@ -128,7 +128,7 @@ EOF
%else %else
%system linux %system linux
i 0755 ${rusr} ${rgrp} arangod ${project_dir}/Installation/${START_SCRIPT} runlevel(${runlevels}) i 0755 ${rusr} ${rgrp} arangodb ${project_dir}/Installation/Linux/${START_SCRIPT} runlevel(${runlevels})
%endif %endif
@ -137,4 +137,4 @@ i 0755 ${rusr} ${rgrp} arangod ${project_dir}/Installation/${START_SCRIPT} runle
## ----------------------------------------------------------------------------- ## -----------------------------------------------------------------------------
%system linux %system linux
l 000 ${rusr} ${rgrp} ${sbindir}/rcarangod /etc/init.d/arangod l 000 ${rusr} ${rgrp} ${sbindir}/rcarangodb /etc/init.d/arangodb

36
Installation/packetize.sh
View File

@ -10,8 +10,8 @@ echo
hudson_base="$HOME" hudson_base="$HOME"
rusr=root rusr=root
rgrp=root rgrp=root
susr=arango susr=arangodb
sgrp=arango sgrp=arangodb
package_type="" package_type=""
product_name="arangodb" product_name="arangodb"
project_name="arangodb" project_name="arangodb"
@ -58,7 +58,7 @@ case $TRI_OS_LONG in
Linux-openSUSE*) Linux-openSUSE*)
echo "Using configuration for openSuSE" echo "Using configuration for openSuSE"
package_type="rpm" package_type="rpm"
START_SCRIPT="rc.arangodb.OpenSuSE" START_SCRIPT="rc.arangod.OpenSuSE"
runlevels="035" runlevels="035"
docdir=${prefix}/share/doc/packages/${vers_dir} docdir=${prefix}/share/doc/packages/${vers_dir}
@ -69,7 +69,7 @@ case $TRI_OS_LONG in
Linux-Debian*) Linux-Debian*)
echo "Using configuration for Debian" echo "Using configuration for Debian"
package_type="deb" package_type="deb"
START_SCRIPT="rc.arangodb.Debian" START_SCRIPT="rc.arangod.Debian"
runlevels="035" runlevels="035"
if [ ${TRI_MACH} == "x86_64" ] ; then if [ ${TRI_MACH} == "x86_64" ] ; then
@ -81,7 +81,7 @@ case $TRI_OS_LONG in
Linux-CentOS-*) Linux-CentOS-*)
echo "Using configuration for Centos" echo "Using configuration for Centos"
package_type="rpm" package_type="rpm"
START_SCRIPT="rc.arangodb.Centos" START_SCRIPT="rc.arangod.Centos"
runlevels="0235" runlevels="0235"
# exports for the epm configuration file # exports for the epm configuration file
@ -91,7 +91,7 @@ case $TRI_OS_LONG in
Linux-Ubuntu-*) Linux-Ubuntu-*)
echo "Using configuration for Ubuntu" echo "Using configuration for Ubuntu"
package_type="deb" package_type="deb"
START_SCRIPT="rc.arangodb.Ubuntu" START_SCRIPT="rc.arangod.Ubuntu"
runlevels="02345" runlevels="02345"
if [ ${TRI_MACH} == "x86_64" ] ; then if [ ${TRI_MACH} == "x86_64" ] ; then
@ -103,7 +103,7 @@ case $TRI_OS_LONG in
Linux-LinuxMint-*) Linux-LinuxMint-*)
echo "Using configuration for LinuxMint" echo "Using configuration for LinuxMint"
package_type="deb" package_type="deb"
START_SCRIPT="rc.arangodb.Ubuntu" START_SCRIPT="rc.arangod.Ubuntu"
runlevels="02345" runlevels="02345"
if [ ${TRI_MACH} == "x86_64" ] ; then if [ ${TRI_MACH} == "x86_64" ] ; then
@ -168,7 +168,7 @@ echo
echo "########################################################" echo "########################################################"
echo "Call mkepmlist to create a sublist" echo "Call mkepmlist to create a sublist"
for dir in js/actions/system js/server js/server/modules js/client js/client/modules js/common/modules js/common/bootstrap; do for dir in js/actions/system js/server js/server/modules js/server/modules/org/arangodb js/client js/client/modules js/common/modules js/common/bootstrap; do
echo " mkepmlist -u ${susr} -g ${sgrp} --prefix ${share_base}/${dir} ${sfolder_name}/${dir}/*.js >> ${SUBLIST}" echo " mkepmlist -u ${susr} -g ${sgrp} --prefix ${share_base}/${dir} ${sfolder_name}/${dir}/*.js >> ${SUBLIST}"
mkepmlist -u ${susr} -g ${sgrp} --prefix ${share_base}/${dir} ${sfolder_name}/${dir}/*.js >> ${SUBLIST} mkepmlist -u ${susr} -g ${sgrp} --prefix ${share_base}/${dir} ${sfolder_name}/${dir}/*.js >> ${SUBLIST}
done done
@ -278,8 +278,8 @@ unmount_install_package=
case $TRI_OS_LONG in case $TRI_OS_LONG in
Linux-openSUSE*) Linux-openSUSE*)
start_server="sudo /etc/init.d/arangod start" start_server="sudo /etc/init.d/arangodb start"
stop_server="sudo /etc/init.d/arangod stop" stop_server="sudo /etc/init.d/arangodb stop"
install_package="sudo rpm -i ${sfolder_name}/${package_name}" install_package="sudo rpm -i ${sfolder_name}/${package_name}"
remove_package="sudo rpm -e $product_name" remove_package="sudo rpm -e $product_name"
@ -287,32 +287,32 @@ case $TRI_OS_LONG in
;; ;;
Linux-Debian*) Linux-Debian*)
start_server="sudo /etc/init.d/arangod start" start_server="sudo /etc/init.d/arangodb start"
stop_server="sudo /etc/init.d/arangod stop" stop_server="sudo /etc/init.d/arangodb stop"
install_package="sudo dpkg -i ${sfolder_name}/${package_name}" install_package="sudo dpkg -i ${sfolder_name}/${package_name}"
remove_package="sudo dpkg --purge $product_name" remove_package="sudo dpkg --purge $product_name"
;; ;;
Linux-CentOS-*) Linux-CentOS-*)
start_server="sudo /etc/init.d/arangod start" start_server="sudo /etc/init.d/arangodb start"
stop_server="sudo /etc/init.d/arangod stop" stop_server="sudo /etc/init.d/arangodb stop"
install_package="sudo rpm -i ${sfolder_name}/${package_name}" install_package="sudo rpm -i ${sfolder_name}/${package_name}"
remove_package="sudo rpm -e $product_name" remove_package="sudo rpm -e $product_name"
;; ;;
Linux-Ubuntu-*) Linux-Ubuntu-*)
start_server="sudo /etc/init.d/arangod start" start_server="sudo /etc/init.d/arangodb start"
stop_server="sudo /etc/init.d/arangod stop" stop_server="sudo /etc/init.d/arangodb stop"
install_package="sudo dpkg -i ${sfolder_name}/${package_name}" install_package="sudo dpkg -i ${sfolder_name}/${package_name}"
remove_package="sudo dpkg --purge $product_name" remove_package="sudo dpkg --purge $product_name"
;; ;;
Linux-LinuxMint-*) Linux-LinuxMint-*)
start_server="sudo /etc/init.d/arangod start" start_server="sudo /etc/init.d/arangodb start"
stop_server="sudo /etc/init.d/arangod stop" stop_server="sudo /etc/init.d/arangodb stop"
install_package="sudo dpkg -i ${sfolder_name}/${package_name}" install_package="sudo dpkg -i ${sfolder_name}/${package_name}"
remove_package="sudo dpkg --purge $product_name" remove_package="sudo dpkg --purge $product_name"