mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-11-15 06:49:56 +00:00
don't invoke ./defineReverseProxyMappings.sh from sailing script;
it would require an initialized login shell with JAVA_HOME set properly, but that's not the case when the /usr/local/bin/sailing script is invoked through the sailing.service unit during the boot sequence. It is no longer needed anyhow because the sailing instances no longer run an Apache httpd server.
This commit is contained in:
1 parent
fccda18cac
commit
c39ccd88bc
1 file changed
+3
-9
@@ -8,8 +8,9 @@
|
||||
|
||||
|
||||
# Source function library. This alters the PATH variable.
|
||||
. /etc/init.d/functions
|
||||
|
||||
if [ -f /etc/init.d/functions ]; then
|
||||
. /etc/init.d/functions
|
||||
fi
|
||||
RETVAL=0
|
||||
|
||||
SERVERS_DIR=/home/sailing/servers
|
||||
@@ -73,19 +74,12 @@ configure_and_start_server() {
|
||||
# If there is a secret /root/mail.properties, copy it into the default server's configuration directory:
|
||||
/usr/local/bin/cp_root_mail_properties "${conf}"
|
||||
su - sailing -c "cd ${SERVERS_DIR}/${conf} && refreshInstance.sh auto-install; ./start"
|
||||
pushd ${SERVERS_DIR}/${conf}
|
||||
./defineReverseProxyMappings.sh
|
||||
popd
|
||||
RETVAL=$?
|
||||
[ $RETVAL -eq 0 ] && success || failure
|
||||
}
|
||||
|
||||
stop_servers() {
|
||||
for conf in $JAVA_START_INSTANCES; do
|
||||
echo "Stopping Java server $conf"
|
||||
su - sailing -c "cd $SERVERS_DIR/$conf && ./stop"
|
||||
RETVAL=$?
|
||||
[ $RETVAL -eq 0 ] && success || failure
|
||||
sync_logs
|
||||
done
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user