github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

set SSL_VHOSTS to HOSTNAME if NO_VHOST is set and filter out server_name stanza if we have no hosts"

Browse Source
This commit is contained in:
Michael Hobbs
2015-09-17 22:46:58 -07:00
parent 9efa8beb81
commit 6e7ca94d84
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/nginx-vhosts/functions
View File

@@ -123,7 +123,7 @@ EOF
if [[ -z "$NO_VHOST" ]]; then if [[ -z "$NO_VHOST" ]]; then
SSL_VHOSTS=$(egrep "^${SSL_HOSTNAME_REGEX}$" $VHOST_PATH || true) SSL_VHOSTS=$(egrep "^${SSL_HOSTNAME_REGEX}$" $VHOST_PATH || true)
else else
SSL_VHOSTS="fakedomain.com" SSL_VHOSTS=$(< $DOKKU_ROOT/HOSTNAME)
fi fi
NONSSL_VHOSTS=$(egrep -v "^${SSL_HOSTNAME_REGEX}$" $VHOST_PATH 2> /dev/null || true) NONSSL_VHOSTS=$(egrep -v "^${SSL_HOSTNAME_REGEX}$" $VHOST_PATH 2> /dev/null || true)
@@ -159,7 +159,7 @@ EOF
xargs -i echo "-----> Configuring {}..." <<< "$NONSSL_VHOSTS" xargs -i echo "-----> Configuring {}..." <<< "$NONSSL_VHOSTS"
fi fi
eval "cat <<< \"$(< $NGINX_TEMPLATE)\" >> $NGINX_CONF" eval "cat <<< \"$(< $NGINX_TEMPLATE)\" >> $NGINX_CONF"
if [[ -n "$NO_VHOST" ]] || [[ -z "$NONSSL_VHOSTS" ]];then if [[ -n "$NO_VHOST" ]] || ([[ -z "$NONSSL_VHOSTS" ]] && [[ -z "$SSL_VHOSTS" ]]); then
sed --in-place -n -e '/^.*server_name.*$/!p' $NGINX_CONF sed --in-place -n -e '/^.*server_name.*$/!p' $NGINX_CONF
fi fi