mirror of
https://github.com/serghey-rodin/vesta.git
synced 2025-08-24 07:05:58 -07:00
Moving v-install-wordpress to --parameters
This commit is contained in:
parent
9eb21cef4c
commit
402131c22b
1 changed files with 14 additions and 9 deletions
|
@ -17,14 +17,15 @@ fi
|
||||||
# Argument definition
|
# Argument definition
|
||||||
domain=$1
|
domain=$1
|
||||||
|
|
||||||
database="wp";
|
# take --parameters
|
||||||
if [ $# -gt 1 ]; then
|
source /usr/local/vesta/func/handle_parameters.sh
|
||||||
database=$2
|
|
||||||
|
if [ -z "$database" ]; then
|
||||||
|
database="wp"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
email="info@$domain";
|
if [ -z "$emil" ]; then
|
||||||
if [ $# -gt 2 ]; then
|
email="info@$domain";
|
||||||
email=$3
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
user=$(/usr/local/vesta/bin/v-search-domain-owner $domain)
|
user=$(/usr/local/vesta/bin/v-search-domain-owner $domain)
|
||||||
|
@ -83,11 +84,15 @@ PASSWDDB=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 8 | head -n 1)
|
||||||
#----------------------------------------------------------#
|
#----------------------------------------------------------#
|
||||||
|
|
||||||
PROTOCOL='http'
|
PROTOCOL='http'
|
||||||
if [ ! -f "/home/$user/conf/web/ssl.$domain.ca" ]; then
|
if [ -z "$SKIP_LE" ]; then
|
||||||
/usr/local/vesta/bin/v-add-letsencrypt-domain "$user" "$domain" "www.$domain" "yes"
|
if [ ! -f "/home/$user/conf/web/ssl.$domain.ca" ]; then
|
||||||
|
/usr/local/vesta/bin/v-add-letsencrypt-domain "$user" "$domain" "www.$domain" "yes"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
PROTOCOL='https'
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -f "/home/$user/conf/web/ssl.$domain.ca" ]; then
|
if [ -f "/home/$user/conf/web/ssl.$domain.ca" ] || [ ! -z "$SKIP_LE" ]; then
|
||||||
PROTOCOL='https'
|
PROTOCOL='https'
|
||||||
if [ -f "/usr/local/vesta/data/templates/web/nginx/force-https.stpl" ]; then
|
if [ -f "/usr/local/vesta/data/templates/web/nginx/force-https.stpl" ]; then
|
||||||
/usr/local/vesta/bin/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"
|
/usr/local/vesta/bin/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"
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue