From 678cbc9066d24f7f916acb581acc1041d6cea86a Mon Sep 17 00:00:00 2001 From: Marek Miklewicz Date: Sat, 13 Jun 2026 21:15:07 +0200 Subject: [PATCH] Use DirectAdmin server_cert for hostname certificate --- dapostinstall.sh | 9 +++------ tests/quality_checks.sh | 2 ++ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dapostinstall.sh b/dapostinstall.sh index 03aaf82..329ed4a 100755 --- a/dapostinstall.sh +++ b/dapostinstall.sh @@ -134,13 +134,10 @@ install_local_plugins() { } request_directadmin_certificate() { - local da_hostname + echo "Instalacja certyfikatu Let's Encrypt dla hostname DirectAdmin" - 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." + if ! "$DADIR/scripts/letsencrypt.sh" server_cert; then + echo "Nie udalo sie wystawic certyfikatu DirectAdmin dla hostname - pomijam ten krok." echo "Sprawdz hostname/servername w DirectAdmin oraz DNS i uruchom Let's Encrypt recznie po instalacji." fi } diff --git a/tests/quality_checks.sh b/tests/quality_checks.sh index aaf00c7..0b5eaec 100644 --- a/tests/quality_checks.sh +++ b/tests/quality_checks.sh @@ -175,7 +175,9 @@ 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" "s/evolution/enhanced" assert_file_contains "$ROOT_DIR/dapostinstall.sh" 'request_directadmin_certificate\(\)' +assert_file_contains "$ROOT_DIR/dapostinstall.sh" 'letsencrypt\.sh" server_cert' assert_file_contains "$ROOT_DIR/dapostinstall.sh" 'Nie udalo sie wystawic certyfikatu DirectAdmin' +assert_file_not_contains "$ROOT_DIR/dapostinstall.sh" 'request_single "\$da_hostname" 4096' 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" '^install_local_plugin_archive\(\) \{$'