msb/vhost-stack
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

more vhost script call fixes for getopts

Browse Source
This commit is contained in:
Matthew Saunders Brown 2021-10-05 14:03:01 -07:00
parent 2feb3af39d
commit da12c7e1ea
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/vhost-add.sh
View File

@ -95,4 +95,4 @@ if [[ ! -f /etc/php/$phpVersion/fpm/pool.d/$username.conf ]]; then
fi fi
# create & enable apache config # create & enable apache config
/usr/local/bin/vhost-enable.sh VHostHTTP $domain /usr/local/bin/vhost-enable.sh -d $domain -m VHostHTTP

6
bin/vhost-destroy.sh
View File

@ -37,7 +37,7 @@ fi
database=${domain//./dot} database=${domain//./dot}
database=${database//-/dash} database=${database//-/dash}
if [[ -d /var/lib/mysql/$database ]]; then if [[ -d /var/lib/mysql/$database ]]; then
/usr/local/bin/vhost-mysql-db-del.sh $domain /usr/local/bin/vhost-mysql-db-del.sh -d $domain
fi fi
# get & set username for this virtualhost # get & set username for this virtualhost
@ -46,7 +46,7 @@ username=$(stat -c '%U' /srv/www/$domain)
# check for a delete varnish config # check for a delete varnish config
# del virtualhost files & configs # del virtualhost files & configs
/usr/local/bin/vhost-del.sh $domain /usr/local/bin/vhost-del.sh -d $domain
# check for any remaining virtualhosts before deleting user # check for any remaining virtualhosts before deleting user
# same check is done in vhost-user-del.sh # same check is done in vhost-user-del.sh
@ -60,5 +60,5 @@ do
done done
if [[ -n "$existingvirtualhosts" ]]; then if [[ -n "$existingvirtualhosts" ]]; then
/usr/local/bin/vhost-user-del.sh $username /usr/local/bin/vhost-user-del.sh -u $username
fi fi

2
bin/vhost-user-jails-reset.sh
View File

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

4
bin/vhost-varnish-disable.sh
View File

@ -42,7 +42,7 @@ fi
if [[ $macro_name =~ ^.*Varnish$ ]]; then if [[ $macro_name =~ ^.*Varnish$ ]]; then
# set new macro_name # set new macro_name
macro_name=`echo $macro_name | sed -e 's|Varnish$||'` macro_name=`echo $macro_name | sed -e 's|Varnish$||'`
vhost_enable="$macro_name $domain" vhost_enable="-d $domain -m $macro_name"
else else
echo "Varnish is not enabled for $domain" echo "Varnish is not enabled for $domain"
exit 1 exit 1
@ -51,7 +51,7 @@ fi
# check if VHost macro is for a Subdomain or Alias # check if VHost macro is for a Subdomain or Alias
if [[ "$macro_name" == *"Subdomain"* ]] || [[ "$macro_name" == *"Alias"* ]]; then if [[ "$macro_name" == *"Subdomain"* ]] || [[ "$macro_name" == *"Alias"* ]]; then
macro_var=`echo "$macro_vhost_line" | awk '{print $5}'` macro_var=`echo "$macro_vhost_line" | awk '{print $5}'`
vhost_enable="$vhost_enable $macro_var" vhost_enable="$vhost_enable -o $macro_var"
fi fi
/usr/local/bin/vhost-enable.sh $vhost_enable /usr/local/bin/vhost-enable.sh $vhost_enable

6
bin/vhost-varnish-enable.sh
View File

@ -60,7 +60,7 @@ fi
# check for valid HTTPS VHost macro # check for valid HTTPS VHost macro
if [[ $macro_name =~ ^VHost[[:alpha:]]*HTTPS$ ]]; then if [[ $macro_name =~ ^VHost[[:alpha:]]*HTTPS$ ]]; then
macro_name_new="${macro_name}Varnish" macro_name_new="${macro_name}Varnish"
vhost_enable="$macro_name_new $domain" vhost_enable="-d $domain -m $macro_name_new"
else else
echo "$domain must be enabled with an HTTPS VHost macro" echo "$domain must be enabled with an HTTPS VHost macro"
exit 1 exit 1
@ -70,13 +70,13 @@ fi
if [[ "$macro_name" == *"Subdomain"* ]]; then if [[ "$macro_name" == *"Subdomain"* ]]; then
vhost_subdomain=`echo "$macro_vhost_line" | awk '{print $5}'` vhost_subdomain=`echo "$macro_vhost_line" | awk '{print $5}'`
vhost_enable=$(echo "$vhost_enable" | sed -e "s/ $vhost_subdomain\./ /") vhost_enable=$(echo "$vhost_enable" | sed -e "s/ $vhost_subdomain\./ /")
vhost_enable="$vhost_enable $vhost_subdomain" vhost_enable="$vhost_enable -o $vhost_subdomain"
fi fi
# check if VHost macro is for an Alias # check if VHost macro is for an Alias
if [[ "$macro_name" == *"Alias"* ]]; then if [[ "$macro_name" == *"Alias"* ]]; then
vhost_alias=`echo "$macro_vhost_line" | awk '{print $5}'` vhost_alias=`echo "$macro_vhost_line" | awk '{print $5}'`
vhost_enable="$vhost_enable $vhost_alias" vhost_enable="$vhost_enable -o $vhost_alias"
fi fi
# check for ssl cert # check for ssl cert