Bot Updating Package Versions

remove stream.conf

Dockerfile

@@ -144,6 +144,8 @@ RUN \
   sed -i \
     's|#ssl_trusted_certificate /config/keys/cert.crt;|ssl_trusted_certificate /config/keys/cert.crt;|' \
     /defaults/nginx/ssl.conf.sample && \
+  echo "**** remove stream.conf ****" && \
+  rm -f /etc/nginx/conf.d/stream.conf && \
   echo "**** correct ip6tables legacy issue ****" && \
   rm \
     /sbin/ip6tables && \

Dockerfile.aarch64

@@ -144,6 +144,8 @@ RUN \
   sed -i \
     's|#ssl_trusted_certificate /config/keys/cert.crt;|ssl_trusted_certificate /config/keys/cert.crt;|' \
     /defaults/nginx/ssl.conf.sample && \
+  echo "**** remove stream.conf ****" && \
+  rm -f /etc/nginx/conf.d/stream.conf && \
   echo "**** correct ip6tables legacy issue ****" && \
   rm \
     /sbin/ip6tables && \

README.md

@@ -400,6 +400,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **04.03.24:** - Remove `stream.conf` inside the container to allow users to include their own block in `nginx.conf`.
 * **23.01.24:** - Rebase to Alpine 3.19 with php 8.3, add root periodic crontabs for logrotate.
 * **01.01.24:** - Add GleSYS DNS plugin.
 * **11.12.23:** - Deprecate certbot-dns-dynu to resolve dependency conflicts with other plugins.

package_versions.txt

@@ -23,8 +23,8 @@ azure-mgmt-core                 1.4.0                  python
 azure-mgmt-dns                  8.1.0                  python                   
 bash                            5.2.21-r0              apk                      
 beautifulsoup4                  4.12.3                 python                   
-boto3                           1.34.55                python                   
-botocore                        1.34.55                python                   
+boto3                           1.34.56                python                   
+botocore                        1.34.56                python                   
 brotli-libs                     1.1.0-r1               apk                      
 bs4                             0.0.2                  python                   
 busybox                         1.36.1-r15             apk                      
@@ -115,7 +115,7 @@ gnupg-utils                     2.4.4-r0               apk
 gnupg-wks-client                2.4.4-r0               apk                      
 gnutls                          3.8.3-r0               apk                      
 google-api-core                 2.17.1                 python                   
-google-api-python-client        2.120.0                python                   
+google-api-python-client        2.121.0                python                   
 google-auth                     2.28.1                 python                   
 google-auth-httplib2            0.2.0                  python                   
 googleapis-common-protos        1.62.0                 python                   
@@ -307,7 +307,7 @@ pyasn1-modules                  0.3.0                  python
 pyc                             3.11.8-r0              apk                      
 pycparser                       2.21                   python                   
 pyotp                           2.9.0                  python                   
-pyparsing                       3.1.1                  python                   
+pyparsing                       3.1.2                  python                   
 python-dateutil                 2.9.0.post0            python                   
 python-digitalocean             1.17.0                 python                   
 python-transip                  0.6.0                  python                   

readme-vars.yml

@@ -168,6 +168,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "04.03.24:", desc: "Remove `stream.conf` inside the container to allow users to include their own block in `nginx.conf`." }
   - { date: "23.01.24:", desc: "Rebase to Alpine 3.19 with php 8.3, add root periodic crontabs for logrotate." }
   - { date: "01.01.24:", desc: "Add GleSYS DNS plugin." }
   - { date: "11.12.23:", desc: "Deprecate certbot-dns-dynu to resolve dependency conflicts with other plugins." }

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