From 0fdef6eebda22d651fef8e078377a4d89a2fcc8c Mon Sep 17 00:00:00 2001 From: aptalca Date: Thu, 18 Aug 2022 13:17:14 -0400 Subject: [PATCH 1/2] switch to hybrid --- .../init-mod-universal-docker-setup | 0 .../init-mod-swag-auto-proxy-setup/run | 19 +++++++++++++++++++ .../init-mod-swag-auto-proxy-setup/type | 1 + .../s6-rc.d/init-mod-swag-auto-proxy-setup/up | 1 + .../init-mod-swag-auto-proxy-setup | 0 .../contents.d/init-mod-swag-auto-proxy-setup | 0 6 files changed, 21 insertions(+) create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mod-swag-auto-proxy-setup/dependencies.d/init-mod-universal-docker-setup create mode 100755 root/etc/s6-overlay/s6-rc.d/init-mod-swag-auto-proxy-setup/run create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mod-swag-auto-proxy-setup/type create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mod-swag-auto-proxy-setup/up create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/init-mod-swag-auto-proxy-setup create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-swag-auto-proxy-setup diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-swag-auto-proxy-setup/dependencies.d/init-mod-universal-docker-setup b/root/etc/s6-overlay/s6-rc.d/init-mod-swag-auto-proxy-setup/dependencies.d/init-mod-universal-docker-setup new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-swag-auto-proxy-setup/run b/root/etc/s6-overlay/s6-rc.d/init-mod-swag-auto-proxy-setup/run new file mode 100755 index 0000000..2ca9911 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-swag-auto-proxy-setup/run @@ -0,0 +1,19 @@ +#!/usr/bin/with-contenv bash + +if [ ! -S /var/run/docker.sock ] && [ -z "$DOCKER_HOST" ]; then + echo "**** Docker mod not set up properly, skipping SWAG auto-proxy ****" + exit 0 +fi + +rm -rf /etc/nginx/http.d/auto-proxy*.conf /config/nginx/proxy-confs/auto-proxy*.conf +sed -i 's|#include /etc/nginx/http.d|include /etc/nginx/http.d|' /config/nginx/nginx.conf +cp /defaults/auto-proxy-readme /etc/nginx/http.d/auto-proxy-readme +rm -rf /auto-proxy +mkdir /auto-proxy + +if ! grep -q "/app/auto-proxy.sh" /config/crontabs/root; then + echo "* * * * * /app/auto-proxy.sh" >> /config/crontabs/root + cp /config/crontabs/root /etc/crontabs/root +fi + +/app/auto-proxy.sh diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-swag-auto-proxy-setup/type b/root/etc/s6-overlay/s6-rc.d/init-mod-swag-auto-proxy-setup/type new file mode 100644 index 0000000..3d92b15 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-swag-auto-proxy-setup/type @@ -0,0 +1 @@ +oneshot \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-swag-auto-proxy-setup/up b/root/etc/s6-overlay/s6-rc.d/init-mod-swag-auto-proxy-setup/up new file mode 100644 index 0000000..a4f1258 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-swag-auto-proxy-setup/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-mod-swag-auto-proxy-setup/run \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/init-mod-swag-auto-proxy-setup b/root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/init-mod-swag-auto-proxy-setup new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-swag-auto-proxy-setup b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-swag-auto-proxy-setup new file mode 100644 index 0000000..e69de29 From 54a49fd37643f33f86e199fba4ab5d5c221dec4c Mon Sep 17 00:00:00 2001 From: aptalca Date: Thu, 18 Aug 2022 20:49:22 -0400 Subject: [PATCH 2/2] add finish script --- .../s6-overlay/s6-rc.d/init-mod-swag-auto-proxy-setup/down | 1 + .../s6-overlay/s6-rc.d/init-mod-swag-auto-proxy-setup/finish | 4 ++++ 2 files changed, 5 insertions(+) create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mod-swag-auto-proxy-setup/down create mode 100755 root/etc/s6-overlay/s6-rc.d/init-mod-swag-auto-proxy-setup/finish diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-swag-auto-proxy-setup/down b/root/etc/s6-overlay/s6-rc.d/init-mod-swag-auto-proxy-setup/down new file mode 100644 index 0000000..eb13c83 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-swag-auto-proxy-setup/down @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-mod-swag-auto-proxy-setup/finish \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-swag-auto-proxy-setup/finish b/root/etc/s6-overlay/s6-rc.d/init-mod-swag-auto-proxy-setup/finish new file mode 100755 index 0000000..5d76736 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-swag-auto-proxy-setup/finish @@ -0,0 +1,4 @@ +#!/usr/bin/with-contenv bash + +sed -i '/\/app\/auto-proxy.sh/d' /config/crontabs/root +rm -rf /etc/nginx/http.d/auto-proxy*.conf /config/nginx/proxy-confs/auto-proxy*.conf