road to v1.2.3 - fixing bugs

scripts/abusers.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # load some functions
-. /opt/scripts/utils.sh
+. /opt/entrypoint/utils.sh
 
 # copy old conf to cache
 cp /etc/nginx/block-abusers.conf /cache

scripts/certbot-renew-hook.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # load some functions
-. /opt/scripts/utils.sh
+. /opt/entrypoint/utils.sh
 
 job_log "[CERTBOT] certificates have been renewed"
 

scripts/certbot-renew.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # load some functions
-. /opt/scripts/utils.sh
+. /opt/entrypoint/utils.sh
 
 # ask new certificates if needed
 certbot renew --deploy-hook /opt/scripts/certbot-renew-hook.sh

scripts/exit-nodes.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # load some functions
-. /opt/scripts/utils.sh
+. /opt/entrypoint/utils.sh
 
 # copy old conf to cache
 cp /etc/nginx/block-tor-exit-node.conf /cache

scripts/geoip.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # load some functions
-. /opt/scripts/utils.sh
+. /opt/entrypoint/utils.sh
 
 # if we are running nginx
 if [ -f /tmp/nginx.pid ] ; then

scripts/logrotate.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # load some functions
-. /opt/scripts/utils.sh
+. /opt/entrypoint/utils.sh
 
 logrotate -f /etc/logrotate.conf > /dev/null 2>&1
 

scripts/proxies.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # load some functions
-. /opt/scripts/utils.sh
+. /opt/entrypoint/utils.sh
 
 # copy old conf to cache
 cp /etc/nginx/block-proxies.conf /cache

scripts/referrers.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # load some functions
-. /opt/scripts/utils.sh
+. /opt/entrypoint/utils.sh
 
 # save old conf
 cp /etc/nginx/map-referrer.conf /cache

scripts/user-agents.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # load some functions
-. /opt/scripts/utils.sh
+. /opt/entrypoint/utils.sh
 
 # save old conf
 cp /etc/nginx/map-user-agent.conf /cache

scripts/utils.sh

@@ -1,8 +0,0 @@
-#!/bin/sh
-
-function job_log() {
-	when="$(date '+[%d/%m/%Y %H:%M:%S]')"
-	what="$1"
-	echo "$when $what" >> /var/log/jobs.log
-}
-