Merge branch 'main' of https://github.com/marsonpl/dapostinstall

dapostinstall.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# VERSION 1.5-03.06.2023
+# VERSION 1.6-04.06.2023
 DAPOSTINSTALL_DIR=/opt/dapostinstall
 DADIR=/usr/local/directadmin
 CBDIR=/usr/local/directadmin/custombuild
@@ -341,9 +341,15 @@ echo -e "\e[96mMam wszystkie informacje - rozpoczynam konfiguracje\e[0m"
 
 echo "Generowanie maila powitalnego"
 
-DA_ADMINPASS=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 8 | head -n 1)
 cd $DAPOSTINSTALL_DIR
 chmod 755 da_cli.sh
+
+echo "Generowanie hasla DirectAdmin"
+
+min_length=8
+max_length=18
+DA_ADMINPASS=$(tr -dc '[:alnum:]' < /dev/urandom | fold -w "$((RANDOM % (max_length - min_length + 1) + min_length))" | grep -E '[[:digit:]]' | grep -E '[[:upper:]]' | head -n 1)
+
 DA_OPTIONSCONF=$CBDIR/options.conf
 DA_USERCONF=$DADIR/data/users/admin/user.conf
 DA_HOSTNAME=$(hostname -f)
@@ -355,6 +361,7 @@ DA_PHP2=`cat $DA_OPTIONSCONF | grep php2_release= | cut -d= -f2`
 DA_PHP3=`cat $DA_OPTIONSCONF | grep php3_release= | cut -d= -f2`
 DA_PHP4=`cat $DA_OPTIONSCONF | grep php4_release= | cut -d= -f2`
 sed -i 's/DA_HOSTNAME/'"$DA_HOSTNAME"'/g' mail_powitalny.txt
+sed -i 's/DA_HOSTNAME/'"$DA_HOSTNAME"'/g' options.conf
 sed -i 's/DA_IP/'"$DA_IP"'/g' mail_powitalny.txt
 sed -i 's/DA_NS1/'"$DA_NS1"'/g' mail_powitalny.txt
 sed -i 's/DA_NS2/'"$DA_NS2"'/g' mail_powitalny.txt
@@ -364,7 +371,7 @@ sed -i 's/DA_PHP1/'"$DA_PHP1"'/g' mail_powitalny.txt
 sed -i 's/DA_PHP2/'"$DA_PHP2"'/g' mail_powitalny.txt
 sed -i 's/DA_PHP3/'"$DA_PHP3"'/g' mail_powitalny.txt
 sed -i 's/DA_PHP4/'"$DA_PHP4"'/g' mail_powitalny.txt
-cp mail_powitalny.txt /opt
+mv mail_powitalny.txt /root
 
 echo "instalacja SpamBlocker"
 cd $CBDIR
@@ -564,6 +571,9 @@ echo "PS1='\[\e[0;1;38;5;46m\]\u\[\e[0m\]@\[\e[0;1;38;5;214m\]\h\[\e[0m\][\[\e[0
 echo "dodanie kolorowego prompta dla roota"
 echo "PS1='\[\e[0;1;91m\]\u\[\e[0m\]@\[\e[0;1;38;5;214m\]\h\[\e[0m\][\[\e[0;1;97m\]\W\[\e[0m\]]\[\e[0;1m\]# \[\e[0m\]'" | sudo tee -a /root/.bash_profile
 
+echo "never_commands=custombuild:updates:license" >> /usr/local/directadmin/conf/directadmin.conf
+systemctl restart directadmin
+
 cd $DAPOSTINSTALL_DIR
 echo "dodaje JIT dla PHP"
 sh php_zmienne.sh
@@ -575,7 +585,7 @@ sh da_cli.sh changeuserpass admin $DA_ADMINPASS
 
 
 clear
-echo -e "\e[92mKonfiguracja zakonczona - usuwam pliki tymczasowe - tekst powitalny z uzupelnionymi odpowiednimi danymi znajdziesz w /opt/mail_powitalny.txt\e[0m"
+echo -e "\e[92mKonfiguracja zakonczona - usuwam pliki tymczasowe - tekst powitalny z uzupelnionymi odpowiednimi danymi znajdziesz w /root/mail_powitalny.txt\e[0m"
 cd ~
 exec >/dev/null 2>&1
 rm -rf $DAPOSTINSTALL_DIR

options.conf

@@ -0,0 +1,96 @@
+# PHP Settings
+php1_release=8.1
+php1_mode=php-fpm
+php2_release=8.2
+php2_mode=php-fpm
+php3_release=7.4
+php3_mode=php-fpm
+php4_release=5.6
+php4_mode=php-fpm
+secure_php=yes
+php_ini=no
+php_timezone=Europe/Warsaw
+php_ini_type=production
+x_mail_header=yes
+
+# MySQL Settings
+mysql=8.0
+mariadb=10.5
+mysql_inst=mariadb
+mysql_backup=yes
+mysql_backup_gzip=no
+mysql_backup_dir=/usr/local/directadmin/custombuild/mysql_backups
+mysql_force_compile=no
+
+# WEB Server Settings
+unit=no
+webserver=apache
+http_methods=ALL
+litespeed_serialno=trial
+modsecurity=yes
+apache_mpm=auto
+mod_ruid2=no
+userdir_access=no
+harden_symlinks_patch=yes
+use_hostname_for_alias=no
+redirect_host=DA_HOSTNAME
+redirect_host_https=no
+
+# WEB Applications Settings
+phpmyadmin=yes
+phpmyadmin_public=no
+squirrelmail=no
+roundcube=yes
+webapps_inbox_prefix=no
+
+# ClamAV-related Settings
+clamav=no
+clamav_exim=yes
+modsecurity_uploadscan=no
+proftpd_uploadscan=no
+pureftpd_uploadscan=no
+suhosin_php_uploadscan=no
+
+# Mail Settings
+exim=yes
+eximconf=yes
+blockcracking=yes
+easy_spam_fighter=yes
+spamd=spamassassin
+sa_update=daily
+dovecot=yes
+dovecot_conf=yes
+mail_compress=no
+pigeonhole=yes
+
+# FTP Settings
+ftpd=proftpd
+
+# Statistics Settings
+awstats=no
+webalizer=yes
+
+# CustomBuild Settings
+bold=yes
+clean=yes
+clean_old_tarballs=yes
+clean_old_webapps=yes
+
+# Cronjob Settings
+cron=yes
+cron_frequency=daily
+email=email@domain.com
+notifications=no
+updates=no
+webapps_updates=no
+
+# CloudLinux Settings
+cloudlinux=no
+cagefs=no
+
+# Advanced Settings
+csf=yes
+ssl_configuration=intermediate
+redis=no
+
+modsecurity_ruleset=none