Merge pull request #2011 from gaelicWizard/plugin-nginx

plugin/nginx: cleanup
pull/1958/head
Noah Gorny 2022-01-09 01:11:06 +02:00 committed by GitHub
commit 21e7c1f00c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 38 additions and 48 deletions

View File

@ -105,6 +105,7 @@ plugins/available/jekyll.plugin.bash
plugins/available/jump.plugin.bash plugins/available/jump.plugin.bash
plugins/available/less-pretty-cat.plugin.bash plugins/available/less-pretty-cat.plugin.bash
plugins/available/man.plugin.bash plugins/available/man.plugin.bash
plugins/available/nginx.plugin.bash
plugins/available/node.plugin.bash plugins/available/node.plugin.bash
plugins/available/nodenv.plugin.bash plugins/available/nodenv.plugin.bash
plugins/available/osx-timemachine.plugin.bash plugins/available/osx-timemachine.plugin.bash

View File

@ -1,18 +1,18 @@
cite about-plugin # shellcheck shell=bash
about-plugin 'manage your nginx service' about-plugin 'manage your nginx service'
export NGINX_PATH='/opt/nginx' pathmunge "${NGINX_PATH:=/opt/nginx}/sbin" after
pathmunge $NGINX_PATH/sbin after export NGINX_PATH
function nginx_reload() { function nginx_reload() {
about 'reload your nginx config' about 'reload your nginx config'
group 'nginx' group 'nginx'
FILE="${NGINX_PATH}/logs/nginx.pid" local FILE="${NGINX_PATH?}/logs/nginx.pid"
if [ -e $FILE ]; then if [[ -s $FILE ]]; then
echo "Reloading NGINX..." echo "Reloading NGINX..."
PID=`cat $NGINX_PATH/logs/nginx.pid` read -r PID < "${FILE}"
sudo kill -HUP $PID sudo kill -HUP "${PID?}"
else else
echo "Nginx pid file not found" echo "Nginx pid file not found"
return 0 return 0
@ -23,11 +23,11 @@ function nginx_stop() {
about 'stop nginx' about 'stop nginx'
group 'nginx' group 'nginx'
FILE="${NGINX_PATH}/logs/nginx.pid" local FILE="${NGINX_PATH?}/logs/nginx.pid"
if [ -e $FILE ]; then if [[ -s $FILE ]]; then
echo "Stopping NGINX..." echo "Stopping NGINX..."
PID=`cat $NGINX_PATH/logs/nginx.pid` read -r PID < "${FILE}"
sudo kill -INT $PID sudo kill -INT "${PID?}"
else else
echo "Nginx pid file not found" echo "Nginx pid file not found"
return 0 return 0
@ -38,10 +38,10 @@ function nginx_start() {
about 'start nginx' about 'start nginx'
group 'nginx' group 'nginx'
FILE="${NGINX_PATH}/sbin/nginx" local FILE="${NGINX_PATH?}/sbin/nginx"
if [ -e $FILE ]; then if [[ -x $FILE ]]; then
echo "Starting NGINX..." echo "Starting NGINX..."
sudo $NGINX_PATH/sbin/nginx sudo "${FILE}"
else else
echo "Couldn't start nginx" echo "Couldn't start nginx"
fi fi
@ -51,16 +51,5 @@ function nginx_restart() {
about 'restart nginx' about 'restart nginx'
group 'nginx' group 'nginx'
FILE="${NGINX_PATH}/logs/nginx.pid" nginx_stop && nginx_start
if [ -e $FILE ]; then
echo "Stopping NGINX..."
PID=`cat $NGINX_PATH/logs/nginx.pid`
sudo kill -INT $PID
sleep 1
echo "Starting NGINX..."
sudo $NGINX_PATH/sbin/nginx
else
echo "Nginx pid file not found"
return 0
fi
} }