LAB-linuxserver/docker-mods
1
0
Fork 0
mirror of https://github.com/linuxserver/docker-mods.git synced 2026-03-23 00:05:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #503 from linuxserver/swag-auto-reload-standard-base

Browse Source 
Adjust for compatibility with standard-base
This commit is contained in:
aptalca 2022-09-22 11:12:48 -04:00 committed by GitHub
commit 5ba357719b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 30 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
README.md
View File

@ -1,15 +1,6 @@
# Auto-reload - Docker mod for Nginx based images
This mod allows Nginx to be reloaded automatically whenever there are valid changes to the following files and folders:
- /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
This mod allows Nginx to be reloaded automatically whenever there are new files, or valid changes to the files in `/config/nginx`.
In the container's docker arguments, set an environment variable `DOCKER_MODS=linuxserver/mods:swag-auto-reload`

41
root/etc/s6-overlay/s6-rc.d/svc-mod-swag-auto-reload/run
View File

@ -1,45 +1,32 @@
#!/usr/bin/with-contenv bash
# shellcheck shell=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
echo "MOD Auto-reload: Watching the following files/folders for changes (excluding .sample and .md files):"
echo "/config/nginx"
ACTIVE_WATCH=("/config/nginx")
for i in $(echo "${WATCHLIST}" | tr "|" " "); 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}"
ACTIVE_WATCH+=("${i}")
fi
done
function wait_for_changes {
inotifywait -rq \
--event modify,move,create,delete \
${ACTIVE_WATCH}
--excludei '\.(sample|md)' \
"${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"
NGINX_CONF=()
if ! grep -q "/config/nginx/nginx.conf" /etc/nginx/nginx.conf; then
NGINX_CONF=("-c" "/config/nginx/nginx.conf")
fi
if /usr/sbin/nginx ${NGINX_CONF} -t; then
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
/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
fi
done

40
root/etc/services.d/inotify/run
View File

@ -1,42 +1,32 @@
#!/usr/bin/with-contenv bash
# shellcheck shell=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
echo "MOD Auto-reload: Watching the following files/folders for changes (excluding .sample and .md files):"
echo "/config/nginx"
ACTIVE_WATCH=("/config/nginx")
for i in $(echo "${WATCHLIST}" | tr "|" " "); 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}"
ACTIVE_WATCH+=("${i}")
fi
done
function wait_for_changes {
inotifywait -rq \
--event modify,move,create,delete \
${ACTIVE_WATCH}
--excludei '\.(sample|md)' \
"${ACTIVE_WATCH[@]}"
}
while wait_for_changes; do
if /usr/sbin/nginx -c /config/nginx/nginx.conf -t; then
NGINX_CONF=()
if ! grep -q "/config/nginx/nginx.conf" /etc/nginx/nginx.conf; then
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 -c /config/nginx/nginx.conf -s reload
/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
fi
done