Skip to content

Commit

Permalink
Version bump
Browse files Browse the repository at this point in the history
  • Loading branch information
JasonGiedymin committed Jun 18, 2014
1 parent 9ae2ecc commit 468e4c1
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 11 deletions.
5 changes: 5 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# nginx-init-ubuntu

* v3.7.0
- Missing reload action from service (@violuke), Fixes #15
- Add NGINXPATH var (@mattbearman), Fixes #14
- Version bump

* v3.6.0 - Testing framework, simple deployment script, Fix #8
- Add Vagrantfile
- Add `deploy-nginx.yml` which is a simple ansible deployment script
Expand Down
22 changes: 11 additions & 11 deletions nginx
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
# Author: Jason Giedymin
# <jason.giedymin AT gmail.com>.
#
# Version: 3.6.0 30-JAN-2014 jason.giedymin AT gmail.com
# Version: 3.7.0 30-JAN-2014 jason.giedymin AT gmail.com
# Notes: nginx init.d dash script for Ubuntu.
# Tested with: Ubuntu 13.10, nginx-1.5.9
#
#
# This script's project home is:
# http://github.com/JasonGiedymin/nginx-init-ubuntu
#
Expand Down Expand Up @@ -209,10 +209,10 @@ removePIDFile(){

start() {
log_daemon_msg "Starting $DESCRIPTION"

isRunning
isAlive=$?

if [ "${isAlive}" -eq $TRUE ]; then
log_end_msg $SCRIPT_ERROR
rc=0
Expand All @@ -237,10 +237,10 @@ start() {

stop() {
log_daemon_msg "Stopping $DESCRIPTION"

isRunning
isAlive=$?

if [ "${isAlive}" -eq $TRUE ]; then
start-stop-daemon --stop --quiet --pidfile $PIDSPATH/$PIDFILE

Expand Down Expand Up @@ -286,11 +286,11 @@ quietupgrade() {

isRunning
isAlive=$?

if [ "${isAlive}" -eq $TRUE ]; then
kill -USR2 `cat $PIDSPATH/$PIDFILE`
kill -WINCH `cat $PIDSPATH/$PIDFILE.oldbin`

isRunning
isAlive=$?

Expand All @@ -303,7 +303,7 @@ quietupgrade() {
rc=0
else
log_end_msg $SCRIPT_ERROR

log_daemon_msg "ERROR! Reverting back to original $DESCRIPTION"

kill -HUP `cat $PIDSPATH/$PIDFILE`
Expand All @@ -326,7 +326,7 @@ quietupgrade() {

terminate() {
log_daemon_msg "Force terminating (via KILL) $DESCRIPTION"

PIDS=`pidof $PS` || true

[ -e $PIDSPATH/$PIDFILE ] && PIDS2=`cat $PIDSPATH/$PIDFILE`
Expand Down Expand Up @@ -401,7 +401,7 @@ case "$1" in
*)
FULLPATH=/etc/init.d/$PS
echo "Usage: $FULLPATH {start|stop|restart|force-reload|reload|status|configtest|quietupgrade|terminate|destroy}"
echo " The 'destroy' command should only be used as a last resort."
echo " The 'destroy' command should only be used as a last resort."
exit 3
;;
esac
Expand Down

0 comments on commit 468e4c1

Please sign in to comment.