From 32d5ed48d07b14337d43231133a6c4c8561795f0 Mon Sep 17 00:00:00 2001
From: myvesta <38690722+myvesta@users.noreply.github.com>
Date: Mon, 13 Jul 2020 11:38:38 +0200
Subject: [PATCH] making v-install-wordpress for both http and https

---
 bin/v-install-wordpress | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/bin/v-install-wordpress b/bin/v-install-wordpress
index e2d07a9bb..6d04e5464 100644
--- a/bin/v-install-wordpress
+++ b/bin/v-install-wordpress
@@ -35,18 +35,17 @@ if [ ! -d "/home/$user/web/$domain/public_html" ]; then
     exit 1;
 fi
 
+PROTOCOL='http'
 LETSENCRYPT=$($VESTA/bin/v-list-web-domain "$user" "$domain" | grep 'LETSENCRYPT:' | awk '{print $2}')
 if [ "$LETSENCRYPT" != "yes" ]; 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
+    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"
     fi
-else
-    echo "Error: Can not generate SSL."
-    exit 20
 fi
 
 WORKINGDIR="/home/$user/web/$domain/public_html"
@@ -97,16 +96,16 @@ sudo -H -u$user wp core install --url="$domain" --title="$domain" --admin_user="
 
 #FIX za https://github.com/wp-cli/wp-cli/issues/2632
 
-mysql -u$DBUSER -p$PASSWDDB -e "USE $DBUSER; update wp_options set option_value = 'https://$domain' where option_name = 'siteurl'; update wp_options set option_value = 'https://$domain' where option_name = 'home';"
+mysql -u$DBUSER -p$PASSWDDB -e "USE $DBUSER; update wp_options set option_value = '$PROTOCOL://$domain' where option_name = 'siteurl'; update wp_options set option_value = '$PROTOCOL://$domain' where option_name = 'home';"
 
 # clear
 
 echo "================================================================="
 echo "Installation is complete. Your username/password is listed below."
 echo ""
-echo "Site: https://$domain/"
+echo "Site: $PROTOCOL://$domain/"
 echo ""
-echo "Login: https://$domain/wp-admin/"
+echo "Login: $PROTOCOL://$domain/wp-admin/"
 echo "Username: admin"
 echo "Password: $password"
 echo ""