Merge pull request #42 from mdegat01/variable-refactor

Move constants up top in scripts

loki/rootfs/etc/cont-init.d/nginx.sh

@@ -4,6 +4,8 @@
 # Home Assistant Add-on: Loki
 # This file configures nginx
 # ==============================================================================
+readonly NGINX_SERVERS=/etc/nginx/servers
+readonly NGINX_CONF="${NGINX_SERVERS}/direct.conf"
 declare certfile
 declare keyfile
 
@@ -37,14 +39,14 @@ if bashio::config.true 'ssl'; then
 	        bashio::exit.nok
 	    fi
 
-	    mv /etc/nginx/servers/direct-mtls.disabled /etc/nginx/servers/direct.conf
-	    sed -i "s#%%cafile%%#${cafile}#g" /etc/nginx/servers/direct.conf
+	    mv "${NGINX_SERVERS}/direct-mtls.disabled" "${NGINX_CONF}"
+	    sed -i "s#%%cafile%%#${cafile}#g" "${NGINX_CONF}"
     else
-        mv /etc/nginx/servers/direct-ssl.disabled /etc/nginx/servers/direct.conf
+        mv "${NGINX_SERVERS}/direct-ssl.disabled" "${NGINX_CONF}"
     fi
 
-    sed -i "s#%%certfile%%#${certfile}#g" /etc/nginx/servers/direct.conf
-    sed -i "s#%%keyfile%%#${keyfile}#g" /etc/nginx/servers/direct.conf
+    sed -i "s#%%certfile%%#${certfile}#g" "${NGINX_CONF}"
+    sed -i "s#%%keyfile%%#${keyfile}#g" "${NGINX_CONF}"
 else
-    mv /etc/nginx/servers/direct.disabled /etc/nginx/servers/direct.conf
+    mv "${NGINX_SERVERS}/direct.disabled" "${NGINX_CONF}"
 fi

loki/rootfs/etc/services.d/loki/run

@@ -5,9 +5,12 @@
 # Runs Loki
 # ==============================================================================
 
-bashio::log.info 'Starting Loki...'
+readonly BIND_ADDR=127.0.0.1
+readonly HTTP_PORT=8080
 loki_config='/etc/loki/default-config.yaml'
 
+bashio::log.info 'Starting Loki...'
+
 if bashio::config.exists 'config_path'; then
     loki_config=$(bashio::config 'config_path')
     bashio::log.info "Using config at ${loki_config}"
@@ -39,8 +42,8 @@ bashio::log.info "Loki log level set to ${log_level}"
 loki_args=(
     "-config.expand-env=true"
     "-config.file=${loki_config}"
-    "-server.http-listen-address=127.0.0.1"
-    "-server.http-listen-port=8080" 
+    "-server.http-listen-address=${BIND_ADDR}"
+    "-server.http-listen-port=${HTTP_PORT}" 
     "-log.level=${log_level}"
 )
 if [ "${log_level}" == "debug" ]; then