Do not abort when DA certificate request fails

This commit is contained in:
Marek Miklewicz
2026-06-13 21:08:46 +02:00
parent 091ac31dee
commit bd6c5925d3
2 changed files with 16 additions and 2 deletions
+13 -2
View File
@@ -133,6 +133,18 @@ install_local_plugins() {
fi fi
} }
request_directadmin_certificate() {
local da_hostname
da_hostname="$(hostname)"
echo "Instalacja certyfikatu Let's Encrypt dla $da_hostname"
if ! "$DADIR/scripts/letsencrypt.sh" request_single "$da_hostname" 4096; then
echo "Nie udalo sie wystawic certyfikatu DirectAdmin dla $da_hostname - pomijam ten krok."
echo "Sprawdz hostname/servername w DirectAdmin oraz DNS i uruchom Let's Encrypt recznie po instalacji."
fi
}
update_daupdate_tools() { update_daupdate_tools() {
echo "update..." echo "update..."
wget "$HTLINK/daupdate.sh" -O /sbin/daupdate wget "$HTLINK/daupdate.sh" -O /sbin/daupdate
@@ -290,8 +302,7 @@ echo "Instalacja Security headers"
da build rewrite_confs da build rewrite_confs
cd $DAPOSTINSTALL_DIR cd $DAPOSTINSTALL_DIR
echo "Instalacja certyfikatu Let's Encrypt" request_directadmin_certificate
$DADIR/scripts/letsencrypt.sh request_single `hostname` 4096
echo -e "\e[96mMam wszystkie informacje - rozpoczynam konfiguracje\e[0m" echo -e "\e[96mMam wszystkie informacje - rozpoczynam konfiguracje\e[0m"
+3
View File
@@ -174,6 +174,9 @@ assert_file_not_contains "$ROOT_DIR/dapostinstall.sh" 'Podaj adres NS'
assert_file_not_contains "$ROOT_DIR/dapostinstall.sh" 'Jaka skorke ustawic' assert_file_not_contains "$ROOT_DIR/dapostinstall.sh" 'Jaka skorke ustawic'
assert_file_not_contains "$ROOT_DIR/dapostinstall.sh" 'Wybierz tryb instalacji' assert_file_not_contains "$ROOT_DIR/dapostinstall.sh" 'Wybierz tryb instalacji'
assert_file_not_contains "$ROOT_DIR/dapostinstall.sh" "s/evolution/enhanced" assert_file_not_contains "$ROOT_DIR/dapostinstall.sh" "s/evolution/enhanced"
assert_file_contains "$ROOT_DIR/dapostinstall.sh" 'request_directadmin_certificate\(\)'
assert_file_contains "$ROOT_DIR/dapostinstall.sh" 'Nie udalo sie wystawic certyfikatu DirectAdmin'
assert_file_not_contains "$ROOT_DIR/dapostinstall.sh" 'request_single `hostname`'
assert_file_contains "$ROOT_DIR/dapostinstall.sh" 'Skorka evolution zostala ustawiona jako domyslna' assert_file_contains "$ROOT_DIR/dapostinstall.sh" 'Skorka evolution zostala ustawiona jako domyslna'
assert_file_contains "$ROOT_DIR/dapostinstall.sh" '^install_local_plugin_archive\(\) \{$' assert_file_contains "$ROOT_DIR/dapostinstall.sh" '^install_local_plugin_archive\(\) \{$'
assert_file_contains "$ROOT_DIR/dapostinstall.sh" 'local found=0' assert_file_contains "$ROOT_DIR/dapostinstall.sh" 'local found=0'