From 39c3c619e02f20772516c59b6b54a65b5b03acb4 Mon Sep 17 00:00:00 2001 From: myvesta <38690722+myvesta@users.noreply.github.com> Date: Mon, 13 Jul 2020 23:46:49 +0200 Subject: [PATCH] Update v-install-wordpress --- bin/v-install-wordpress | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/bin/v-install-wordpress b/bin/v-install-wordpress index 6d04e546..13c4b6b5 100644 --- a/bin/v-install-wordpress +++ b/bin/v-install-wordpress @@ -36,12 +36,11 @@ if [ ! -d "/home/$user/web/$domain/public_html" ]; then fi PROTOCOL='http' -LETSENCRYPT=$($VESTA/bin/v-list-web-domain "$user" "$domain" | grep 'LETSENCRYPT:' | awk '{print $2}') -if [ "$LETSENCRYPT" != "yes" ]; then +if [ ! -f "/home/$user/conf/web/ssl.$domain.ca" ]; then v-add-letsencrypt-domain "$user" "$domain" "www.$domain" "yes" fi -LETSENCRYPT=$($VESTA/bin/v-list-web-domain "$user" "$domain" | grep 'LETSENCRYPT:' | awk '{print $2}') -if [ "$LETSENCRYPT" = "yes" ]; then + +if [ -f "/home/$user/conf/web/ssl.$domain.ca" ]; then PROTOCOL='https' if [ -f "/usr/local/vesta/data/templates/web/nginx/force-https.stpl" ]; then v-change-web-domain-proxy-tpl "$user" "$domain" "force-https" "jpeg,jpg,png,gif,bmp,ico,svg,tif,tiff,css,js,ttf,otf,webp,txt,csv,rtf,doc,docx,xls,xlsx,ppt,pptx,odf,odp,ods,odt,pdf,psd,ai,eot,eps,ps,zip,tar,tgz,gz,rar,bz2,7z,aac,m4a,mp3,mp4,ogg,wav,wma,3gp,avi,flv,m4v,mkv,mov,mpeg,mpg,wmv,exe,iso,dmg,swf,woff,woff2" "yes"