From 2f7ceb44c00cd46de973b5fed88c9abe86dc8400 Mon Sep 17 00:00:00 2001 From: aptalca Date: Thu, 18 Aug 2022 14:31:47 -0400 Subject: [PATCH] switch to hybrid --- .../dependencies.d/init-mods | 0 .../init-mod-swag-dashboard-add-package/run | 36 +++++++++++++++++++ .../init-mod-swag-dashboard-add-package/type | 1 + .../init-mod-swag-dashboard-add-package/up | 1 + .../init-mod-swag-dashboard-add-package | 0 .../init-mod-swag-dashboard-add-package | 0 6 files changed, 38 insertions(+) create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mod-swag-dashboard-add-package/dependencies.d/init-mods create mode 100755 root/etc/s6-overlay/s6-rc.d/init-mod-swag-dashboard-add-package/run create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mod-swag-dashboard-add-package/type create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mod-swag-dashboard-add-package/up create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mod-swag-dashboard-add-package create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-swag-dashboard-add-package diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-swag-dashboard-add-package/dependencies.d/init-mods b/root/etc/s6-overlay/s6-rc.d/init-mod-swag-dashboard-add-package/dependencies.d/init-mods new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-swag-dashboard-add-package/run b/root/etc/s6-overlay/s6-rc.d/init-mod-swag-dashboard-add-package/run new file mode 100755 index 0000000..f7f2903 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-swag-dashboard-add-package/run @@ -0,0 +1,36 @@ +#!/usr/bin/with-contenv bash + +echo "**** Applying the SWAG dashboard mod... ****" + +ARCH=$(uname -m) +if [ -d "/goaccess/${ARCH}" ]; then + echo "**** Installing/updating goaccess ****" + cp -a /goaccess/${ARCH}/* / + rm -rf /goaccess +else + echo "**** Goaccess already installed and up to date ****" +fi + +if ! apk info 2>&1 | grep -q "libmaxminddb"; then + echo "**** Adding libmaxminddb to package install list ****" + echo "libmaxminddb" >> /mod-repo-packages-to-install.list +else + echo "**** libmaxminddb already installed, skipping ****" +fi + +cp -f /dashboard/dashboard.subdomain.conf.sample /config/nginx/proxy-confs/dashboard.subdomain.conf.sample +if [ ! -f /config/nginx/proxy-confs/dashboard.subdomain.conf ]; then + cp /dashboard/dashboard.subdomain.conf.sample /config/nginx/proxy-confs/dashboard.subdomain.conf +fi + +if [ "$(sed -nE 's|## Version ([0-9]{4}\/[0-9]{2}\/[0-9]{2}).*|\1|p' /dashboard/dashboard.subdomain.conf.sample)" != "$(sed -nE 's|## Version ([0-9]{4}\/[0-9]{2}\/[0-9]{2}).*|\1|p' /config/nginx/proxy-confs/dashboard.subdomain.conf)" ]; then + echo "**** The swag-dashboard conf has been updated ****" + echo "**** Compare the changes using the sample file: /config/nginx/proxy-confs/dashboard.subdomain.conf.sample" +fi + +# permissions +chown -R abc:abc \ + /dashboard \ + /config/nginx/proxy-confs/dashboard.subdomain.conf + +echo "**** Applied the SWAG dashboard mod ****" diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-swag-dashboard-add-package/type b/root/etc/s6-overlay/s6-rc.d/init-mod-swag-dashboard-add-package/type new file mode 100644 index 0000000..3d92b15 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-swag-dashboard-add-package/type @@ -0,0 +1 @@ +oneshot \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-swag-dashboard-add-package/up b/root/etc/s6-overlay/s6-rc.d/init-mod-swag-dashboard-add-package/up new file mode 100644 index 0000000..fc0e595 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-swag-dashboard-add-package/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-mod-swag-dashboard-add-package/run \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mod-swag-dashboard-add-package b/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mod-swag-dashboard-add-package new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-swag-dashboard-add-package b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-swag-dashboard-add-package new file mode 100644 index 0000000..e69de29