lhp
/
scripts
1
0
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases Wiki Activity

Closes #13: Adds a proper cleanup

This commit is contained in:
Lutchy Horace 2021-03-24 16:39:37 -04:00
parent dd90e79b4b
commit 0adfdf6bc4
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
createVhosts.sh
View File

@ -48,6 +48,15 @@ function reload_nginx
sleep 0.5 sleep 0.5
} }
function clean_up
{
debug "Removing Nginx configuration and logs..."
rm $_vhost_conf_file
rm /var/log/nginx/$_domain.*
reload_nginx
err $1
}
function verify_vhost function verify_vhost
{ {
local target=127.0.0.1 local target=127.0.0.1
@ -71,12 +80,6 @@ function verify_vhost
fi fi
} }
function rm_vhost_conf
{
echo "Removing Nginx configuration"
rm $_vhost_conf_file
}
_cwd="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" _cwd="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
_bootstrap=${_cwd}/bootstrap.sh _bootstrap=${_cwd}/bootstrap.sh
_bb_myname=$(basename "$0") _bb_myname=$(basename "$0")
@ -217,16 +220,12 @@ reload_nginx
echo "Verifying vhost..." echo "Verifying vhost..."
if ! verify_vhost; then if ! verify_vhost; then
rm_vhost_conf clean_up "Failed to verify vhost"
reload_nginx
err "Failed to verify vhost"
fi fi
echo "Retrieving Let's Encrypt Certificate..." echo "Retrieving Let's Encrypt Certificate..."
if ! get_cert; then if ! get_cert; then
rm_vhost_conf clean_up "Failed to retrieve certificate!"
reload_nginx
err "Failed to retrieve certificate!"
fi fi
cat << EOF >> $_vhost_conf_file cat << EOF >> $_vhost_conf_file