Skip to content

Commit 923a548

Browse files
authored
Resovle error cast with update (hestiacp#2748)
* Resovle error cast with update * Update drone file
1 parent b72912e commit 923a548

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

.drone.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,13 @@ steps:
3737
- bats ./test/config-tests.bats
3838

3939
trigger:
40-
event: [ push ]
40+
event: [ pull_request, push ]
4141
ref:
4242
- refs/heads/staging/*
4343
- refs/heads/beta
4444
- refs/heads/release
4545
- refs/heads/main
46+
- refs/pull/*/head
4647

4748
---
4849
kind: pipeline
@@ -172,4 +173,4 @@ trigger:
172173

173174
---
174175
kind: signature
175-
hmac: 7230bb266287ae102167d451696407325a40c7b5001df0118d99ee3b9891e853
176+
hmac: a191a477aa337f2efff534022164906ff20ef2b6340ec808d128c09a06d7eaa3

bin/v-add-letsencrypt-domain

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -523,17 +523,17 @@ if [ -z "$mail" ]; then
523523
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
526-
$BIN/v-update-web-domain-ssl "$user" "$domain" "$ssl_dir" "$ssl_home" "updatessl"
526+
$BIN/v-update-web-domain-ssl "$user" "$domain" "$ssl_dir" "updatessl"
527527
else
528528
$BIN/v-add-web-domain-ssl "$user" "$domain" "$ssl_dir" "$ssl_home" "updatessl"
529529
fi
530530
else
531531
# TODO replace with v-update-mail-domain-ssl if ssl is enabled
532532
ssl_enabled="$(get_object_value 'mail' 'DOMAIN' "$root_domain" '$SSL')"
533533
if [ "$ssl_enabled" = "yes" ]; then
534-
$BIN/v-update-mail-domain-ssl "$user" "$root_domain" "$ssl_dir" "$ssl_home" "updatessl"
534+
$BIN/v-update-mail-domain-ssl "$user" "$root_domain" "$ssl_dir" "updatessl"
535535
else
536-
$BIN/v-add-mail-domain-ssl "$user" "$root_domain" "$ssl_dir" "$ssl_home" "updatessl"
536+
$BIN/v-add-mail-domain-ssl "$user" "$root_domain" "$ssl_dir" "updatessl"
537537
fi
538538
fi
539539

0 commit comments

Comments
 (0)