etc/vhost.conf -> bin/vhost.sh

bin/vhost-add.sh

@@ -4,8 +4,8 @@
 # https://git.stack-source.com/msb/vhost-stack
 # MIT License Copyright (c) 2021 Matthew Saunders Brown
 
-# load config
+# load include file
-source /usr/local/etc/vhost.conf || echo "ERROR: Either you do not have vhost user permissions or the config file is missing." && exit
+source $(dirname $0)/vhost.sh
 
 # check for and set virtualhost
 if [ -n "$1" ]; then

bin/vhost-del.sh

@@ -4,8 +4,8 @@
 # https://git.stack-source.com/msb/vhost-stack
 # MIT License Copyright (c) 2021 Matthew Saunders Brown
 
-# load config
+# load include file
-source /etc/vhost.conf || echo "ERROR: Either you do not have vhost user permissions or the config file is missing." && exit
+source $(dirname $0)/vhost.sh
 
 # check for and set virtualhost
 if [ -n "$1" ]; then

bin/vhost-deploy.sh

@@ -4,8 +4,8 @@
 # https://git.stack-source.com/msb/vhost-stack
 # MIT License Copyright (c) 2021 Matthew Saunders Brown
 
-# load config
+# load include file
-source /etc/vhost.conf || echo "ERROR: Either you do not have vhost user permissions or the config file is missing." && exit
+source $(dirname $0)/vhost.sh
 
 # -v virtualhost (required)
 # -u username (optional)

bin/vhost-destroy.sh

@@ -4,8 +4,8 @@
 # https://git.stack-source.com/msb/vhost-stack
 # MIT License Copyright (c) 2021 Matthew Saunders Brown
 
-# load config
+# load include file
-source /etc/vhost.conf || echo "ERROR: Either you do not have vhost user permissions or the config file is missing." && exit
+source $(dirname $0)/vhost.sh
 
 # check for and set virtualhost
 if [ -n "$1" ]; then

bin/vhost-disable.sh

@@ -4,8 +4,8 @@
 # https://git.stack-source.com/msb/vhost-stack
 # MIT License Copyright (c) 2021 Matthew Saunders Brown
 
-# load config
+# load include file
-source /etc/vhost.conf || echo "ERROR: Either you do not have vhost user permissions or the config file is missing." && exit
+source $(dirname $0)/vhost.sh
 
 # check for and set virtualhost
 if [ -n "$1" ]; then

bin/vhost-enable.sh

@@ -4,9 +4,8 @@
 # https://git.stack-source.com/msb/vhost-stack
 # MIT License Copyright (c) 2021 Matthew Saunders Brown
 
-# load config
+# load include file
-
+source $(dirname $0)/vhost.sh
-source /etc/vhost.conf || echo "ERROR: Either you do not have vhost user permissions or the config file is missing." && exit
 
 # vhost-enable.sh macro_name vhost [subdomain|alias]
 # vhost-enable.sh VHostHTTPS example.com

bin/vhost-fix-perms.sh

@@ -4,9 +4,8 @@
 # https://git.stack-source.com/msb/vhost-stack
 # MIT License Copyright (c) 2021 Matthew Saunders Brown
 
-# load config
+# load include file
-
+source $(dirname $0)/vhost.sh
-source /etc/vhost.conf || echo "ERROR: Either you do not have vhost user permissions or the config file is missing." && exit
 
 if [ -n "$1" ]; then
   if [ "$1" = '--verbose' ] || [ "$1" = '-v' ]; then

bin/vhost-mysql-db-add.sh

@@ -4,8 +4,8 @@
 # https://git.stack-source.com/msb/vhost-stack
 # MIT License Copyright (c) 2021 Matthew Saunders Brown
 
-# load config
+# load include file
-source /usr/local/etc/vhost.conf || echo "ERROR: Either you do not have vhost user permissions or the config file is missing." && exit
+source $(dirname $0)/vhost.sh
 
 # check for and set virtualhost
 if [ -n "$1" ]; then

bin/vhost-mysql-db-del.sh

@@ -4,8 +4,8 @@
 # https://git.stack-source.com/msb/vhost-stack
 # MIT License Copyright (c) 2021 Matthew Saunders Brown
 
-# load config
+# load include file
-source /usr/local/etc/vhost.conf || echo "ERROR: Either you do not have vhost user permissions or the config file is missing." && exit
+source $(dirname $0)/vhost.sh
 
 # # check for and set virtualhost
 # if [ -n "$1" ]; then

bin/vhost-user-add.sh

@@ -4,8 +4,8 @@
 # https://git.stack-source.com/msb/vhost-stack
 # MIT License Copyright (c) 2021 Matthew Saunders Brown
 
-# load config
+# load include file
-source /usr/local/etc/vhost.conf || echo "ERROR: Either you do not have vhost user permissions or the config file is missing." && exit
+source $(dirname $0)/vhost.sh
 
 # check for and set username
 if [ -n "$1" ]; then

bin/vhost-user-del.sh

@@ -4,8 +4,8 @@
 # https://git.stack-source.com/msb/vhost-stack
 # MIT License Copyright (c) 2021 Matthew Saunders Brown
 
-# load config
+# load include file
-source /usr/local/etc/vhost.conf || echo "ERROR: Either you do not have vhost user permissions or the config file is missing." && exit
+source $(dirname $0)/vhost.sh
 
 # check for and set username
 if [ -n "$1" ]; then

bin/vhost-user-destroy.sh

@@ -4,9 +4,8 @@
 # https://git.stack-source.com/msb/vhost-stack
 # MIT License Copyright (c) 2021 Matthew Saunders Brown
 
-# load config
+# load include file
-source /usr/local/etc/vhost.conf || echo "ERROR: Either you do not have vhost user permissions or the config file is missing." && exit
+source $(dirname $0)/vhost.sh
-
 
 # check for and set username
 if [ -n "$1" ]; then

bin/vhost-user-jail-reset.sh

@@ -4,8 +4,8 @@
 # https://git.stack-source.com/msb/vhost-stack
 # MIT License Copyright (c) 2021 Matthew Saunders Brown
 
-# load config
+# load include file
-source /usr/local/etc/vhost.conf || echo "ERROR: Either you do not have vhost user permissions or the config file is missing." && exit
+source $(dirname $0)/vhost.sh
 
 # check for and set username
 if [ -n "$1" ]; then

bin/vhost-user-jail.sh

@@ -4,8 +4,8 @@
 # https://git.stack-source.com/msb/vhost-stack
 # MIT License Copyright (c) 2021 Matthew Saunders Brown
 
-# load config
+# load include file
-source /usr/local/etc/vhost.conf || echo "ERROR: Either you do not have vhost user permissions or the config file is missing." && exit
+source $(dirname $0)/vhost.sh
 
 # check for and set username
 if [ -n "$1" ]; then

bin/vhost-user-jails-cp.sh

@@ -4,8 +4,8 @@
 # https://git.stack-source.com/msb/vhost-stack
 # MIT License Copyright (c) 2021 Matthew Saunders Brown
 
-# load config
+# load include file
-source /usr/local/etc/vhost.conf || echo "ERROR: Either you do not have vhost user permissions or the config file is missing." && exit
+source $(dirname $0)/vhost.sh
 
 # check for and set file to be copied in to jails
 if [ -n "$1" ]; then

bin/vhost-user-jails-reset.sh

@@ -4,8 +4,8 @@
 # https://git.stack-source.com/msb/vhost-stack
 # MIT License Copyright (c) 2021 Matthew Saunders Brown
 
-# load config
+# load include file
-source /usr/local/etc/vhost.conf || echo "ERROR: Either you do not have vhost user permissions or the config file is missing." && exit
+source $(dirname $0)/vhost.sh
 
 # make sure jails dir exists
 if [[ ! -e /usr/jails/ ]]; then

bin/vhost-user-jails-sync.sh

@@ -4,8 +4,8 @@
 # https://git.stack-source.com/msb/vhost-stack
 # MIT License Copyright (c) 2021 Matthew Saunders Brown
 
-# load config
+# load include file
-source /usr/local/etc/vhost.conf || echo "ERROR: Either you do not have vhost user permissions or the config file is missing." && exit
+source $(dirname $0)/vhost.sh
 
 mode=q
 

bin/vhost-user-jails-update.sh

@@ -4,8 +4,8 @@
 # https://git.stack-source.com/msb/vhost-stack
 # MIT License Copyright (c) 2021 Matthew Saunders Brown
 
-# load config
+# load include file
-source /usr/local/etc/vhost.conf || echo "ERROR: Either you do not have vhost user permissions or the config file is missing." && exit
+source $(dirname $0)/vhost.sh
 
 # make sure jails dir exists
 if [[ ! -e /usr/jails/ ]]; then

bin/vhost-varnish-disable.sh

@@ -4,8 +4,8 @@
 # https://git.stack-source.com/msb/vhost-stack
 # MIT License Copyright (c) 2021 Matthew Saunders Brown
 
-# load config
+# load include file
-source /usr/local/etc/vhost.conf || echo "ERROR: Either you do not have vhost user permissions or the config file is missing." && exit
+source $(dirname $0)/vhost.sh
 
 # varnish-disable.sh virtualhost
 

bin/vhost-varnish-enable.sh

@@ -4,8 +4,8 @@
 # https://git.stack-source.com/msb/vhost-stack
 # MIT License Copyright (c) 2021 Matthew Saunders Brown
 
-# load config
+# load include file
-source /usr/local/etc/vhost.conf || echo "ERROR: Either you do not have vhost user permissions or the config file is missing." && exit
+source $(dirname $0)/vhost.sh
 
 # check for and set virtualhost
 if [ -n "$1" ]; then

bin/vhost-varnish-update-sites.sh

@@ -4,8 +4,8 @@
 # https://git.stack-source.com/msb/vhost-stack
 # MIT License Copyright (c) 2021 Matthew Saunders Brown
 
-# load config
+# load include file
-source /usr/local/etc/vhost.conf || echo "ERROR: Either you do not have vhost user permissions or the config file is missing." && exit
+source $(dirname $0)/vhost.sh
 
 if [ ! -f /etc/varnish/sites.d/example.com.vcl ]; then
 

bin/vhost.sh

@@ -1,3 +1,5 @@
+#!/bin/bash
+#
 # vhost configs
 
 # any script that includes this conf file will force user to be root