From 778b3808a8fb0d7915183994bdb4789874482822 Mon Sep 17 00:00:00 2001 From: Daniel Winzen Date: Thu, 29 Oct 2026 09:59:11 +0100 Subject: [PATCH] Bump versions --- etc/nginx/sites-enabled/mail | 8 ++++---- etc/nginx/sites-enabled/openpgpkey | 2 +- install_binaries.sh | 18 +++++++++--------- install_binaries_proxy.sh | 8 +++----- 4 files changed, 17 insertions(+), 19 deletions(-) diff --git a/etc/nginx/sites-enabled/mail b/etc/nginx/sites-enabled/mail index 5ea0cbe..9fdcfa0 100644 --- a/etc/nginx/sites-enabled/mail +++ b/etc/nginx/sites-enabled/mail @@ -28,13 +28,13 @@ server { add_header Cross-Origin-Opener-Policy same-origin always; add_header Cross-Origin-Resource-Policy same-origin always; include snippets/fastcgi-php.conf; - fastcgi_pass unix:/run/php/php8.2-fpm.sock; + fastcgi_pass unix:/run/php/php8.5-fpm.sock; expires off; } location ~ \.php$ { add_header Referrer-Policy no-referrer always; include snippets/fastcgi-php.conf; - fastcgi_pass unix:/run/php/php8.2-fpm.sock; + fastcgi_pass unix:/run/php/php8.5-fpm.sock; expires off; } } @@ -74,7 +74,7 @@ server { add_header Cross-Origin-Opener-Policy same-origin always; add_header Cross-Origin-Resource-Policy same-origin always; include snippets/fastcgi-php.conf; - fastcgi_pass unix:/run/php/php8.2-fpm.sock; + fastcgi_pass unix:/run/php/php8.5-fpm.sock; expires off; } location ~ \.php$ { @@ -82,7 +82,7 @@ server { add_header Onion-Location http://danielas3rtn54uwmofdo3x2bsdifr47huasnmbgqzfrec5ubupvtpid.onion$request_uri always; add_header Strict-Transport-Security "max-age=31536000; includeSubDomains; preload" always; include snippets/fastcgi-php.conf; - fastcgi_pass unix:/run/php/php8.2-fpm.sock; + fastcgi_pass unix:/run/php/php8.5-fpm.sock; expires off; } } diff --git a/etc/nginx/sites-enabled/openpgpkey b/etc/nginx/sites-enabled/openpgpkey index 9ec6587..540dcc7 100644 --- a/etc/nginx/sites-enabled/openpgpkey +++ b/etc/nginx/sites-enabled/openpgpkey @@ -12,7 +12,7 @@ server { rewrite /.well-known/openpgpkey/(.*)/hu /mail/openpgpkey_wkd.php?domain=$1 last; location ~ \.php$ { include snippets/fastcgi-php.conf; - fastcgi_pass unix:/run/php/php8.2-fpm.sock; + fastcgi_pass unix:/run/php/php8.5-fpm.sock; expires off; } ssl_certificate /etc/ssl/certs/ssl-cert-snakeoil.pem; diff --git a/install_binaries.sh b/install_binaries.sh index ac9b8fe..6224f18 100755 --- a/install_binaries.sh +++ b/install_binaries.sh @@ -8,10 +8,10 @@ workingdir=$(pwd) # install all required packages DEBIAN_FRONTEND=noninteractive apt-get update -DEBIAN_FRONTEND=noninteractive apt-get --no-install-recommends install -y apt-transport-tor bash-completion bind9 ca-certificates clamav-daemon clamav-freshclam curl dovecot-imapd dovecot-lmtpd dovecot-managesieved dovecot-mysql dovecot-pop3d dovecot-sieve git gnupg haveged iptables libnginx-mod-http-brotli-filter libsasl2-modules locales locales-all logrotate lsb-release lua-dbi-mysql lua-event lua-unbound mariadb-server mercurial nano nginx openssl patch php8.2-cli php8.2-curl php8.2-fpm php8.2-gd php8.2-gmp php8.2-gnupg php8.2-imap php8.2-intl php8.2-mbstring php8.2-mysql php8.2-pspell php8.2-readline php8.2-redis php8.2-tidy php8.2-uuid php8.2-xml php8.2-zip postfix postfix-mysql prosody redis rng-tools5 rspamd tor vim wget unzip wireguard wireguard-tools +DEBIAN_FRONTEND=noninteractive apt-get --no-install-recommends install -y apt-transport-tor bash-completion bind9 ca-certificates clamav-daemon clamav-freshclam curl dovecot-imapd dovecot-lmtpd dovecot-managesieved dovecot-mysql dovecot-pop3d dovecot-sieve git gnupg haveged iptables libnginx-mod-http-brotli-filter libsasl2-modules locales locales-all logrotate lsb-release lua-dbi-mysql lua-event lua-unbound mariadb-server mercurial nano nginx openssl patch php8.5-cli php8.5-curl php8.5-fpm php8.5-gd php8.5-gmp php8.5-gnupg php8.5-imap php8.5-intl php8.5-mbstring php8.5-mysql php8.5-pspell php8.5-readline php8.5-redis php8.5-tidy php8.5-uuid php8.5-xml php8.5-zip postfix postfix-mysql prosody redis rng-tools5 rspamd tor vim wget unzip wireguard wireguard-tools # install composer -curl -sSL https://github.com/composer/composer/releases/download/2.8.3/composer.phar > /usr/bin/composer +curl -sSL https://github.com/composer/composer/releases/download/2.10.3/composer.phar > /usr/bin/composer chmod +x /usr/bin/composer composer self-update @@ -64,7 +64,7 @@ if [ ! -e /var/www/mail/www/squirrelmail ]; then git clone https://github.com/RealityRipple/squirrelmail . mkdir -p /var/local/squirrelmail/data /var/local/squirrelmail/attach chown www-data:www-data -R /var/local/squirrelmail - cd $workingdir + cd "$workingdir" cp squirrelmail_config.php /var/www/mail/www/squirrelmail/config/config.php else cd /var/www/mail/www/squirrelmail @@ -77,7 +77,7 @@ if [ ! -e /var/www/mail/www/squirrelmail/plugins/check_quota/ ]; then wget https://www.squirrelmail.org/plugins/check_quota-2.2-1.4.0.tar.gz tar -zxf check_quota-2.2-1.4.0.tar.gz rm check_quota-2.2-1.4.0.tar.gz - cd $workingdir + cd "$workingdir" cp squirrelmail_plugin_hooks.php /var/www/mail/www/squirrelmail/config/plugin_hooks.php patch -p1 -d /var/www/html/mail/squirrelmail/plugins/check_quota/ < squirrelmail_check_quota.patch fi @@ -87,8 +87,8 @@ mkdir -p /var/www/mail/www/snappymail cd /var/www/mail/www/snappymail VERSION=$(curl -s https://api.github.com/repos/the-djmaze/snappymail/releases/latest | grep tag_name | cut -d '"' -f 4) wget https://github.com/the-djmaze/snappymail/releases/download/${VERSION}/snappymail-${VERSION:1}.zip -unzip -o snappymail-${VERSION:1}.zip -rm snappymail-${VERSION:1}.zip +unzip -o "snappymail-${VERSION:1}.zip" +rm "snappymail-${VERSION:1}.zip" mkdir -p /var/local/snappymail chown www-data:www-data -R /var/local/snappymail if [ ! -e include.php ]; then @@ -103,8 +103,8 @@ mkdir -p /srv/conversejs cd /srv/conversejs VERSION=$(curl -s https://api.github.com/repos/conversejs/converse.js/releases/latest | grep tag_name | cut -d '"' -f 4) wget https://github.com/conversejs/converse.js/releases/download/${VERSION}/converse.js-${VERSION:1}.tgz -tar xzf converse.js-${VERSION:1}.tgz --strip-components=1 -rm converse.js-${VERSION:1}.tgz +tar xzf "converse.js-${VERSION:1}.tgz" --strip-components=1 +rm "converse.js-${VERSION:1}.tgz" rm -f /etc/nginx/sites-enabled/default @@ -117,7 +117,7 @@ else fi # copy configuration file -cd $workingdir +cd "$workingdir" if [ ! -e /var/www/mail/common_config.php ]; then cp common_config.php /var/www/mail/ else diff --git a/install_binaries_proxy.sh b/install_binaries_proxy.sh index fd82161..935f531 100755 --- a/install_binaries_proxy.sh +++ b/install_binaries_proxy.sh @@ -8,10 +8,8 @@ DEBIAN_FRONTEND=noninteractive apt-get update DEBIAN_FRONTEND=noninteractive apt-get --no-install-recommends install -y bash-completion bind9 ca-certificates coturn curl git gnupg haveged iptables libnginx-mod-stream libnginx-mod-http-brotli-filter libsasl2-modules logrotate lsb-release nano nginx openssl postfix postfix-mysql postfix-mta-sts-resolver rng-tools5 vim wget wireguard wireguard-tools # dhparams -for file in /etc/nginx/dh4096.pem; do - if [ ! -e "$file" ]; then - openssl dhparam -out "$file" 4096 - fi -done +if [ ! -e "/etc/nginx/dh4096.pem" ]; then + openssl dhparam -out "/etc/nginx/dh4096.pem" 4096 +fi rm -f /etc/nginx/sites-enabled/default