From 2cf46162de8defecb2067deb40ca5bcde9c63cc4 Mon Sep 17 00:00:00 2001 From: Jeroen Derks Date: Sun, 7 Apr 2013 18:25:52 +0200 Subject: [PATCH] fixed paths for updating or deleting SSL certificates --- bin/v-change-web-domain-sslcert | 10 +++++----- bin/v-delete-web-domain-ssl | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bin/v-change-web-domain-sslcert b/bin/v-change-web-domain-sslcert index dc7edaf8..28b31881 100755 --- a/bin/v-change-web-domain-sslcert +++ b/bin/v-change-web-domain-sslcert @@ -43,7 +43,7 @@ is_web_domain_cert_valid # Deleting old certificate tmpdir=$(mktemp -p $HOMEDIR/$user/web/$domain/private -d) -rm -f $HOMEDIR/$user/conf/ssl.$domain.* +rm -f $HOMEDIR/$user/conf/web/ssl.$domain.* mv $USER_DATA/ssl/$domain.* $tmpdir chown -R $user:$user $tmpdir @@ -57,11 +57,11 @@ if [ -e "$ssl_dir/$domain.ca" ]; then fi # Adding new certificate to user dir -cp -f $USER_DATA/ssl/$domain.crt $HOMEDIR/$user/conf/ssl.$domain.crt -cp -f $USER_DATA/ssl/$domain.key $HOMEDIR/$user/conf/ssl.$domain.key -cp -f $USER_DATA/ssl/$domain.pem $HOMEDIR/$user/conf/ssl.$domain.pem +cp -f $USER_DATA/ssl/$domain.crt $HOMEDIR/$user/conf/web/ssl.$domain.crt +cp -f $USER_DATA/ssl/$domain.key $HOMEDIR/$user/conf/web/ssl.$domain.key +cp -f $USER_DATA/ssl/$domain.pem $HOMEDIR/$user/conf/web/ssl.$domain.pem if [ -e "$USER_DATA/ssl/$domain.ca" ]; then - cp -f $USER_DATA/ssl/$domain.ca $HOMEDIR/$user/conf/ssl.$domain.ca + cp -f $USER_DATA/ssl/$domain.ca $HOMEDIR/$user/conf/web/ssl.$domain.ca fi diff --git a/bin/v-delete-web-domain-ssl b/bin/v-delete-web-domain-ssl index 1688bf09..f4d31550 100755 --- a/bin/v-delete-web-domain-ssl +++ b/bin/v-delete-web-domain-ssl @@ -56,7 +56,7 @@ fi # Deleting old certificate tmpdir=$(mktemp -p $HOMEDIR/$user/web/$domain/private -d) -rm -f $HOMEDIR/$user/conf/ssl.$domain.* +rm -f $HOMEDIR/$user/conf/web/ssl.$domain.* mv $USER_DATA/ssl/$domain.* $tmpdir chown -R $user:$user $tmpdir