Merge pull request #459 from linuxserver/swag-auto-reload-s6v3

switch to hybrid (swag-auto-reload)

Author: aptalca

root/etc/s6-overlay/s6-rc.d/init-mod-swag-auto-reload-add-package/dependencies.d/init-mods

@@ -0,0 +1,8 @@
+#!/usr/bin/with-contenv bash
+
+if ! apk info 2>&1 | grep -q "inotify-tools"; then
+    echo "**** Adding swag-auto-reload deps to package install list ****"
+    echo "inotify-tools" >> /mod-repo-packages-to-install.list
+else
+    echo "**** swag-auto-reload deps already installed, skipping ****"
+fi

root/etc/s6-overlay/s6-rc.d/init-mod-swag-auto-reload-add-package/run

@@ -0,0 +1 @@
+oneshot

root/etc/s6-overlay/s6-rc.d/init-mod-swag-auto-reload-add-package/type

@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-mod-swag-auto-reload-add-package/run

root/etc/s6-overlay/s6-rc.d/init-mod-swag-auto-reload-add-package/up

@@ -0,0 +1,45 @@
+#!/usr/bin/with-contenv bash
+
+DEFAULT_WATCH=( \
+  /config/nginx/authelia-location.conf \
+  /config/nginx/authelia-server.conf \
+  /config/nginx/geoip2.conf \
+  /config/nginx/ldap.conf \
+  /config/nginx/nginx.conf \
+  /config/nginx/proxy-confs \
+  /config/nginx/proxy.conf \
+  /config/nginx/site-confs \
+  /config/nginx/ssl.conf \
+)
+
+echo "MOD Auto-reload: Watching the following files/folders for changes"
+for i in ${DEFAULT_WATCH[@]}; do
+  if [ -f "${i}" ] || [ -d "${i}" ]; then
+    echo "${i}"
+    ACTIVE_WATCH="${ACTIVE_WATCH} ${i}"
+  fi
+done
+for i in $(echo "$WATCHLIST" | tr "|" " "); do
+  if [ -f "${i}" ] || [ -d "${i}" ]; then
+    echo "${i}"
+    ACTIVE_WATCH="${ACTIVE_WATCH} ${i}"
+  fi
+done
+
+function wait_for_changes {
+  inotifywait -rq \
+    --event modify,move,create,delete \
+    ${ACTIVE_WATCH}
+}
+
+while wait_for_changes; do
+  if ! cat /etc/nginx/nginx.conf | grep "/config/nginx/nginx.conf"; then
+    export NGINX_CONF="-c /config/nginx/nginx.conf"
+  fi
+  if /usr/sbin/nginx ${NGINX_CONF} -t; then
+    echo "Changes to nginx config detected and the changes are valid, reloading nginx"
+    /usr/sbin/nginx ${NGINX_CONF} -s reload
+  else
+    echo "Changes to nginx config detected but the changes are not valid, skipping nginx reload. Please fix your config."
+  fi  
+done

root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mod-swag-auto-reload-add-package

@@ -0,0 +1 @@
+longrun