Minimal maintenance on contrib scripts

Docker-DCO-1.1-Signed-off-by: Mangled Deutz <[email protected]> (github: dmp42)

Author: Mangled Deutz

contrib/docker-registry.conf

@@ -9,9 +9,10 @@ env REGISTRY_DIR=/srv/docker/registry
 env USER=www-data
 env GROUP=www-data
 env LOG_FILE=/var/log/docker/registry.log
-env NUM_WORKERS=9
+env GUNICORN_WORKERS=9
 
-env ADDRESS=127.0.0.1:5000
+env REGISTRY_PORT=5000
+env REGISTRY_HOST=127.0.0.1
 
 
 pre-start script
@@ -27,5 +28,5 @@ script
 
     [ -r $REGISTRY_DIR/.venv/bin/activate ] && . $REGISTRY_DIR/.venv/bin/activate
     cd $REGISTRY_DIR
-    exec gunicorn -w $NUM_WORKERS --bind=$ADDRESS --user=$USER --group=$GROUP --log-level=$LOG_LEVEL --log-file=$LOG_FILE 2>>$LOG_FILE wsgi:application
+    exec gunicorn -w $GUNICORN_WORKERS --bind=$REGISTRY_HOST:$REGISTRY_PORT --user=$USER --group=$GROUP --log-level=$LOG_LEVEL --log-file=$LOG_FILE 2>>$LOG_FILE docker_registry.wsgi:application
 end script

contrib/docker-registry_RHEL.sh

@@ -43,7 +43,7 @@ self_dir="${self_path%%/${self_path##*/}}"
 
 NAME="Docker Registry"
 DAEMON="/usr/bin/gunicorn"
-DAEMON_OPTS="-D --error-logfile ${ERROR_LOGFILE} --access-logfile ${ACCESS_LOGFILE} --log-file ${LOGFILE} --pid ${PIDFILE} --max-requests 500 --graceful-timeout 3600 -t 3600 -k gevent -b ${LISTEN_IP}:${LISTEN_PORT} -w ${GUNICORN_WORKERS:-2} wsgi:application"
+DAEMON_OPTS="-D --error-logfile ${ERROR_LOGFILE} --access-logfile ${ACCESS_LOGFILE} --log-file ${LOGFILE} --pid ${PIDFILE} --max-requests 500 --graceful-timeout 3600 -t 3600 -k gevent -b ${LISTEN_IP}:${LISTEN_PORT} -w ${GUNICORN_WORKERS:-2} docker_registry.wsgi:application"
 
 RED='\e[0;31m'
 GREEN='\e[0;32m'

contrib/docker-registry_debian.sh

@@ -5,7 +5,7 @@
 # Required-Start:  $network $remote_fs $syslog
 # Required-Stop:   $network $remote_fs $syslog
 # Default-Start:   2 3 4 5
-# Default-Stop:    0 1 6 
+# Default-Stop:    0 1 6
 # Short-Description: Start Docker-Registry
 ### END INIT INFO
 
@@ -33,15 +33,15 @@ self_dir="${self_path%%/${self_path##*/}}"
 # set defaults if they are not set by config
 [[ -z "$RUNAS" ]] && RUNAS=$(stat --format "%U" $self_path)                  # defaults to user owning this init script
 [[ -z "$LOGFILE" ]] && LOGFILE=/var/log/docker-registry.log                  # will be chowned to $RUNAS
-[[ -z "$PIDFILE" ]] && PIDFILE=/var/run/docker-registry/docker-registry.pid  # path will created and chowned to $RUNAS 
+[[ -z "$PIDFILE" ]] && PIDFILE=/var/run/docker-registry/docker-registry.pid  # path will created and chowned to $RUNAS
 [[ -z "$LISTEN_IP" ]]            && LISTEN_IP="0.0.0.0"
 [[ -z "$LISTEN_PORT" ]]          && LISTEN_PORT=5000
 [[ -z "$GUNICORN_WORKERS" ]]     && GUNICORN_WORKERS=2
 [[ -z "$DOCKER_REGISTRY_HOME" ]] && DOCKER_REGISTRY_HOME=${self_dir%/*}
 
 NAME="Docker Registry"
 DAEMON="/usr/local/bin/gunicorn"
-DAEMON_OPTS="-D --access-logfile ${LOGFILE} --pid ${PIDFILE} --max-requests 500 --graceful-timeout 3600 -t 3600 -k gevent -b ${LISTEN_IP}:${LISTEN_PORT} -w ${GUNICORN_WORKERS:-2} wsgi:application"
+DAEMON_OPTS="-D --access-logfile ${LOGFILE} --pid ${PIDFILE} --max-requests 500 --graceful-timeout 3600 -t 3600 -k gevent -b ${LISTEN_IP}:${LISTEN_PORT} -w ${GUNICORN_WORKERS:-2} docker_registry.wsgi:application"
 
 RED='\e[0;31m'
 GREEN='\e[0;32m'