mirror of https://gitee.com/bigwinds/arangodb
Merge branch 'devel' of github.com:triAGENS/ArangoDB
This commit is contained in:
Frank Celler
commit
ce7eb8b40e
|
|
@ -62,7 +62,7 @@ EOF
|
|||
d 0755 ${rusr} ${rgrp} /Library/LaunchDaemons/ -
|
||||
f 0755 ${rusr} ${rgrp} /Library/LaunchDaemons/org.arangodb.plist.template ${project_dir}/Installation/org.arangodb.plist
|
||||
%postinstall <<EOF
|
||||
sed -e 's%@BINARY@%${sbindir}/arangod-${version}%g' -e 's%@CONFIGDIR@%/etc%g' /Library/LaunchDaemons/org.arangodb.plist.template > /Library/LaunchDaemons/org.arangodb.plist
|
||||
sed -e 's%@BINARY@%${sbindir}/arangod-${version}%g' -e 's%@CONFIGDIR@%/etc/arangodb%g' /Library/LaunchDaemons/org.arangodb.plist.template > /Library/LaunchDaemons/org.arangodb.plist
|
||||
launchctl unload /Library/LaunchDaemons/org.arangodb.plist
|
||||
launchctl load /Library/LaunchDaemons/org.arangodb.plist
|
||||
# we do not need this: launchctl start de.triagens.arango
|
||||
|
|
|
|||
|
|
@ -12,15 +12,9 @@
|
|||
<array>
|
||||
<string>@BINARY@</string>
|
||||
<string>-c</string>
|
||||
<string>@CONFIGDIR@/arangdb/arangod.conf</string>
|
||||
<string>@CONFIGDIR@/arangod.conf</string>
|
||||
</array>
|
||||
|
||||
<key>UserName</key>
|
||||
<string>arango</string>
|
||||
|
||||
<key>GroupName</key>
|
||||
<string>arango</string>
|
||||
|
||||
<key>RunAtLoad</key>
|
||||
<true/>
|
||||
</dict>
|
||||
|
|
|
|||
|
|
@ -47,6 +47,7 @@
|
|||
/// <ul>
|
||||
/// <li>@ref CommandLineArangoHttpPort "server.http-port"</li>
|
||||
/// <li>@ref CommandLineArangoAdminPort "server.admin-port"</li>
|
||||
/// <li>@ref CommandLineArangoDisableAdminInterface "server.disable-admin-interface"</li>
|
||||
/// <li>@ref CommandLineArangoDirectory "database.directory"</li>
|
||||
/// <li>@ref CommandLineArangoMaximalJournalSize "database.maximal-journal-size"</li>
|
||||
/// <li>@ref CommandLineArangoWaitForSync "database.wait-for-sync"</li>
|
||||
|
|
@ -163,6 +164,12 @@
|
|||
/// @anchor CommandLineArangoAdminPort
|
||||
/// @copydetails triagens::arango::ArangoServer::_adminPort
|
||||
///
|
||||
/// @anchor CommandLineArangoDisableAdminInterface
|
||||
/// @CMDOPT{--disable-admin-interface}
|
||||
///
|
||||
/// If this option is specified, then the HTML admininstration interface at
|
||||
/// URL http://server:port/ will be disabled and cannot used by any user at all.
|
||||
///
|
||||
/// @anchor CommandLineArangoDirectory
|
||||
/// @copydetails triagens::arango::ArangoServer::_databasePath
|
||||
///
|
||||
|
|
|
|||
|
|
@ -197,7 +197,7 @@ void ApplicationUserManager::setAnonymousRights (vector<right_t> const& rights)
|
|||
// -----------------------------------------------------------------------------
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
/// @addtogroup ApplicationServer
|
||||
/// @addtogroup RestServer
|
||||
/// @{
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
|
|
|
|||
143
packetize.sh
143
packetize.sh
|
|
@ -16,7 +16,7 @@ package_type=""
|
|||
product_name="arangodb"
|
||||
project_name="arangodb"
|
||||
runlevels="runlevel(035)"
|
||||
|
||||
curl_version="curl -s -o - http://localhost:8529/_api/version"
|
||||
|
||||
# name of the epm configuration file
|
||||
LIST="Installation/${project_name}.list"
|
||||
|
|
@ -161,7 +161,6 @@ echo "Call mkepmlist to create a sublist"
|
|||
mkepmlist -u ${susr} -g ${sgrp} --prefix ${share_base}/${dir} ${sfolder_name}/${dir}/*.js >> ${SUBLIST}
|
||||
done
|
||||
|
||||
echo "Call mkepmlist to create a sublist"
|
||||
for dir in . css css/images media media/icons media/images js js/modules; do
|
||||
for typ in css html js png gif ico; do
|
||||
FILES=${sfolder_name}/html/admin/${dir}/*.${typ}
|
||||
|
|
@ -253,3 +252,143 @@ echo " cp -p ${hudson_base}/${archfolder}/${product_name}*.${package_type} ${
|
|||
cp -p ${hudson_base}/${archfolder}/${product_name}*.${package_type} ${hudson_base}/${package_name}
|
||||
echo "########################################################"
|
||||
echo
|
||||
|
||||
|
||||
start_server=
|
||||
stop_server=
|
||||
install_package=
|
||||
remove_package=
|
||||
mount_install_package=
|
||||
unmount_install_package=
|
||||
|
||||
case $TRI_OS_LONG in
|
||||
|
||||
Linux-openSUSE*)
|
||||
start_server=""
|
||||
stop_server=""
|
||||
|
||||
install_package="sudo rpm -i ${hudson_base}/${package_name}"
|
||||
remove_package="sudo rpm -e $product_name"
|
||||
|
||||
;;
|
||||
|
||||
Linux-Debian*)
|
||||
start_server=""
|
||||
stop_server=""
|
||||
|
||||
install_package="sudo dpkg -i ${hudson_base}/${package_name}"
|
||||
remove_package="sudo dpkg --purge $product_name"
|
||||
;;
|
||||
|
||||
Linux-CentOS-*)
|
||||
start_server=""
|
||||
stop_server=""
|
||||
|
||||
install_package="sudo rpm -i ${hudson_base}/${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"
|
||||
|
||||
install_package="sudo dpkg -i ${hudson_base}/${package_name}"
|
||||
remove_package="sudo dpkg --purge $product_name"
|
||||
;;
|
||||
|
||||
Darwin*)
|
||||
start_server=""
|
||||
stop_server="sudo launchctl unload /Library/LaunchDaemons/org.arangodb.plist"
|
||||
|
||||
install_package="sudo installer -pkg /Volumes/${product_name}/${product_name}.pkg -target / "
|
||||
remove_package=""
|
||||
|
||||
mount_install_package="hdiutil attach ${hudson_base}/${package_name}"
|
||||
unmount_install_package="hdiutil detach /Volumes/${product_name}"
|
||||
;;
|
||||
|
||||
*)
|
||||
;;
|
||||
|
||||
esac
|
||||
|
||||
|
||||
echo
|
||||
echo "########################################################"
|
||||
echo " INSTALL TEST "
|
||||
echo "########################################################"
|
||||
echo
|
||||
|
||||
# stop and uninstall server
|
||||
if [ "${stop_server}x" != "x" ]; then
|
||||
$stop_server > /dev/null 2>&1
|
||||
fi
|
||||
|
||||
if [ "${remove_package}x" != "x" ]; then
|
||||
$remove_package > /dev/null 2>&1
|
||||
fi
|
||||
|
||||
if [ "${unmount_install_package}x" != "x" ]; then
|
||||
$unmount_install_package > /dev/null 2>&1
|
||||
fi
|
||||
|
||||
if [ "${mount_install_package}x" != "x" ]; then
|
||||
$mount_install_package > /dev/null 2>&1
|
||||
fi
|
||||
|
||||
echo
|
||||
echo "########################################################"
|
||||
echo "Install"
|
||||
echo " ${install_package}"
|
||||
${install_package} || exit 1
|
||||
echo "########################################################"
|
||||
|
||||
if [ "${start_server}x" != "x" ]; then
|
||||
echo "Start"
|
||||
echo " ${start_server}"
|
||||
${start_server} || exit 1
|
||||
echo "########################################################"
|
||||
fi
|
||||
|
||||
echo "Successfully installed ${package_name}."
|
||||
echo "########################################################"
|
||||
echo "Wait for server..."
|
||||
echo " sleep 5"
|
||||
sleep 5
|
||||
|
||||
echo
|
||||
echo "########################################################"
|
||||
echo "Request version number "
|
||||
echo " $curl_version"
|
||||
answer=$( $curl_version )
|
||||
expect='{"server":"arango","version":"'$arangodb_version.$arangodb_release'"}'
|
||||
if [ "x$answer" == "x$expect" ]; then
|
||||
echo "ok: $answer"
|
||||
else
|
||||
echo "error: $answer != $expect"
|
||||
exit 1
|
||||
fi
|
||||
echo "########################################################"
|
||||
echo
|
||||
|
||||
echo
|
||||
echo "########################################################"
|
||||
if [ "${stop_server}x" != "x" ]; then
|
||||
echo "Stop"
|
||||
echo " $stop_server"
|
||||
$stop_server || exit 1
|
||||
echo "########################################################"
|
||||
fi
|
||||
if [ "${remove_package}x" != "x" ]; then
|
||||
echo "Uninstall"
|
||||
echo " $remove_package"
|
||||
$remove_package || exit 1
|
||||
echo "########################################################"
|
||||
echo "Successfully uninstalled ${product_name}."
|
||||
echo "########################################################"
|
||||
fi
|
||||
echo
|
||||
|
||||
if [ "${unmount_install_package}x" != "x" ]; then
|
||||
$unmount_install_package > /dev/null 2>&1
|
||||
fi
|
||||
|
|
|
|||
Loading…
Reference in New Issue