Преглед изворни кода

Resovle error cast with update (#2748)

* Resovle error cast with update

* Update drone file
Jaap Marcus пре 3 година
родитељ
комит
923a548b19
2 измењених фајлова са 6 додато и 5 уклоњено
  1. 3 2
      .drone.yml
  2. 3 3
      bin/v-add-letsencrypt-domain

+ 3 - 2
.drone.yml

@@ -37,12 +37,13 @@ steps:
   - bats ./test/config-tests.bats
 
 trigger:
-  event: [ push ]
+  event: [ pull_request, push ]
   ref:
   - refs/heads/staging/*
   - refs/heads/beta
   - refs/heads/release
   - refs/heads/main
+  - refs/pull/*/head
 
 ---
 kind: pipeline
@@ -172,4 +173,4 @@ trigger:
 
 ---
 kind: signature
-hmac: 7230bb266287ae102167d451696407325a40c7b5001df0118d99ee3b9891e853
+hmac: a191a477aa337f2efff534022164906ff20ef2b6340ec808d128c09a06d7eaa3

+ 3 - 3
bin/v-add-letsencrypt-domain

@@ -523,7 +523,7 @@ if [ -z "$mail" ]; then
     ssl_home="$(get_object_value 'web' 'DOMAIN' "$domain" '$SSL_HOME')"
     ssl_enabled="$(get_object_value 'web' 'DOMAIN' "$domain" '$SSL')"
     if [ "$ssl_enabled" = "yes" ]; then 
-        $BIN/v-update-web-domain-ssl "$user" "$domain" "$ssl_dir" "$ssl_home" "updatessl" 
+        $BIN/v-update-web-domain-ssl "$user" "$domain" "$ssl_dir" "updatessl" 
     else
         $BIN/v-add-web-domain-ssl "$user" "$domain" "$ssl_dir" "$ssl_home" "updatessl" 
     fi
@@ -531,9 +531,9 @@ if [ -z "$mail" ]; then
  # TODO replace with v-update-mail-domain-ssl if ssl is enabled
     ssl_enabled="$(get_object_value 'mail' 'DOMAIN' "$root_domain" '$SSL')"
     if [ "$ssl_enabled" = "yes" ]; then 
-        $BIN/v-update-mail-domain-ssl "$user" "$root_domain" "$ssl_dir" "$ssl_home" "updatessl" 
+        $BIN/v-update-mail-domain-ssl "$user" "$root_domain" "$ssl_dir" "updatessl" 
     else
-        $BIN/v-add-mail-domain-ssl "$user" "$root_domain" "$ssl_dir" "$ssl_home" "updatessl" 
+        $BIN/v-add-mail-domain-ssl "$user" "$root_domain" "$ssl_dir" "updatessl" 
     fi
 fi