marek-miklewicz/dapostinstall
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use DirectAdmin server_cert for hostname certificate

Browse Source
This commit is contained in:
Marek Miklewicz
2026-06-13 21:15:07 +02:00
parent bd6c5925d3
commit 678cbc9066
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dapostinstall.sh
+3 -6
View File
@@ -134,13 +134,10 @@ install_local_plugins() {
} }
request_directadmin_certificate() { request_directadmin_certificate() {
local da_hostname echo "Instalacja certyfikatu Let's Encrypt dla hostname DirectAdmin"
da_hostname="$(hostname)" if ! "$DADIR/scripts/letsencrypt.sh" server_cert; then
echo "Instalacja certyfikatu Let's Encrypt dla $da_hostname" echo "Nie udalo sie wystawic certyfikatu DirectAdmin dla hostname - pomijam ten krok."
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." echo "Sprawdz hostname/servername w DirectAdmin oraz DNS i uruchom Let's Encrypt recznie po instalacji."
fi fi
} }
tests/quality_checks.sh
+2
View File
@@ -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" '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" '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_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_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\(\) \{$'