From 70a3e239317ec2826e2b7960f3f9614bbc8a0501 Mon Sep 17 00:00:00 2001 From: Matthew Saunders Brown Date: Tue, 24 Aug 2021 15:03:50 -0700 Subject: [PATCH] fixed paths --- bin/vhost-del.sh | 2 +- bin/vhost-deploy.sh | 4 ++-- bin/vhost-user-jails-reset.sh | 2 +- bin/vhost-varnish-enable.sh | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bin/vhost-del.sh b/bin/vhost-del.sh index b8e6844..6b0c81f 100755 --- a/bin/vhost-del.sh +++ b/bin/vhost-del.sh @@ -37,7 +37,7 @@ fi # remove varnish config if [ -f /etc/varnish/sites.d/$virtualhost.vcl ]; then rm /etc/varnish/sites.d/$virtualhost.vcl - /usr/local/bin/varnish-update-sites.sh + /usr/local/bin/vhost-varnish-update-sites.sh # don't bother to restart varnish as it will clear cache unnecessarily fi diff --git a/bin/vhost-deploy.sh b/bin/vhost-deploy.sh index f7f9514..6337f57 100755 --- a/bin/vhost-deploy.sh +++ b/bin/vhost-deploy.sh @@ -67,10 +67,10 @@ if ! grep -q "^$username:" /etc/passwd; then # set userid userid=`awk -F: '{uid[$3]=1}END{for(x=1000; x<=65534; x++) {if(uid[x] != ""){}else{print x; exit;}}}' /etc/passwd` # add user - /usr/local/bin/user-add.sh $username "$password" $userid + /usr/local/bin/vhost-user-add.sh $username "$password" $userid # if jail option is set then jail user if [[ $jail = true ]]; then - /usr/local/bin/user-jail.sh $username > /dev/null 2>&1 + /usr/local/bin/vhost-user-jail.sh $username > /dev/null 2>&1 fi fi diff --git a/bin/vhost-user-jails-reset.sh b/bin/vhost-user-jails-reset.sh index 2a15d93..0b551a0 100755 --- a/bin/vhost-user-jails-reset.sh +++ b/bin/vhost-user-jails-reset.sh @@ -32,5 +32,5 @@ jails=(*) for jail in "${!jails[@]}" do jail=${jails[$jail]} - echo /usr/local/bin/user-jail-reset.sh $jail + echo /usr/local/bin/vhost-user-jail-reset.sh $jail done diff --git a/bin/vhost-varnish-enable.sh b/bin/vhost-varnish-enable.sh index 01f7d12..3343841 100755 --- a/bin/vhost-varnish-enable.sh +++ b/bin/vhost-varnish-enable.sh @@ -85,7 +85,7 @@ if [ ! -f "/etc/varnish/sites.d/$virtualhost.vcl" ]; then echo " call wordpress;" >> /etc/varnish/sites.d/$virtualhost.vcl echo " }" >> /etc/varnish/sites.d/$virtualhost.vcl echo "}" >> /etc/varnish/sites.d/$virtualhost.vcl - /usr/local/bin/varnish-update-sites.sh + /usr/local/bin/vhost-varnish-update-sites.sh systemctl is-active --quiet varnish && systemctl reload --quiet varnish fi