Skip to content

Commit b68df3b

Browse files
authored
Fix bug in v-add-letsencrypt-domain hestiacp#2563 (hestiacp#2744)
* Replace search_objects with an better method getting SSL_HOME var If LE was enabled for multiple domains under the same users search_objects could return multiple times "same same same " Replacing it with get_object_value should solve the issue * Add test for it
1 parent 27e4f89 commit b68df3b

File tree

2 files changed

+13
-1
lines changed

2 files changed

+13
-1
lines changed

bin/v-add-letsencrypt-domain

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -520,7 +520,7 @@ fi
520520

521521
# Adding SSL
522522
if [ -z "$mail" ]; then
523-
ssl_home=$(search_objects 'web' 'LETSENCRYPT' 'yes' 'SSL_HOME')
523+
ssl_home="$(get_object_value 'web' 'DOMAIN' "$domain" '$SSL_HOME')"
524524
ssl_enabled="$(get_object_value 'web' 'DOMAIN' "$domain" '$SSL')"
525525
if [ "$ssl_enabled" = "yes" ]; then
526526
$BIN/v-update-web-domain-ssl "$user" "$domain" "$ssl_dir" "$ssl_home" "updatessl"

test/letsencrypt.bats

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,24 @@ function setup() {
3838
refute_output
3939
}
4040

41+
@test "[ Web ] Create 2nd web domain" {
42+
run v-add-web-domain $user "hestia.$domain" $ip yes
43+
assert_success
44+
refute_output
45+
}
46+
4147
@test "[ Web ] Request new certificate for web domain" {
4248
run v-add-letsencrypt-domain $user $domain "www.$domain,renewal.$domain,foobar.$domain,bar.$domain"
4349
assert_success
4450
refute_output
4551
}
4652

53+
@test "[ Web ] Request 2nd new certificate for web domain" {
54+
run v-add-letsencrypt-domain $user "hestia.$domain"
55+
assert_success
56+
refute_output
57+
}
58+
4759
@test "[ Mail ] Create mail domain" {
4860
run v-add-mail-domain $user $domain
4961
assert_success

0 commit comments

Comments
 (0)