diff --git a/Installation/epm/arangodb.list b/Installation/epm/arangodb.list index e58777568a..27cc2832fa 100644 --- a/Installation/epm/arangodb.list +++ b/Installation/epm/arangodb.list @@ -33,7 +33,6 @@ l 000 ${rusr} ${rgrp} ${sbindir}/arangod ${sbindir}/arangod-${arangodb_version} f 0755 ${susr} ${sgrp} ${bindir}/arangoimp ${project_dir}/bin/arangoimp f 0755 ${susr} ${sgrp} ${bindir}/arangosh ${project_dir}/bin/arangosh -f 0755 ${susr} ${sgrp} ${bindir}/arango-password ${project_dir}/bin/arango-password # database directory d 0755 ${rusr} ${rgrp} ${data_dir} - @@ -171,8 +170,8 @@ exit 0 EOF %preremove < /dev/null 2>&1 || : /bin/systemctl stop arangodb.service > /dev/null 2>&1 || : @@ -181,14 +180,14 @@ exit 0 EOF %postremove </dev/null 2>&1 || : else # package uninstall for service in arangodb.service ; do - sysv_service=${service%.*} - rm -f "/var/lib/systemd/migrated/$sysv_service" 2> /dev/null || : + sysv_service=$${service%.*} + rm -f "/var/lib/systemd/migrated/$$sysv_service" 2> /dev/null || : done /bin/systemctl daemon-reload >/dev/null 2>&1 || : fi diff --git a/Installation/packetize.sh b/Installation/packetize.sh index 560848cd43..de9fa7e3c8 100755 --- a/Installation/packetize.sh +++ b/Installation/packetize.sh @@ -42,6 +42,45 @@ static_dir=${prefix}/share vers_dir=arangodb-${arangodb_version} docdir=${prefix}/share/doc/${vers_dir} mandir=${prefix}/share/man +systemddir=/lib/systemd/system + + +######################################################## +# set messages +######################################################## +install_message=" + +ArangoDB (http://www.arangodb.org) + A universal open-source database with a flexible data model for documents, + graphs, and key-values. + +First Steps with ArangoDB: + http:/www.arangodb.org/quickstart + +Upgrading ArangoDB: + http://www.arangodb.org/manuals/1.1/Upgrading.html + +Configuration file: + /etc/arangodb/arangod.conf + +Start ArangoDB shell client: + > ${bindir}/arangosh +" + +# message for systems with systemd +start_systemd_message=" +Start ArangoDB service: + > systemctl start arangodb.service + +Enable ArangoDB service: + > systemctl enable arangodb.service +" + +# message for script in /etc/init.d +start_initd_message=" +Start ArangoDB service: + > /etc/init.d/arangodb start +" echo echo "########################################################" @@ -56,6 +95,18 @@ case $TRI_OS_LONG in exit 0 ;; + Linux-openSUSE-12*) + echo "Using configuration for openSuSE 12" + package_type="rpm" + START_SCRIPT="rc.arangod.OpenSuSE" + runlevels="035" + docdir=${prefix}/share/doc/packages/${vers_dir} + + # exports for the epm configuration file + export use_systemd="true" + install_message="${install_message}${start_systemd_message}" + ;; + Linux-openSUSE*) echo "Using configuration for openSuSE" package_type="rpm" @@ -65,6 +116,7 @@ case $TRI_OS_LONG in # exports for the epm configuration file export insserv="true" + install_message="${install_message}${start_initd_message}" ;; Linux-Debian*) @@ -76,6 +128,7 @@ case $TRI_OS_LONG in if [ ${TRI_MACH} == "x86_64" ] ; then TRI_MACH="amd64" fi + install_message="${install_message}${start_initd_message}" ;; @@ -87,6 +140,7 @@ case $TRI_OS_LONG in # exports for the epm configuration file export chkconf="true" + install_message="${install_message}${start_initd_message}" ;; Linux-Ubuntu-*) @@ -98,6 +152,7 @@ case $TRI_OS_LONG in if [ ${TRI_MACH} == "x86_64" ] ; then TRI_MACH="amd64" fi + install_message="${install_message}${start_initd_message}" ;; @@ -110,6 +165,7 @@ case $TRI_OS_LONG in if [ ${TRI_MACH} == "x86_64" ] ; then TRI_MACH="amd64" fi + install_message="${install_message}${start_initd_message}" ;; @@ -195,26 +251,6 @@ echo ## build install/help message ## -install_message=" - -ArangoDB (http://www.arangodb.org) - A universal open-source database with a flexible data model for documents, - graphs, and key-values. - -First Steps with ArangoDB: - http:/www.arangodb.org/quickstart - -Upgrading ArangoDB: - http://www.arangodb.org/manuals/1.1/Upgrading.html - -Configuration file: - /etc/arangodb/arangod.conf - -Start ArangoDB shell client: - > ${bindir}/arangosh - -" - cd ${hudson_base} sudo -E rm -rf ${hudson_base}/${archfolder} sudo -E mkdir -p ${hudson_base}/${archfolder} @@ -245,6 +281,7 @@ echo " export mandir=$mandir" echo " export susr=$susr" echo " export vers_dir=$vers_dir" echo " export START_SCRIPT=$START_SCRIPT" +echo " export systemddir=$systemddir" echo "########################################################" echo @@ -268,6 +305,7 @@ export vers_dir export START_SCRIPT export install_message export mandir +export systemddir echo echo "########################################################" @@ -308,6 +346,15 @@ unmount_install_package= case $TRI_OS_LONG in + Linux-openSUSE-12*) + start_server="sudo systemctl start arangodb.service" + stop_server="sudo systemctl stop arangodb.service" + + install_package="sudo rpm -i ${sfolder_name}/${package_name}" + remove_package="sudo rpm -e $product_name" + + ;; + Linux-openSUSE*) start_server="sudo /etc/init.d/arangodb start" stop_server="sudo /etc/init.d/arangodb stop" diff --git a/etc/systemd/arangodb.service b/etc/systemd/arangodb.service index 32e324c853..d4201e0d80 100644 --- a/etc/systemd/arangodb.service +++ b/etc/systemd/arangodb.service @@ -19,7 +19,6 @@ After=syslog.target network.target [Service] Type=forking PIDFile=/var/run/arangodb/arangod.pid -ExecStartPre=-/bin/echo 'Starting arangod:' ExecStartPre=/usr/bin/install -g arangodb -o arangodb -d /var/run/arangodb ExecStart=/usr/sbin/arangod -c /etc/arangodb/arangod.conf --pid-file /var/run/arangodb/arangod.pid --supervisor --uid arangodb