Update directadmin configuration settings

Add restrictions for CustomBuild plugin access and update username length.

dapostinstall.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# VERSION 1.6.6-30.03.2025
+# VERSION 1.7.8-10.04.2025
 if [ -f "/var/log/dapostinstall.done" ]; then
     echo -e "\e[31mSkrypt DApostinstall był już uruchomiony na tym serwerze - przerywam działanie.\e[0m"
     exit 1
@@ -138,6 +138,8 @@ echo "Ustawienie dodatkowych zabezpieczen SSH"
 if ! grep -q '^Match User root' /etc/ssh/sshd_config; then
   daupdate secssh2
 fi
+echo "Dodanie autoryzacji hasłem"
+sed -i 's/PasswordAuthentication no/PasswordAuthentication yes/g' /etc/ssh/sshd_config
 
 echo "Ustawienie kluczy logowania do DirectAdmina i kluczy SSH hitme"
 
@@ -386,13 +388,21 @@ DA_ADMINPASS=$(
 DA_OPTIONSCONF=$CBDIR/options.conf
 DA_USERCONF=$DADIR/data/users/admin/user.conf
 DA_HOSTNAME=$(hostname -f)
-DA_IP=`cat $DA_USERCONF | grep ip= | cut -d= -f2`
+
-DA_NS1=`cat $DA_USERCONF | grep ns1= | cut -d= -f2`
+DA_IP=$(cat "$DA_USERCONF" | grep 'ip='  | cut -d= -f2)
-DA_NS2=`cat $DA_USERCONF | grep ns1= | cut -d= -f2`
+DA_NS1=$(cat "$DA_USERCONF" | grep 'ns1=' | cut -d= -f2)
-DA_PHP1=`cat $DA_OPTIONSCONF | grep php1_release= | cut -d= -f2`
+DA_NS2=$(cat "$DA_USERCONF" | grep 'ns2=' | cut -d= -f2)
-DA_PHP2=`cat $DA_OPTIONSCONF | grep php2_release= | cut -d= -f2`
+
-DA_PHP3=`cat $DA_OPTIONSCONF | grep php3_release= | cut -d= -f2`
+DA_PHP1=$(cat "$DA_OPTIONSCONF" | grep 'php1_release=' | cut -d= -f2)
-DA_PHP4=`cat $DA_OPTIONSCONF | grep php4_release= | cut -d= -f2`
+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)
+DA_PHP5=$(cat "$DA_OPTIONSCONF" | grep 'php5_release=' | cut -d= -f2)
+DA_PHP6=$(cat "$DA_OPTIONSCONF" | grep 'php6_release=' | cut -d= -f2)
+DA_PHP7=$(cat "$DA_OPTIONSCONF" | grep 'php7_release=' | cut -d= -f2)
+DA_PHP8=$(cat "$DA_OPTIONSCONF" | grep 'php8_release=' | cut -d= -f2)
+DA_PHP9=$(cat "$DA_OPTIONSCONF" | grep 'php9_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
@@ -400,12 +410,20 @@ sed -i 's/DA_NS1/'"$DA_NS1"'/g' mail_powitalny.txt
 sed -i 's/DA_NS2/'"$DA_NS2"'/g' mail_powitalny.txt
 sed -i 's/DA_HASLO/'"$DA_ADMINPASS"'/g' mail_powitalny.txt
 sed -i 's/SSH_PORT/'"$SSH_PORT"'/g' mail_powitalny.txt
+
 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
+sed -i 's/DA_PHP5/'"$DA_PHP5"'/g' mail_powitalny.txt
+sed -i 's/DA_PHP6/'"$DA_PHP6"'/g' mail_powitalny.txt
+sed -i 's/DA_PHP7/'"$DA_PHP7"'/g' mail_powitalny.txt
+sed -i 's/DA_PHP8/'"$DA_PHP8"'/g' mail_powitalny.txt
+sed -i 's/DA_PHP9/'"$DA_PHP9"'/g' mail_powitalny.txt
+
 mv mail_powitalny.txt /root
 
+
 echo "instalacja SpamBlocker"
 cd $CBDIR
 ./build update
@@ -422,6 +440,9 @@ cd $CBDIR
 ./build update
 ./build exim_conf
 
+systemctl enable spamassassin
+systemctl restart spamd
+
 echo "Dodanie SpamAssassin dla wszystkich uzytkownikow"
 
 cd $DAPOSTINSTALL_DIR
@@ -436,6 +457,9 @@ cp spam_assassin_all_users_on.sh $DADIR/scripts/custom/
 chmod 755 $DADIR/scripts/custom/spam_assassin_all_users_on.sh
 $DADIR/scripts/custom/spam_assassin_all_users_on.sh
 
+echo "Dodawanie ustawoeń PHP"
+bash php_settings.sh
+
 echo "Naprawa komunikacji URIBL"
 
 echo "dns_server 127.0.0.1 # Naprawa zapytan URIBL i DNSWL" >> /etc/mail/spamassassin/local.cf
@@ -468,13 +492,6 @@ systemctl restart directadmin
 
 cd $DAPOSTINSTALL_DIR
 
-echo "Naprawa PhpMyAdmin"
-cd $DAPOSTINSTALL_DIR
-chmod 755 fix_phpmyadmin.sh
-./fix_phpmyadmin.sh
-cd $DAPOSTINSTALL_DIR
-
-
 echo "Automatyczna konfiguracja Thunderbirda"
 mkdir -p /var/www/html/.well-known/autoconfig/mail/
 da config-set mail_autoconfig 0
@@ -535,18 +552,6 @@ cd $DAPOSTINSTALL_DIR
 \cp -f my.cnf /etc/my.cnf
 systemctl restart mysqld
 
-
-echo "Dodawanie subdomeny poczta do kazdej domeny"
-
-mkdir -p $DADIR/data/templates/custom/
-\cp virtual_host2.conf.CUSTOM.4.post $DADIR/data/templates/custom/virtual_host2.conf.CUSTOM.4.post
-\cp virtual_host2_secure.conf.CUSTOM.4.post $DADIR/data/templates/custom/virtual_host2_secure.conf.CUSTOM.4.post
-echo "action=rewrite&value=httpd" >> $DADIR/data/task.queue
-cd $DADIR/data/templates
-cp dns_a.conf custom/
-cd custom
-sed -i '/pop/i poczta=|IP|' $DADIR/data/templates/custom/dns_a.conf
-
 echo "Instalacja bezpiecznego DMARC"
 
 cd $DADIR/data/templates/custom
@@ -592,10 +597,6 @@ touch /etc/ssh/sshd_config_placebo
 sed -i 's^/etc/ssh/sshd_config^/etc/ssh/sshd_config_placebo^g' $DADIR/conf/directadmin.conf
 systemctl restart directadmin
 
-echo "Instalacja NetData"
-cd $CBDIR
-./build netdata
-
 echo "Instalacja REDISa"
 cd $DADIR/scripts/custom
 ./php-extension.sh install redis
@@ -615,8 +616,10 @@ cp lang_pl.php $DADIR/plugins/imapsync/lang
 
 echo "instalacja promptów"
 sh prompt.sh
-
+echo "Blokada dostępu do pluginu CustomBuild i informacjach o licencji"
 echo "never_commands=custombuild:updates:license" >> /usr/local/directadmin/conf/directadmin.conf
+echo "wydłużenie dopuszczalnej długości nazwy użytkownika do 14 znaków"
+echo "max_username_length=14" >> /usr/local/directadmin/conf/directadmin.conf
 systemctl restart directadmin
 rm -rf /usr/local/directadmin/data/users/skin*
 da build rewrite_confs
@@ -624,7 +627,6 @@ da build rewrite_confs
 cd $DAPOSTINSTALL_DIR
 echo "dodaje JIT dla PHP"
 sh php_zmienne.sh
-sh da_cli.sh disablenamed
 sh da_cli.sh disablemultiserverpage
 sh da_cli.sh disablecreateadmin
 sh da_cli.sh changeuserpass admin $DA_ADMINPASS

mail_powitalny.txt

@@ -55,6 +55,11 @@ PHP DA_PHP1 (domyślna)
 PHP DA_PHP2
 PHP DA_PHP3
 PHP DA_PHP4
+PHP DA_PHP5
+PHP DA_PHP6
+PHP DA_PHP7
+PHP DA_PHP8
+PHP DA_PHP9
 Zmiana domyślnej wersji PHP możliwa jest dla każdej domeny z poziomu panelu DirectAdmin zgodnie z poradnikiem pod adresem: https://wiki.hitme.pl/pomoc/hosting-dedykowany/php/zmiana-wersji-php-w-panelu-directadmin/
 
 Jeśli potrzebna jest inna wersja PHP prosimy o kontakt z naszym supportem.

php_settings.sh

@@ -0,0 +1,79 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+mapfile -t PHP_INI_DIRS < <(compgen -G "/usr/local/php*/lib/php.conf.d" || true)
+
+if [[ ${#PHP_INI_DIRS[@]} -eq 0 ]]; then
+  echo "Brak katalogów /usr/local/phpXX/lib/php.conf.d do przetworzenia." >&2
+  exit 1
+fi
+
+for dir in "${PHP_INI_DIRS[@]}"; do
+  [[ -d "$dir" ]] || continue
+
+  php_tag="$(basename "$(dirname "$(dirname "$dir")")")"
+  num="${php_tag#php}"
+  major="${num:0:1}"
+
+  read -r -d '' OPCACHE_BLOCK <<'OPC_END' || true
+[opcache]
+opcache.enable=1
+opcache.enable_cli=0
+opcache.memory_consumption=256
+opcache.interned_strings_buffer=32
+opcache.max_accelerated_files=16229
+opcache.max_wasted_percentage=10
+opcache.revalidate_freq=10
+opcache.fast_shutdown=1
+opcache.enable_file_override=0
+opcache.max_file_size=0
+opcache.validate_timestamps=1
+opcache.revalidate_path=0
+OPC_END
+
+  JIT_BLOCK=""
+  if [[ "$major" -ge 8 ]]; then
+    JIT_BLOCK=$'opcache.jit_buffer_size=256M\nopcache.jit=1255\n'
+  fi
+
+  target="${dir}/20-hitme.ini"
+  echo "Tworzę ${target}"
+
+  cat >"$target" <<INI
+[Date]
+date.timezone = Europe/Warsaw
+
+[Session]
+session.auto_start = Off
+
+[PHP]
+short_open_tag = Off
+display_errors = Off
+
+magic_quotes_gpc = off
+memory_limit = 512M
+max_execution_time = 1500
+max_input_time = 1500
+upload_max_filesize = 512M
+post_max_size = 512M
+max_input_vars = 100000
+allow_url_fopen = on
+
+${OPCACHE_BLOCK}
+${JIT_BLOCK}
+INI
+
+done
+
+echo "Przebudowuję konfiguracje Apache/PHP w DirectAdmin..."
+
+if command -v da >/dev/null 2>&1; then
+  da build rewrite_confs
+elif [[ -x /usr/local/directadmin/custombuild/build ]]; then
+  /usr/local/directadmin/custombuild/build rewrite_confs
+else
+  echo "Nie znaleziono polecenia build rewrite_confs" >&2
+  exit 2
+fi
+
+echo "Gotowe."