diff --git a/confs/global/nginx-temp.conf b/confs/global/nginx-temp.conf index 1a50cb0..a846019 100644 --- a/confs/global/nginx-temp.conf +++ b/confs/global/nginx-temp.conf @@ -1,4 +1,5 @@ daemon on; + pid /tmp/nginx-temp.pid; events { diff --git a/entrypoint/entrypoint.sh b/entrypoint/entrypoint.sh index d28dd89..8499421 100644 --- a/entrypoint/entrypoint.sh +++ b/entrypoint/entrypoint.sh @@ -78,8 +78,8 @@ rsyslogd crond # start nginx -if [ -f "/tmp/nginx.pid" ] ; then - nginx -s quit +if [ -f "/tmp/nginx-temp.pid" ] ; then + nginx -c /etc/nginx/nginx-temp.conf -s quit fi echo "[*] Running nginx ..." su -s "/usr/sbin/nginx" nginx diff --git a/scripts/referrers.sh b/scripts/referrers.sh index b4996ed..070a6f0 100755 --- a/scripts/referrers.sh +++ b/scripts/referrers.sh @@ -19,7 +19,7 @@ done echo -e "map \$http_referer \$bad_referrer { hostnames; default no; $DATA }" > /tmp/map-referrer.conf # check number of lines -lines="$(wc -l /etc/nginx/map-referrer.conf | cut -d ' ' -f 1)" +lines="$(wc -l /tmp/map-referrer.conf | cut -d ' ' -f 1)" if [ "$lines" -gt 1 ] ; then mv /tmp/map-referrer.conf /etc/nginx/map-referrer.conf job_log "[BLACKLIST] referrers list updated ($lines entries)" diff --git a/scripts/user-agents.sh b/scripts/user-agents.sh index 5541495..b07ae1c 100755 --- a/scripts/user-agents.sh +++ b/scripts/user-agents.sh @@ -21,7 +21,7 @@ DATA_ESCAPED=$(echo "$DATA" | sed 's: :\\\\ :g' | sed 's:\\\\ yes;: yes;:g' | se echo -e "map \$http_user_agent \$bad_user_agent { default no; $DATA_ESCAPED }" > /tmp/map-user-agent.conf # check number of lines -lines="$(wc -l /etc/nginx/map-user-agent.conf | cut -d ' ' -f 1)" +lines="$(wc -l /tmp/map-user-agent.conf | cut -d ' ' -f 1)" if [ "$lines" -gt 1 ] ; then mv /tmp/map-user-agent.conf /etc/nginx/map-user-agent.conf job_log "[BLACKLIST] user-agent list updated ($lines entries)" diff --git a/ui/templates/instances.html b/ui/templates/instances.html index 4de2b27..486eff7 100644 --- a/ui/templates/instances.html +++ b/ui/templates/instances.html @@ -14,7 +14,7 @@ {% set color = "danger" %} {% endif %} -
+
{{ instance["name"] }}