From f453c44d524b68a3a99f567168dd401f88556633 Mon Sep 17 00:00:00 2001 From: darren Date: Fri, 30 Aug 2024 11:26:05 -0700 Subject: [PATCH 1/2] Update setup to handle multiple SSH ports (#2437) This PR addresses an issue reported in the mailinabox Slack channel where a system had sshd configured to listen on two ports. Co-authored-by: Darren Sanders --- setup/system.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/setup/system.sh b/setup/system.sh index fac50df7..b8d65608 100755 --- a/setup/system.sh +++ b/setup/system.sh @@ -270,14 +270,14 @@ if [ -z "${DISABLE_FIREWALL:-}" ]; then # ssh might be running on an alternate port. Use sshd -T to dump sshd's #NODOC # settings, find the port it is supposedly running on, and open that port #NODOC # too. #NODOC - SSH_PORT=$(sshd -T 2>/dev/null | grep "^port " | sed "s/port //") #NODOC + SSH_PORT=$(sshd -T 2>/dev/null | grep "^port " | sed "s/port //" | tr '\n' ' ') #NODOC if [ -n "$SSH_PORT" ]; then - if [ "$SSH_PORT" != "22" ]; then - - echo "Opening alternate SSH port $SSH_PORT." #NODOC - ufw_limit "$SSH_PORT" #NODOC - - fi + for $port in $SSH_PORT; do + if [ "$port" != "22" ]; then + echo "Opening alternate SSH port $port." #NODOC + ufw_limit "$port" #NODOC + fi + done fi ufw --force enable; From 3b8f4a2fe8bd686f9d3ff405d9bb380c3c6315a8 Mon Sep 17 00:00:00 2001 From: matidau <65836048+matidau@users.noreply.github.com> Date: Sat, 31 Aug 2024 04:27:44 +1000 Subject: [PATCH 2/2] Z-Push remove config lines no longer supported (#2433) --- setup/zpush.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/setup/zpush.sh b/setup/zpush.sh index 3b14c047..a5538d70 100755 --- a/setup/zpush.sh +++ b/setup/zpush.sh @@ -57,8 +57,6 @@ fi sed -i "s^define('TIMEZONE', .*^define('TIMEZONE', '$(cat /etc/timezone)');^" /usr/local/lib/z-push/config.php sed -i "s/define('BACKEND_PROVIDER', .*/define('BACKEND_PROVIDER', 'BackendCombined');/" /usr/local/lib/z-push/config.php sed -i "s/define('USE_FULLEMAIL_FOR_LOGIN', .*/define('USE_FULLEMAIL_FOR_LOGIN', true);/" /usr/local/lib/z-push/config.php -sed -i "s/define('LOG_MEMORY_PROFILER', .*/define('LOG_MEMORY_PROFILER', false);/" /usr/local/lib/z-push/config.php -sed -i "s/define('BUG68532FIXED', .*/define('BUG68532FIXED', false);/" /usr/local/lib/z-push/config.php sed -i "s/define('LOGLEVEL', .*/define('LOGLEVEL', LOGLEVEL_ERROR);/" /usr/local/lib/z-push/config.php # Configure BACKEND