fix nginx template paths
This commit is contained in:
1 parent
6c914173cb
commit
5d8359c12e
1 file changed
+2
-2
@@ -95,7 +95,7 @@ EOF
|
|||||||
if [[ -n "$SSL_INUSE" ]]; then
|
if [[ -n "$SSL_INUSE" ]]; then
|
||||||
SCHEME="https"
|
SCHEME="https"
|
||||||
|
|
||||||
[[ -z "$NGINX_TEMPLATE" ]] && NGINX_TEMPLATE="$PLUGIN_PATH/nginx-vhosts/templates/nginx.ssl.conf.template"
|
[[ -z "$NGINX_TEMPLATE" ]] && NGINX_TEMPLATE="(dirname $0)/templates/nginx.ssl.conf.template"
|
||||||
SSL_VHOSTS=$(egrep "^${SSL_HOSTNAME_REGEX}$" $VHOST_PATH || true)
|
SSL_VHOSTS=$(egrep "^${SSL_HOSTNAME_REGEX}$" $VHOST_PATH || true)
|
||||||
NONSSL_VHOSTS=$(egrep -v "^${SSL_HOSTNAME_REGEX}$" $VHOST_PATH || true)
|
NONSSL_VHOSTS=$(egrep -v "^${SSL_HOSTNAME_REGEX}$" $VHOST_PATH || true)
|
||||||
|
|
||||||
@@ -111,7 +111,7 @@ EOF
|
|||||||
if [[ -n "$NONSSL_VHOSTS" ]]; then
|
if [[ -n "$NONSSL_VHOSTS" ]]; then
|
||||||
NOSSL_SERVER_NAME=$(echo $NONSSL_VHOSTS | tr '\n' ' ')
|
NOSSL_SERVER_NAME=$(echo $NONSSL_VHOSTS | tr '\n' ' ')
|
||||||
xargs -i echo "-----> Configuring {}..." <<< "$NONSSL_VHOSTS"
|
xargs -i echo "-----> Configuring {}..." <<< "$NONSSL_VHOSTS"
|
||||||
[[ -z "$NGINX_CUSTOM_TEMPLATE" ]] && NGINX_TEMPLATE="$PLUGIN_PATH/nginx-vhosts/templates/nginx.conf.template"
|
[[ -z "$NGINX_CUSTOM_TEMPLATE" ]] && NGINX_TEMPLATE="$(dirname $0)/templates/nginx.conf.template"
|
||||||
eval "cat <<< \"$(< $NGINX_TEMPLATE)\" >> $NGINX_CONF"
|
eval "cat <<< \"$(< $NGINX_TEMPLATE)\" >> $NGINX_CONF"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user