1
0
Fork 0

partial fix for issue #134 "improvements for centos RPM"

This commit is contained in:
Frank Celler 2012-08-03 13:11:24 +02:00
parent 640e2a3587
commit 4c404dc095
2 changed files with 80 additions and 63 deletions

View File

@ -58,6 +58,10 @@ d 0755 ${susr} ${sgrp} /var/log/arangodb -
sed -e 's%@LOGDIR@%/var/log/arangodb%g' -e 's%@DATABASE@%${data_dir}/arangodb%g' -e 's%@STATICFILES@%${static_dir}/arangodb%g' /etc/arangodb/${vers_dir}/arangod.conf.template > /etc/arangodb/arangod.conf
EOF
## -----------------------------------------------------------------------------
## MAC OS X
## -----------------------------------------------------------------------------
%ifdef macosx
d 0755 ${rusr} ${rgrp} /Library/LaunchDaemons/ -
f 0755 ${rusr} ${rgrp} /Library/LaunchDaemons/org.arangodb.plist.template ${project_dir}/Installation/org.arangodb.plist
@ -73,6 +77,10 @@ launchctl stop de.triagens.arango
launchctl unload /Library/LaunchDaemons/org.arangodb.plist
EOF
## -----------------------------------------------------------------------------
## LINUX
## -----------------------------------------------------------------------------
%else
%preinstall <<EOF
getent group arango >/dev/null || groupadd -r arango
@ -80,19 +88,32 @@ getent passwd arango >/dev/null || useradd -r -g arango -d ${static_dir} -s /bin
EOF
%endif
%ifdef insserv
## -----------------------------------------------------------------------------
## CHKCONF
## -----------------------------------------------------------------------------
%ifdef chkconf
f 0755 ${rusr} ${rgrp} ${initdir}/arangod ${project_dir}/Installation/${START_SCRIPT}
%postinstall <<EOF
test -x /sbin/insserv && /sbin/insserv /etc/init.d/arango 2&>1 > /dev/null
exit 0
chkconfig --level ${runlevels} arangod on
EOF
%preremove <<EOF
/etc/init.d/arango stop 2&>1 > /dev/null
test -x /sbin/insserv && /sbin/insserv -r /etc/init.d/arango 2&>1 > /dev/null
exit 0
chkconfig --level ${runlevels} arangod off
rcarangod stop || true
EOF
%endif
%else
%system linux
i 0755 ${rusr} ${rgrp} arango ${project_dir}/Installation/${START_SCRIPT} ${runlevels}
l 000 ${rusr} ${rgrp} ${sbindir}/rcarango /etc/init.d/arango
i 0755 ${rusr} ${rgrp} arangod ${project_dir}/Installation/${START_SCRIPT} runlevel(${runlevels})
%endif
## -----------------------------------------------------------------------------
## RC skript
## -----------------------------------------------------------------------------
%system linux
l 000 ${rusr} ${rgrp} ${sbindir}/rcarangod /etc/init.d/arangod

View File

@ -15,7 +15,7 @@ sgrp=arango
package_type=""
product_name="arangodb"
project_name="arangodb"
runlevels="runlevel(035)"
runlevels="035"
curl_version="curl -s -o - http://localhost:8529/_api/version"
# name of the epm configuration file
@ -35,20 +35,19 @@ osvers=`uname -r | awk -F"." '{print $1 "." $2}'`
prefix=/usr
exec_prefix=${prefix}
sbindir=${exec_prefix}/sbin
initdir=/etc/init.d
bindir=${exec_prefix}/bin
data_dir=/var
static_dir=${prefix}/share
vers_dir=arango-${arangodb_version}
docdir=${prefix}/share/doc/voc/${vers_dir}
echo
echo "########################################################"
echo "Packetize on $TRI_OS_LONG"
echo "########################################################"
echo
case $TRI_OS_LONG in
Linux-ArchLinux-*)
@ -60,63 +59,54 @@ case $TRI_OS_LONG in
echo "Using configuration for openSuSE"
package_type="rpm"
START_SCRIPT="rc.arangodb.OpenSuSE"
runlevels="runlevel(035)"
runlevels="035"
docdir=${prefix}/share/doc/packages/voc/${vers_dir}
# export "insserv" for the epm configuration file
export insserv="true"
;;
Linux-Debian*)
echo "Using configuration for Debian"
package_type="deb"
START_SCRIPT="rc.arangodb.Debian"
runlevels="runlevel(035)"
runlevels="035"
if [ ${TRI_MACH} == "x86_64" ] ; then
TRI_MACH="amd64"
fi
# export "insserv" for the epm configuration file
export insserv="true"
;;
Linux-CentOS-*)
echo "Using configuration for Centos"
package_type="rpm"
START_SCRIPT="rc.arangodb.Centos"
runlevels="runlevel(0235)"
runlevels="0235"
# export "insserv" for the epm configuration file
export insserv="true"
# exports for the epm configuration file
export chkconf="true"
;;
Linux-Ubuntu-*)
echo "Using configuration for Ubuntu"
package_type="deb"
START_SCRIPT="rc.arangodb.Ubuntu"
runlevels="runlevel(02345)"
runlevels="02345"
if [ ${TRI_MACH} == "x86_64" ] ; then
TRI_MACH="amd64"
fi
# export "insserv" for the epm configuration file
export insserv="true"
;;
Linux-LinuxMint-*)
echo "Using configuration for LinuxMint"
package_type="deb"
START_SCRIPT="rc.arangodb.Ubuntu"
runlevels="runlevel(02345)"
runlevels="02345"
if [ ${TRI_MACH} == "x86_64" ] ; then
TRI_MACH="amd64"
fi
# export "insserv" for the epm configuration file
export insserv="true"
;;
Darwin*)
@ -203,44 +193,45 @@ sudo -E mkdir -p ${hudson_base}/${archfolder}/buildroot
echo
echo "########################################################"
echo "Export vars for epm"
echo " export arangodb_version=$arangodb_version"
echo " export arangodb_release=$arangodb_release"
echo " export rusr=$rusr"
echo " export rgrp=$rgrp"
echo " export susr=$susr"
echo " export sgrp=$sgrp"
echo " export prefix=$prefix"
echo " export exec_prefix=$exec_prefix"
echo " export sbindir=$sbindir"
echo " export arangodb_version=$arangodb_version"
echo " export bindir=$bindir"
echo " export data_dir=$data_dir"
echo " export docdir=$docdir"
echo " export exec_prefix=$exec_prefix"
echo " export initdir=$initdir"
echo " export prefix=$prefix"
echo " export project_dir=${sfolder_name}"
echo " export rgrp=$rgrp"
echo " export runlevels=$runlevels"
echo " export rusr=$rusr"
echo " export sbindir=$sbindir"
echo " export sgrp=$sgrp"
echo " export static_dir=$static_dir"
echo " export susr=$susr"
echo " export vers_dir=$vers_dir"
echo " export START_SCRIPT=$START_SCRIPT"
echo " export runlevels=$runlevels"
echo " export docdir=$docdir"
echo " export project_dir=${sfolder_name}"
echo "########################################################"
echo
export arangodb_version
export arangodb_release
export rusr
export rgrp
export susr
export sgrp
export prefix
export exec_prefix
export sbindir
export arangodb_version
export bindir
export data_dir
export docdir
export exec_prefix
export initdir
export prefix
export project_dir=${sfolder_name}
export rgrp
export runlevels
export rusr
export sbindir
export sgrp
export static_dir
export susr
export vers_dir
export START_SCRIPT
export runlevels
export docdir
export project_dir=${sfolder_name}
echo
echo "########################################################"
@ -272,7 +263,6 @@ cp -p ${hudson_base}/${archfolder}/${product_name}*.${package_type} ${sfolder_na
echo "########################################################"
echo
start_server=
stop_server=
install_package=
@ -283,8 +273,8 @@ unmount_install_package=
case $TRI_OS_LONG in
Linux-openSUSE*)
start_server=""
stop_server=""
start_server="sudo /etc/init.d/arangod start"
stop_server="sudo /etc/init.d/arangod stop"
install_package="sudo rpm -i ${sfolder_name}/${package_name}"
remove_package="sudo rpm -e $product_name"
@ -292,32 +282,32 @@ case $TRI_OS_LONG in
;;
Linux-Debian*)
start_server=""
stop_server=""
start_server="sudo /etc/init.d/arangod start"
stop_server="sudo /etc/init.d/arangod stop"
install_package="sudo dpkg -i ${sfolder_name}/${package_name}"
remove_package="sudo dpkg --purge $product_name"
;;
Linux-CentOS-*)
start_server=""
stop_server=""
start_server="sudo /etc/init.d/arangod start"
stop_server="sudo /etc/init.d/arangod stop"
install_package="sudo rpm -i ${sfolder_name}/${package_name}"
remove_package="sudo rpm -e $product_name"
;;
Linux-Ubuntu-*)
start_server="sudo /etc/init.d/arango start"
stop_server="sudo /etc/init.d/arango stop"
start_server="sudo /etc/init.d/arangod start"
stop_server="sudo /etc/init.d/arangod stop"
install_package="sudo dpkg -i ${sfolder_name}/${package_name}"
remove_package="sudo dpkg --purge $product_name"
;;
Linux-LinuxMint-*)
start_server=""
stop_server="sudo /etc/init.d/arango stop"
start_server="sudo /etc/init.d/arangod start"
stop_server="sudo /etc/init.d/arangod stop"
install_package="sudo dpkg -i ${sfolder_name}/${package_name}"
remove_package="sudo dpkg --purge $product_name"
@ -339,7 +329,6 @@ case $TRI_OS_LONG in
esac
echo
echo "########################################################"
echo " INSTALL TEST "
@ -384,6 +373,13 @@ fi
echo "Successfully installed ${package_name}."
echo "########################################################"
if [ "${start_server}x" != "x" ]; then
echo "Start"
echo " ${start_server}"
${start_server}
echo "########################################################"
fi
echo "Check process"
process=$(ps aux | grep arangod | grep -v grep)
echo "$process"