From 7eecc175f4ef0eeedfc16c38b1c4fbdc028e0463 Mon Sep 17 00:00:00 2001
From: Marek Miklewicz <86836305+marsonpl@users.noreply.github.com>
Date: Fri, 13 May 2022 21:57:36 +0200
Subject: [PATCH] Update dapostinstall.sh

---
 dapostinstall.sh | 55 +++++++++++++++++++++++++++---------------------
 1 file changed, 31 insertions(+), 24 deletions(-)

diff --git a/dapostinstall.sh b/dapostinstall.sh
index 34584dd..7a2932d 100644
--- a/dapostinstall.sh
+++ b/dapostinstall.sh
@@ -7,13 +7,6 @@ chmod 700 $DAPOSTINSTALL_DIR/daupdate.sh
 cd /opt/
 sh daupdate.sh update
 cd $DAPOSTINSTALL_DIR
-echo "Tworzenie domyslnego pakietu"
-mkdir -p /usr/local/directadmin/data/users/admin/packages/
-mkdir -p /usr/local/directadmin/data/users/admin/packages
-\cp -r NO-LIMIT.pkg /usr/local/directadmin/data/users/admin/packages
-chmod 600 /usr/local/directadmin/data/users/admin/packages.list
-echo "NO-LIMIT" > /usr/local/directadmin/data/users/admin/packages.list
-chown -R diradmin:diradmin /usr/local/directadmin/data/users/admin/packages*
 clear
 
 read -p "Podaj adres NS1 [dns3.hitme.net.pl]: " NS1_DEFAULT
@@ -89,23 +82,6 @@ esac
 
 done
 
-echo "Certyfikat SSL dla DirectAdmina"
-
-while true; do
-
-read -p "Czy instalowac Let's Encrypt dla DirectAdmina dla hostname `hostname` (T/N)? " yn
-
-case $yn in
-        [Tt] ) echo "Instaluje Let's encrypt"
-                /usr/local/directadmin/scripts/letsencrypt.sh request_single `hostname` 4096
-                break;;
-        [nN] ) echo "Pomijam instalacje Let's Encrypt";
-                break;;
-        * ) echo "Niewlasciwa odpowiedz";;
-esac
-
-done
-
 echo "Instalacja ModSecurity"
 
 while true; do
@@ -127,6 +103,13 @@ esac
 done
 
 cd $DAPOSTINSTALL_DIR
+echo "Tworzenie domyslnego pakietu"
+mkdir -p /usr/local/directadmin/data/users/admin/packages/
+mkdir -p /usr/local/directadmin/data/users/admin/packages
+\cp -r NO-LIMIT.pkg /usr/local/directadmin/data/users/admin/packages
+chmod 600 /usr/local/directadmin/data/users/admin/packages.list
+echo "NO-LIMIT" > /usr/local/directadmin/data/users/admin/packages.list
+chown -R diradmin:diradmin /usr/local/directadmin/data/users/admin/packages*
 echo "Instalacja spolszczenia DirectAdmina"
 echo "language=pl" >> /usr/local/directadmin/conf/directadmin.conf
 sed -i 's/language=en/language=pl/gI' /usr/local/directadmin/data/users/admin/user.conf
@@ -207,6 +190,26 @@ esac
 
 done
 
+echo "Certyfikat SSL dla DirectAdmina"
+
+while true; do
+
+read -p "Czy instalowac Let's Encrypt dla DirectAdmina dla hostname `hostname` (T/N)? " yn
+
+case $yn in
+        [Tt] ) echo "Instaluje Let's encrypt"
+                /usr/local/directadmin/scripts/letsencrypt.sh request_single `hostname` 4096
+                break;;
+        [nN] ) echo "Pomijam instalacje Let's Encrypt";
+                break;;
+        * ) echo "Niewlasciwa odpowiedz";;
+esac
+
+done
+
+echo -e "\e[96mMam wszystkie informacje - rozpoczynam konfiguracje\e[0m"
+
+
 echo "instalacja SpamBlocker"
 cd /usr/local/directadmin/custombuild
 ./build update
@@ -355,6 +358,10 @@ cd $DAPOSTINSTALL_DIR
 daupdate rblda_full
 cd /opt
 sh /opt/daupdate bbmysql
+\cp csfcf.sh /opt/csfcf.sh
+chmod 700 /opt/csfcf.sh
+sh /opt/csfcf.sh
+echo "20 0 * * * sh /opt/csfcf.sh > /dev/null 2>&1" >>/var/spool/cron/root
 
 
 systemctl restart sshd