Skip to content

Fix deleting config files for wrong domain #1701

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
moucho wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix deleting config files for wrong domain #1701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bin/v-backup-user
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB" != '*' ]; then

# Backup ssl certificates
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/
fi

Expand Down
2 changes: 1 addition & 1 deletion bin/v-change-domain-owner
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ if [ ! -z "$web_data" ]; then
mv $ssl_key $VESTA/data/users/$user/ssl/
mv $ssl_ca $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

# Check ftp user account
Expand Down
2 changes: 1 addition & 1 deletion bin/v-change-web-domain-name
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ if [ -e "$USER_DATA/ssl/$domain.crt" ]; then
mv $domain.ca $new_domain.ca
mv $domain.pem $new_domain.pem
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


Expand Down
2 changes: 1 addition & 1 deletion bin/v-change-web-domain-sslcert
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ is_web_domain_cert_valid

# Deleting old certificate
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
chown -R $user:$user $tmpdir

Expand Down
2 changes: 1 addition & 1 deletion bin/v-delete-web-domain
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ del_web_config "$WEB_SYSTEM" "$TPL.tpl"
# Deleting SSL configuration and certificates
if [ "$SSL" = 'yes' ]; then
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.*
fi

Expand Down
2 changes: 1 addition & 1 deletion bin/v-delete-web-domain-ssl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ fi

# Deleting old certificate
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
chown -R $user:$user $tmpdir

Expand Down
2 changes: 1 addition & 1 deletion bin/v-restore-user
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@ if [ "$web" != 'no' ] && [ ! -z "$WEB_SYSTEM" ]; then

# Copying ssl certificates
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)
for crt in $certificates; do
crt=$(echo $crt|sed -e "s/ssl.//")
Expand Down