From d50edd778b2d7caf22b5acd9e8fc4b8d05e75f39 Mon Sep 17 00:00:00 2001
From: Marek Miklewicz <marek@miklewicz.pl>
Date: Sun, 30 Mar 2025 22:22:18 +0200
Subject: [PATCH] Update dapostinstall.sh

---
 dapostinstall.sh | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/dapostinstall.sh b/dapostinstall.sh
index 4b93c71..631573f 100755
--- a/dapostinstall.sh
+++ b/dapostinstall.sh
@@ -135,21 +135,18 @@ sed -i "s/,22,/,22,10022,/g" /etc/csf/csf.conf
 
 echo "Ustawienie dodatkowych zabezpieczen SSH"
 
-tee -a /etc/ssh/sshd_config > /dev/null <<EOT
-Match User root Address 185.242.134.0/24,185.242.133.37,185.242.134.92,185.242.134.93,193.177.165.192,193.177.165.193,193.177.165.194,193.177.165.195,193.177.165.196
-PubkeyAuthentication yes
-PasswordAuthentication yes
-PermitRootLogin yes
-EOT
+if ! grep -q '^Match User root' /etc/ssh/sshd_config; then
+  daupdate secssh
+fi
 
 echo "Ustawienie kluczy logowania do DirectAdmina i kluczy SSH hitme"
 
-daupdate klucze
-
-if ! grep -q '^Match User root' /etc/ssh/sshd_config; then
+if ! grep -Fq '185.242.134.92' /root/.ssh/authorized_keys; then
   daupdate keyput
 fi
 
+daupdate klucze
+
 cd $DAPOSTINSTALL_DIR
 
 echo "Instalacja Modsecurity i regułek malware experts"