fixed paths

This commit is contained in:
Matthew Saunders Brown 2021-08-24 15:03:50 -07:00
parent b2bd9f7875
commit 70a3e23931
4 changed files with 5 additions and 5 deletions

View File

@ -37,7 +37,7 @@ fi
# remove varnish config # remove varnish config
if [ -f /etc/varnish/sites.d/$virtualhost.vcl ]; then if [ -f /etc/varnish/sites.d/$virtualhost.vcl ]; then
rm /etc/varnish/sites.d/$virtualhost.vcl 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 # don't bother to restart varnish as it will clear cache unnecessarily
fi fi

View File

@ -67,10 +67,10 @@ if ! grep -q "^$username:" /etc/passwd; then
# set userid # set userid
userid=`awk -F: '{uid[$3]=1}END{for(x=1000; x<=65534; x++) {if(uid[x] != ""){}else{print x; exit;}}}' /etc/passwd` userid=`awk -F: '{uid[$3]=1}END{for(x=1000; x<=65534; x++) {if(uid[x] != ""){}else{print x; exit;}}}' /etc/passwd`
# add user # 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 option is set then jail user
if [[ $jail = true ]]; then 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
fi fi

View File

@ -32,5 +32,5 @@ jails=(*)
for jail in "${!jails[@]}" for jail in "${!jails[@]}"
do do
jail=${jails[$jail]} jail=${jails[$jail]}
echo /usr/local/bin/user-jail-reset.sh $jail echo /usr/local/bin/vhost-user-jail-reset.sh $jail
done done

View File

@ -85,7 +85,7 @@ if [ ! -f "/etc/varnish/sites.d/$virtualhost.vcl" ]; then
echo " call wordpress;" >> /etc/varnish/sites.d/$virtualhost.vcl echo " call wordpress;" >> /etc/varnish/sites.d/$virtualhost.vcl
echo " }" >> /etc/varnish/sites.d/$virtualhost.vcl echo " }" >> /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 systemctl is-active --quiet varnish && systemctl reload --quiet varnish
fi fi