Browse Source

Fix: 2363 Update host certificate after updateing ssl (#2366)

Jaap Marcus 4 years ago
parent
commit
dcc1584aea
2 changed files with 13 additions and 1 deletions
  1. 7 0
      bin/v-update-letsencrypt-ssl
  2. 6 1
      install/upgrade/versions/1.5.5.sh

+ 7 - 0
bin/v-update-letsencrypt-ssl

@@ -120,6 +120,13 @@ for user in $($HESTIA/bin/v-list-sys-users plain); do
             if [[ -n "$domain_redirect" ]] ; then
             if [[ -n "$domain_redirect" ]] ; then
                 $BIN/v-add-web-domain-redirect $user $domain $domain_redirect $domain_redirect_code
                 $BIN/v-add-web-domain-redirect $user $domain $domain_redirect $domain_redirect_code
             fi
             fi
+            
+            if [ -n "$UPDATE_HOSTNAME_SSL" ] && [ "$UPDATE_HOSTNAME_SSL" = "yes" ]; then
+                hostname=$(hostname -f)
+                if [ "$hostname" = "$domain" ]; then
+                    $BIN/v-update-host-certificate "$user" "$domain"
+                fi
+            fi
 
 
         fi
         fi
     done
     done

+ 6 - 1
install/upgrade/versions/1.5.5.sh

@@ -92,4 +92,9 @@ if [ ! -f "/usr/share/keyrings/nginx-keyring.gpg" ]; then
         curl -s https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor | tee /usr/share/keyrings/postgresql-keyring.gpg >/dev/null 2>&1
         curl -s https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor | tee /usr/share/keyrings/postgresql-keyring.gpg >/dev/null 2>&1
     fi
     fi
     
     
-fi
+fi
+
+echo "[ * ] Refresh Hostname SSL"
+hostname=$(hostname);
+user=$(v-search-domain-owner "$hostname");
+$HESTIA/v-update-host-certificate "$user" "$hostname"