Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes #4920: Correct calls to /etc/init.d/jetty in rudder-webapp to use ... #334

Merged
merged 1 commit into from
Jun 2, 2014
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions rudder-webapp/debian/postinst
Original file line number Diff line number Diff line change
Expand Up @@ -106,10 +106,10 @@ case "$1" in

# Restart the webapp
echo -n "INFO: Restarting Rudder webapp and inventory-endpoint..."
if [ /etc/init.d/jetty check >/dev/null 2>&1 ];then
/etc/init.d/jetty start >/dev/null 2>&1
if [ /etc/init.d/rudder-jetty check >/dev/null 2>&1 ];then
/etc/init.d/rudder-jetty start >/dev/null 2>&1
else
/etc/init.d/jetty restart >/dev/null 2>&1 || echo "WARNING: Jetty failed to start, maybe there is not enough RAM or swap on the machine. Skipping..."
/etc/init.d/rudder-jetty restart >/dev/null 2>&1 || echo -n "WARNING: Jetty failed to start, maybe there is not enough RAM or swap on the machine. Skipping... "
fi
echo " Done"

Expand Down