Merge pull request #460 from linuxserver/package-install

Run package installer as part of SWAG init to prevent init fail due to missing dns plugin
Revert "Update root/etc/s6-overlay/s6-rc.d/init-certbot-config/run"
2026-03-03 17:03:35 +09:00 · 2024-03-05 08:31:23 -05:00 · 2024-03-04 20:19:53 -05:00 · 2024-03-04 19:33:01 -05:00 · 2024-03-04 18:33:13 -05:00 · 2024-03-04 18:23:04 -05:00
1 changed files with 7 additions and 0 deletions
--- a/root/etc/s6-overlay/s6-rc.d/init-certbot-config/run
+++ b/root/etc/s6-overlay/s6-rc.d/init-certbot-config/run
@@ -23,6 +23,13 @@ for i in "${SANED_VARS[@]}"; do
    export echo "${i}"="$(echo "${!i}" | tr '[:upper:]' '[:lower:]')"
 done

+# Check for and install requested DNS plugins
+if grep -q "universal-package-install" <<< "${DOCKER_MODS}" && grep -q "certbot-dns" <<< "${INSTALL_PIP_PACKAGES}"; then
+    echo "**** Installing requested dns plugins ****"
+    /etc/s6-overlay/s6-rc.d/init-mod-universal-package-install-add-package/run
+    /etc/s6-overlay/s6-rc.d/init-mods-package-install/run
+fi
+
 # check to make sure DNSPLUGIN is selected if dns validation is used
 CERTBOT_DNS_AUTHENTICATORS=$(certbot plugins --authenticators 2>/dev/null | sed -e 's/^Entry point: EntryPoint(name='\''cpanel'\''/Entry point: EntryPoint(name='\''dns-cpanel'\''/' -e '/EntryPoint(name='\''dns-/!d' -e 's/^Entry point: EntryPoint(name='\''dns-\([^ ]*\)'\'',/\1/' | sort)
 if [[ "${VALIDATION}" = "dns" ]] && ! echo "${CERTBOT_DNS_AUTHENTICATORS}" | grep -q "${DNSPLUGIN}"; then
Author	SHA1	Message	Date
aptalca	a8d03c5280	Merge pull request #460 from linuxserver/package-install Run package installer as part of SWAG init to prevent init fail due to missing dns plugin	2024-03-05 08:31:23 -05:00
aptalca	907dfc8c03	Revert "Update root/etc/s6-overlay/s6-rc.d/init-certbot-config/run" This reverts commit `bf21a51e10`.	2024-03-04 20:19:53 -05:00
aptalca	bf21a51e10	Update root/etc/s6-overlay/s6-rc.d/init-certbot-config/run Co-authored-by: Eric Nemchik <eric@nemchik.com>	2024-03-04 19:33:01 -05:00
aptalca	32f72ac0b4	make it pretty, grep `certbot-dns`	2024-03-04 18:33:13 -05:00
aptalca	970fa75e87	run scripts direct	2024-03-04 18:23:04 -05:00
aptalca	137ad9f52e	Run package installer as part of SWAG init to prevent init fail due to missing dns plugin	2024-03-04 18:10:49 -05:00