From 9b7bebbe68797e7312d3d8e5f26eb738fa97748f Mon Sep 17 00:00:00 2001 From: aptalca Date: Fri, 26 Aug 2022 09:21:43 -0400 Subject: [PATCH] switch to hybrid --- .../dependencies.d/init-mods | 0 .../init-mod-swag-maxmind-add-package/run | 9 ++++++ .../init-mod-swag-maxmind-add-package/type | 1 + .../init-mod-swag-maxmind-add-package/up | 1 + .../dependencies.d/init-mods-package-install | 0 .../s6-rc.d/init-mod-swag-maxmind-setup/run | 29 +++++++++++++++++++ .../s6-rc.d/init-mod-swag-maxmind-setup/type | 1 + .../s6-rc.d/init-mod-swag-maxmind-setup/up | 1 + .../init-mod-swag-maxmind-setup | 0 .../init-mod-swag-maxmind-add-package | 0 .../init-mod-swag-maxmind-add-package | 0 .../contents.d/init-mod-swag-maxmind-setup | 0 12 files changed, 42 insertions(+) create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mod-swag-maxmind-add-package/dependencies.d/init-mods create mode 100755 root/etc/s6-overlay/s6-rc.d/init-mod-swag-maxmind-add-package/run create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mod-swag-maxmind-add-package/type create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mod-swag-maxmind-add-package/up create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mod-swag-maxmind-setup/dependencies.d/init-mods-package-install create mode 100755 root/etc/s6-overlay/s6-rc.d/init-mod-swag-maxmind-setup/run create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mod-swag-maxmind-setup/type create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mod-swag-maxmind-setup/up create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/init-mod-swag-maxmind-setup create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mod-swag-maxmind-add-package create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-swag-maxmind-add-package create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-swag-maxmind-setup diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-swag-maxmind-add-package/dependencies.d/init-mods b/root/etc/s6-overlay/s6-rc.d/init-mod-swag-maxmind-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-maxmind-add-package/run b/root/etc/s6-overlay/s6-rc.d/init-mod-swag-maxmind-add-package/run new file mode 100755 index 0000000..50a8f1c --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-swag-maxmind-add-package/run @@ -0,0 +1,9 @@ +#!/usr/bin/with-contenv bash + +if ! apk info 2>&1 | grep -q "libmaxminddb"; then + echo "**** adding libmaxminddb to package install list ****" + echo "libmaxminddb" >> /mod-repo-packages-to-install.list + if +else + echo "**** libmaxminddb already installed, skipping ****" +fi diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-swag-maxmind-add-package/type b/root/etc/s6-overlay/s6-rc.d/init-mod-swag-maxmind-add-package/type new file mode 100644 index 0000000..3d92b15 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-swag-maxmind-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-maxmind-add-package/up b/root/etc/s6-overlay/s6-rc.d/init-mod-swag-maxmind-add-package/up new file mode 100644 index 0000000..b73c49a --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-swag-maxmind-add-package/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-mod-swag-maxmind-add-package/run \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-swag-maxmind-setup/dependencies.d/init-mods-package-install b/root/etc/s6-overlay/s6-rc.d/init-mod-swag-maxmind-setup/dependencies.d/init-mods-package-install new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-swag-maxmind-setup/run b/root/etc/s6-overlay/s6-rc.d/init-mod-swag-maxmind-setup/run new file mode 100755 index 0000000..1dff571 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-swag-maxmind-setup/run @@ -0,0 +1,29 @@ +#!/usr/bin/with-contenv bash + +echo "Applying the maxmind mod..." + +# create GeoIP2 folder symlink +mkdir -p \ + /config/geoip2db +[[ -d /var/lib/libmaxminddb ]] && [[ ! -L /var/lib/libmaxminddb ]] && \ + rm -rf /var/lib/libmaxminddb +[[ ! -d /var/lib/libmaxminddb ]] && \ + ln -s /config/geoip2db /var/lib/libmaxminddb +# check GeoIP2 database +if [ -n "$MAXMINDDB_LICENSE_KEY" ]; then + sed -i "s|.*MAXMINDDB_LICENSE_KEY.*|MAXMINDDB_LICENSE_KEY=\"${MAXMINDDB_LICENSE_KEY}\"|g" /etc/libmaxminddb.cron.conf + if [ ! -f /var/lib/libmaxminddb/GeoLite2-City.mmdb ]; then + echo "Downloading GeoIP2 City database." + /etc/periodic/weekly/libmaxminddb + fi +elif [ -f /var/lib/libmaxminddb/GeoLite2-City.mmdb ]; then + echo -e "Currently using the user provided GeoLite2-City.mmdb.\nIf you want to enable weekly auto-updates of the database, retrieve a free license key from MaxMind,\nand add a new env variable \"MAXMINDDB_LICENSE_KEY\", set to your license key." +else + echo -e "Starting 2019/12/30, GeoIP2 databases require personal license key to download. Please retrieve a free license key from MaxMind,\nand add a new env variable \"MAXMINDDB_LICENSE_KEY\", set to your license key." +fi + +if [ ! -f /config/nginx/maxmind.conf ]; then + cp /defaults/maxmind.conf /config/nginx/maxmind.conf +fi + +echo "Applied the maxmind mod" diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-swag-maxmind-setup/type b/root/etc/s6-overlay/s6-rc.d/init-mod-swag-maxmind-setup/type new file mode 100644 index 0000000..3d92b15 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-swag-maxmind-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-maxmind-setup/up b/root/etc/s6-overlay/s6-rc.d/init-mod-swag-maxmind-setup/up new file mode 100644 index 0000000..4dfc081 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-swag-maxmind-setup/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-mod-swag-maxmind-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-maxmind-setup b/root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/init-mod-swag-maxmind-setup new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mod-swag-maxmind-add-package b/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mod-swag-maxmind-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-maxmind-add-package b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-swag-maxmind-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-maxmind-setup b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-swag-maxmind-setup new file mode 100644 index 0000000..e69de29