github/vesta
1
0
Fork 0
mirror of https://github.com/serghey-rodin/vesta.git synced 2025-08-22 14:24:07 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge e771eabd67 into e0ebf729f3

Browse source
This commit is contained in:
Marcos 2020-07-05 22:33:56 +03:00 • committed by GitHub
commit 55391c7d8a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
bin/v-backup-user
View file

@ -212,7 +212,7 @@ if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB" != '*' ]; then
# Backup ssl certificates # Backup ssl certificates
if [ "$SSL" = 'yes' ] ; then if [ "$SSL" = 'yes' ] ; then
cp $HOMEDIR/$user/conf/web/ssl.$domain.* conf/ find $HOMEDIR/$user/conf/web/ -name "ssl.$domain.*" -type f ! -name "*.conf" -exec cp {} conf/ \;
cp $USER_DATA/ssl/$domain.* vesta/ cp $USER_DATA/ssl/$domain.* vesta/
fi fi

2
bin/v-change-domain-owner
View file

@ -61,7 +61,7 @@ if [ ! -z "$web_data" ]; then
mv $ssl_key $VESTA/data/users/$user/ssl/ mv $ssl_key $VESTA/data/users/$user/ssl/
mv $ssl_ca $VESTA/data/users/$user/ssl/ >> /dev/null 2>&1 mv $ssl_ca $VESTA/data/users/$user/ssl/ >> /dev/null 2>&1
mv $ssl_pem $VESTA/data/users/$user/ssl/ >> /dev/null 2>&1 mv $ssl_pem $VESTA/data/users/$user/ssl/ >> /dev/null 2>&1
rm -f $HOMEDIR/$owner/conf/web/ssl.$domain.* find $HOMEDIR/$owner/conf/web/ -name "ssl.$domain.*" -type f ! -name "*.conf" -delete
fi fi
# Check ftp user account # Check ftp user account

2
bin/v-change-web-domain-name
View file

@ -80,7 +80,7 @@ if [ -e "$USER_DATA/ssl/$domain.crt" ]; then
mv $domain.ca $new_domain.ca mv $domain.ca $new_domain.ca
mv $domain.pem $new_domain.pem mv $domain.pem $new_domain.pem
mv $domain.key $new_domain.key mv $domain.key $new_domain.key
rm -f $HOMEDIR/$user/conf/web/ssl.$domain.* find $HOMEDIR/$user/conf/web/ -name "ssl.$domain.*" -type f ! -name "*.conf" -delete
fi fi

2
bin/v-change-web-domain-sslcert
View file

@ -49,7 +49,7 @@ is_web_domain_cert_valid
# Deleting old certificate # Deleting old certificate
tmpdir=$(mktemp -p $HOMEDIR/$user/web/$domain/private -d) tmpdir=$(mktemp -p $HOMEDIR/$user/web/$domain/private -d)
rm -f $HOMEDIR/$user/conf/web/ssl.$domain.* find $HOMEDIR/$user/conf/web/ -name "ssl.$domain.*" -type f ! -name "*.conf" -delete
mv $USER_DATA/ssl/$domain.* $tmpdir mv $USER_DATA/ssl/$domain.* $tmpdir
chown -R $user:$user $tmpdir chown -R $user:$user $tmpdir

2
bin/v-delete-web-domain
View file

@ -65,7 +65,7 @@ del_web_config "$WEB_SYSTEM" "$TPL.tpl"
# Deleting SSL configuration and certificates # Deleting SSL configuration and certificates
if [ "$SSL" = 'yes' ]; then if [ "$SSL" = 'yes' ]; then
del_web_config "$WEB_SYSTEM" "$TPL.stpl" del_web_config "$WEB_SYSTEM" "$TPL.stpl"
rm -f $HOMEDIR/$user/conf/web/ssl.$domain.* find $HOMEDIR/$user/conf/web/ -name "ssl.$domain.*" -type f ! -name "*.conf" -delete
rm -f $USER_DATA/ssl/$domain.* rm -f $USER_DATA/ssl/$domain.*
fi fi

2
bin/v-delete-web-domain-ssl
View file

@ -57,7 +57,7 @@ fi
# Deleting old certificate # Deleting old certificate
tmpdir=$(mktemp -p $HOMEDIR/$user/web/$domain/private -d) tmpdir=$(mktemp -p $HOMEDIR/$user/web/$domain/private -d)
rm -f $HOMEDIR/$user/conf/web/ssl.$domain.* find $HOMEDIR/$user/conf/web/ -name "ssl.$domain.*" -type f ! -name "*.conf" -delete
mv $USER_DATA/ssl/$domain.* $tmpdir mv $USER_DATA/ssl/$domain.* $tmpdir
chown -R $user:$user $tmpdir chown -R $user:$user $tmpdir

2
bin/v-restore-user
View file

@ -377,7 +377,7 @@ if [ "$web" != 'no' ] && [ ! -z "$WEB_SYSTEM" ]; then
# Copying ssl certificates # Copying ssl certificates
if [ "$SSL" = 'yes' ]; then if [ "$SSL" = 'yes' ]; then
certificates=$(ls $tmpdir/web/$domain/conf| grep ssl) certificates=$(ls $tmpdir/web/$domain/conf| grep ssl | egrep -v "\.conf$")
certificates=$(echo "$certificates" |grep $domain) certificates=$(echo "$certificates" |grep $domain)
for crt in $certificates; do for crt in $certificates; do
crt=$(echo $crt|sed -e "s/ssl.//") crt=$(echo $crt|sed -e "s/ssl.//")