initial pass at nginx proxy without VHOST. closes #1123
This commit is contained in:
1 parent
a1d8cc23b9
commit
4dd4d7c567
12 files changed
+287
-177
No files matched your search
@@ -193,8 +193,18 @@ case "$1" in
|
|||||||
echo "$SCHEME://$(< "$DOKKU_ROOT/VHOST")"
|
echo "$SCHEME://$(< "$DOKKU_ROOT/VHOST")"
|
||||||
else
|
else
|
||||||
for PORT_FILE in $DOKKU_ROOT/$APP/PORT.*; do
|
for PORT_FILE in $DOKKU_ROOT/$APP/PORT.*; do
|
||||||
echo "$SCHEME://$(< "$DOKKU_ROOT/HOSTNAME"):$(< "$PORT_FILE")"
|
echo "http://$(< "$DOKKU_ROOT/HOSTNAME"):$(< "$PORT_FILE") (container)"
|
||||||
done
|
done
|
||||||
|
|
||||||
|
DOKKU_NGINX_PORT=$(config_get $APP DOKKU_NGINX_PORT || true)
|
||||||
|
DOKKU_NGINX_SSL_PORT=$(config_get $APP DOKKU_NGINX_SSL_PORT || true)
|
||||||
|
|
||||||
|
if [[ -n "$DOKKU_NGINX_PORT" ]]; then
|
||||||
|
echo "http://$(< "$DOKKU_ROOT/HOSTNAME"):$DOKKU_NGINX_PORT (nginx)"
|
||||||
|
fi
|
||||||
|
if [[ -n "$DOKKU_NGINX_SSL_PORT" ]]; then
|
||||||
|
echo "https://$(< "$DOKKU_ROOT/HOSTNAME"):$DOKKU_NGINX_SSL_PORT (nginx-ssl)"
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
|
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
|
set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
|
||||||
source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
|
source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
|
||||||
source "$PLUGIN_AVAILABLE_PATH/certs/functions"
|
source "$PLUGIN_AVAILABLE_PATH/certs/functions"
|
||||||
|
source "$PLUGIN_AVAILABLE_PATH/nginx-vhosts/functions"
|
||||||
|
|
||||||
is_tar_import() {
|
is_tar_import() {
|
||||||
[[ -t 0 ]] && return 1
|
[[ -t 0 ]] && return 1
|
||||||
@@ -57,7 +58,7 @@ certs_set() {
|
|||||||
mv "$KEY_FILE" "$DOKKU_ROOT/$APP/tls/server.key"
|
mv "$KEY_FILE" "$DOKKU_ROOT/$APP/tls/server.key"
|
||||||
cd $DOKKU_ROOT
|
cd $DOKKU_ROOT
|
||||||
rm -rf $TEMP_DIR
|
rm -rf $TEMP_DIR
|
||||||
dokku nginx:build-config $APP
|
nginx_build_config $APP
|
||||||
}
|
}
|
||||||
|
|
||||||
case "$1" in
|
case "$1" in
|
||||||
@@ -84,7 +85,7 @@ case "$1" in
|
|||||||
mkdir -p "$DOKKU_ROOT/$APP/tls"
|
mkdir -p "$DOKKU_ROOT/$APP/tls"
|
||||||
dokku_log_info1 "Installing certificate and key..."
|
dokku_log_info1 "Installing certificate and key..."
|
||||||
mv -f $TMP_WORK_DIR/server.key $TMP_WORK_DIR/server.crt $SSL_PATH
|
mv -f $TMP_WORK_DIR/server.key $TMP_WORK_DIR/server.crt $SSL_PATH
|
||||||
[[ -n "$DOMAIN" ]] && (dokku domains:add $APP $DOMAIN || dokku nginx:build-config $APP)
|
[[ -n "$DOMAIN" ]] && (dokku domains:add $APP $DOMAIN || nginx_build_config $APP)
|
||||||
dokku_log_info1 "The following is a certificate signing request that can be used"
|
dokku_log_info1 "The following is a certificate signing request that can be used"
|
||||||
dokku_log_info1 "to generate an 'officially' signed SSL certificate for $APP at $DOMAIN"
|
dokku_log_info1 "to generate an 'officially' signed SSL certificate for $APP at $DOMAIN"
|
||||||
dokku_log_info1 "by a CA of your choosing."
|
dokku_log_info1 "by a CA of your choosing."
|
||||||
|
|||||||
@@ -330,3 +330,16 @@ docker_cleanup() {
|
|||||||
# shellcheck disable=SC2046
|
# shellcheck disable=SC2046
|
||||||
docker rmi $(docker images -f 'dangling=true' -q) &> /dev/null &
|
docker rmi $(docker images -f 'dangling=true' -q) &> /dev/null &
|
||||||
}
|
}
|
||||||
|
|
||||||
|
get_open_port() {
|
||||||
|
while true; do
|
||||||
|
local port=$(shuf -i 1025-65535 -n 1)
|
||||||
|
if ! nc -z 0.0.0.0 $port; then
|
||||||
|
echo $port
|
||||||
|
return 0
|
||||||
|
else
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
dokku_log_fail "no open ports found...wut?!"
|
||||||
|
}
|
||||||
@@ -3,6 +3,7 @@ set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
|
|||||||
source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
|
source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
|
||||||
source "$PLUGIN_AVAILABLE_PATH/config/functions"
|
source "$PLUGIN_AVAILABLE_PATH/config/functions"
|
||||||
source "$PLUGIN_AVAILABLE_PATH/domains/functions"
|
source "$PLUGIN_AVAILABLE_PATH/domains/functions"
|
||||||
|
source "$PLUGIN_AVAILABLE_PATH/nginx-vhosts/functions"
|
||||||
|
|
||||||
RE_IPV4="([0-9]{1,3}[\.]){3}[0-9]{1,3}"
|
RE_IPV4="([0-9]{1,3}[\.]){3}[0-9]{1,3}"
|
||||||
|
|
||||||
@@ -94,7 +95,7 @@ case "$1" in
|
|||||||
echo "$DOMAIN" >> "$DOKKU_ROOT/$APP/VHOST"
|
echo "$DOMAIN" >> "$DOKKU_ROOT/$APP/VHOST"
|
||||||
done
|
done
|
||||||
# we need to restart the app to make sure we're binding to the appropriate network interface
|
# we need to restart the app to make sure we're binding to the appropriate network interface
|
||||||
dokku nginx:build-config $APP
|
nginx_build_config $APP
|
||||||
plugn trigger post-domains-update $APP
|
plugn trigger post-domains-update $APP
|
||||||
for DOMAIN in "$@"; do
|
for DOMAIN in "$@"; do
|
||||||
dokku_log_info1 "Added $DOMAIN to $APP"
|
dokku_log_info1 "Added $DOMAIN to $APP"
|
||||||
|
|||||||
@@ -3,6 +3,9 @@ set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
|
|||||||
source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
|
source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
|
||||||
|
|
||||||
get_app_domains() {
|
get_app_domains() {
|
||||||
local APP=$1; verify_app_name $APP
|
local APP=$1; local VHOST_FILE="$DOKKU_ROOT/$APP/VHOST"
|
||||||
cat "$DOKKU_ROOT/$APP/VHOST"
|
verify_app_name $APP
|
||||||
|
if [[ -f "$VHOST_FILE" ]]; then
|
||||||
|
cat "$VHOST_FILE"
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
+41
-159
@@ -1,168 +1,16 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
|
set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
|
||||||
source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
|
source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
|
||||||
source "$PLUGIN_AVAILABLE_PATH/certs/functions"
|
|
||||||
source "$PLUGIN_AVAILABLE_PATH/config/functions"
|
source "$PLUGIN_AVAILABLE_PATH/config/functions"
|
||||||
source "$PLUGIN_AVAILABLE_PATH/domains/functions"
|
source "$PLUGIN_AVAILABLE_PATH/nginx-vhosts/functions"
|
||||||
|
|
||||||
validate_nginx () {
|
|
||||||
set +e
|
|
||||||
sudo /usr/sbin/nginx -t > /dev/null 2>&1
|
|
||||||
exit_code=$?
|
|
||||||
set -e
|
|
||||||
if [[ "$exit_code" -ne "0" ]]; then
|
|
||||||
sudo /usr/sbin/nginx -t
|
|
||||||
exit "$exit_code"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
restart_nginx () {
|
|
||||||
case "$DOKKU_DISTRO" in
|
|
||||||
ubuntu)
|
|
||||||
sudo /etc/init.d/nginx reload > /dev/null
|
|
||||||
;;
|
|
||||||
|
|
||||||
opensuse)
|
|
||||||
sudo /sbin/service nginx reload > /dev/null
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
}
|
|
||||||
|
|
||||||
case "$1" in
|
case "$1" in
|
||||||
nginx:build-config)
|
nginx:build-config)
|
||||||
APP="$2"; DOKKU_APP_LISTEN_PORT="$3"; DOKKU_APP_LISTEN_IP="${4}"
|
APP="$2"; DOKKU_APP_LISTEN_PORT="$3"; DOKKU_APP_LISTEN_IP="$4"
|
||||||
verify_app_name "$APP"
|
|
||||||
VHOST_PATH="$DOKKU_ROOT/$APP/VHOST"
|
|
||||||
URLS_PATH="$DOKKU_ROOT/$APP/URLS"
|
|
||||||
WILDCARD_SSL_PATH="$DOKKU_ROOT/tls"
|
|
||||||
APP_SSL_PATH="$DOKKU_ROOT/$APP/tls"
|
|
||||||
APP_NGINX_TEMPLATE="$DOKKU_ROOT/$APP/nginx.conf.template"
|
|
||||||
|
|
||||||
if [[ -z "$DOKKU_APP_LISTEN_PORT" ]] && [[ -z "$DOKKU_APP_LISTEN_IP" ]]; then
|
nginx_build_config $APP $DOKKU_APP_LISTEN_PORT $DOKKU_APP_LISTEN_IP
|
||||||
shopt -s nullglob
|
|
||||||
for DOKKU_APP_IP_FILE in $DOKKU_ROOT/$APP/IP.web.*; do
|
|
||||||
DOKKU_APP_PORT_FILE=$(echo $DOKKU_APP_IP_FILE | sed -e "s:IP:PORT:g")
|
|
||||||
DOKKU_APP_LISTENER_IP=$(< $DOKKU_APP_IP_FILE)
|
|
||||||
DOKKU_APP_LISTENER_PORT=$(< $DOKKU_APP_PORT_FILE)
|
|
||||||
|
|
||||||
DOKKU_APP_LISTENERS+=" "
|
;;
|
||||||
DOKKU_APP_LISTENERS+="$DOKKU_APP_LISTENER_IP:$DOKKU_APP_LISTENER_PORT"
|
|
||||||
DOKKU_APP_LISTENERS+=" "
|
|
||||||
done
|
|
||||||
shopt -u nullglob
|
|
||||||
fi
|
|
||||||
|
|
||||||
DOKKU_APP_CIDS=($(get_app_container_ids $APP))
|
|
||||||
docker cp "${DOKKU_APP_CIDS[0]}:/app/nginx.conf.template" "$DOKKU_ROOT/$APP/" 2> /dev/null || true
|
|
||||||
|
|
||||||
eval "$(config_export global)"
|
|
||||||
eval "$(config_export app $APP)"
|
|
||||||
[[ -f "$APP_NGINX_TEMPLATE" ]] && NGINX_TEMPLATE="$APP_NGINX_TEMPLATE" && NGINX_CUSTOM_TEMPLATE="true" && dokku_log_info1 'Overriding default nginx.conf with detected nginx.conf.template'
|
|
||||||
|
|
||||||
if [[ ! -n "$NO_VHOST" ]] && [[ -f "$DOKKU_ROOT/$APP/VHOST" ]]; then
|
|
||||||
NONSSL_VHOSTS=$(get_app_domains $APP)
|
|
||||||
if [[ -n "$(is_ssl_enabled $APP)" ]]; then
|
|
||||||
SSL_HOSTNAME=$(get_ssl_hostnames $APP)
|
|
||||||
|
|
||||||
[[ -n "$SSL_HOSTNAME" ]] && SSL_HOSTNAME_REGEX=$(echo "$SSL_HOSTNAME" | xargs | sed 's|\.|\\.|g' | sed 's/\*/\[^\.\]\*/g' | sed 's/ /|/g')
|
|
||||||
if (egrep -q "^${SSL_HOSTNAME_REGEX}$" $VHOST_PATH); then
|
|
||||||
SSL_INUSE=true
|
|
||||||
else
|
|
||||||
dokku_log_info1 "No matching configured domains for $APP found in SSL certificate. Your app will not be configured with an SSL endpoint"
|
|
||||||
dokku_log_info1 "Please add appropriate domains via the dokku domains command"
|
|
||||||
dokku_log_info1 "Configured domains for app:"
|
|
||||||
for domain in $(echo $NONSSL_VHOSTS| xargs); do
|
|
||||||
dokku_log_info2 "$domain"
|
|
||||||
done
|
|
||||||
dokku_log_info1 "Domains found in SSL certificate:"
|
|
||||||
for domain in $(echo $SSL_HOSTNAME | xargs); do
|
|
||||||
dokku_log_info2 "$domain"
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
if [[ "$(is_ssl_enabled $APP)" == "app" ]]; then
|
|
||||||
SSL_DIRECTIVES=$(cat <<EOF
|
|
||||||
ssl_certificate $APP_SSL_PATH/server.crt;
|
|
||||||
ssl_certificate_key $APP_SSL_PATH/server.key;
|
|
||||||
EOF
|
|
||||||
)
|
|
||||||
elif [[ "$(is_ssl_enabled $APP)" == "global" ]]; then
|
|
||||||
SSL_DIRECTIVES=""
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
NGINX_CONF=$(mktemp -t "nginx.conf.XXXXXX")
|
|
||||||
SCHEME="http"
|
|
||||||
if [[ -n "$SSL_INUSE" ]]; then
|
|
||||||
SCHEME="https"
|
|
||||||
|
|
||||||
[[ -z "$NGINX_TEMPLATE" ]] && NGINX_TEMPLATE="$(dirname $0)/templates/nginx.ssl.conf.template"
|
|
||||||
SSL_VHOSTS=$(egrep "^${SSL_HOSTNAME_REGEX}$" $VHOST_PATH || true)
|
|
||||||
NONSSL_VHOSTS=$(egrep -v "^${SSL_HOSTNAME_REGEX}$" $VHOST_PATH || true)
|
|
||||||
|
|
||||||
while read line; do
|
|
||||||
[[ -z "$line" ]] && continue
|
|
||||||
dokku_log_info1 "Configuring SSL for $line..."
|
|
||||||
SSL_SERVER_NAME=$line
|
|
||||||
NOSSL_SERVER_NAME=$line
|
|
||||||
eval "cat <<< \"$(< $NGINX_TEMPLATE)\" >> $NGINX_CONF"
|
|
||||||
done <<< "$SSL_VHOSTS"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ -n "$NONSSL_VHOSTS" ]]; then
|
|
||||||
NOSSL_SERVER_NAME=$(echo $NONSSL_VHOSTS | tr '\n' ' ')
|
|
||||||
xargs -i echo "-----> Configuring {}..." <<< "$NONSSL_VHOSTS"
|
|
||||||
if [[ -n "$DOKKU_SSL_TERMINATED" ]] && [[ -z "$NGINX_CUSTOM_TEMPLATE" ]]; then
|
|
||||||
NGINX_TEMPLATE="$(dirname $0)/templates/nginx.conf.ssl_terminated.template"
|
|
||||||
elif [[ -z "$NGINX_CUSTOM_TEMPLATE" ]]; then
|
|
||||||
NGINX_TEMPLATE="$(dirname $0)/templates/nginx.conf.template"
|
|
||||||
fi
|
|
||||||
eval "cat <<< \"$(< $NGINX_TEMPLATE)\" >> $NGINX_CONF"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ -n "$DOKKU_APP_LISTEN_PORT" ]] && [[ -n "$DOKKU_APP_LISTEN_IP" ]]; then
|
|
||||||
echo "upstream $APP { server $DOKKU_APP_LISTEN_IP:$DOKKU_APP_LISTEN_PORT; }" >> $NGINX_CONF
|
|
||||||
elif [[ -n "$DOKKU_APP_LISTENERS" ]]; then
|
|
||||||
echo "upstream $APP { " >> $NGINX_CONF
|
|
||||||
for listener in $DOKKU_APP_LISTENERS; do
|
|
||||||
echo " server $listener;" >> $NGINX_CONF
|
|
||||||
done
|
|
||||||
echo "}" >> $NGINX_CONF
|
|
||||||
fi
|
|
||||||
|
|
||||||
dokku_log_info1 "Creating $SCHEME nginx.conf"
|
|
||||||
mv $NGINX_CONF "$DOKKU_ROOT/$APP/nginx.conf"
|
|
||||||
|
|
||||||
if is_deployed "$APP"; then
|
|
||||||
dokku_log_info1 "Running nginx-pre-reload"
|
|
||||||
plugn trigger nginx-pre-reload $APP $DOKKU_APP_LISTEN_PORT $DOKKU_APP_LISTEN_IP
|
|
||||||
|
|
||||||
dokku_log_verbose "Reloading nginx"
|
|
||||||
validate_nginx && restart_nginx
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "# THIS FILE IS GENERATED BY DOKKU - DO NOT EDIT, YOUR CHANGES WILL BE OVERWRITTEN" > $URLS_PATH
|
|
||||||
xargs -i echo "https://{}" <<< "${SSL_VHOSTS}" >> $URLS_PATH
|
|
||||||
xargs -i echo "http://{}" <<< "${NONSSL_VHOSTS}" >> $URLS_PATH
|
|
||||||
else
|
|
||||||
if [[ -f "$DOKKU_ROOT/$APP/VHOST" ]]; then
|
|
||||||
dokku_log_info1 "VHOST support disabled, deleting $APP/VHOST"
|
|
||||||
rm "$DOKKU_ROOT/$APP/VHOST"
|
|
||||||
fi
|
|
||||||
if [[ -f "$DOKKU_ROOT/$APP/URLS" ]]; then
|
|
||||||
dokku_log_info1 "VHOST support disabled, deleting $APP/URLS"
|
|
||||||
rm "$DOKKU_ROOT/$APP/URLS"
|
|
||||||
fi
|
|
||||||
if [[ -f "$DOKKU_ROOT/$APP/nginx.conf" ]]; then
|
|
||||||
dokku_log_info1 "VHOST support disabled, deleting nginx.conf"
|
|
||||||
rm "$DOKKU_ROOT/$APP/nginx.conf"
|
|
||||||
|
|
||||||
if is_deployed "$APP"; then
|
|
||||||
dokku_log_info1 "VHOST support disabled, reloading nginx after nginx.conf deletion"
|
|
||||||
validate_nginx && restart_nginx
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
|
|
||||||
nginx:access-logs|nginx:error-logs)
|
nginx:access-logs|nginx:error-logs)
|
||||||
[[ -z $2 ]] && echo "Please specify an app to run the command on" && exit 1
|
[[ -z $2 ]] && echo "Please specify an app to run the command on" && exit 1
|
||||||
@@ -180,18 +28,52 @@ EOF
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
tail "$NGINX_LOGS_ARGS" "$NGINX_LOGS_PATH"
|
tail "$NGINX_LOGS_ARGS" "$NGINX_LOGS_PATH"
|
||||||
;;
|
;;
|
||||||
|
|
||||||
|
nginx:disable)
|
||||||
|
[[ -z $2 ]] && echo "Please specify an app to run the command on" && exit 1
|
||||||
|
verify_app_name "$2"
|
||||||
|
APP="$2"
|
||||||
|
|
||||||
|
eval "$(config_export app $APP)"
|
||||||
|
if [[ -z "$NO_VHOST" ]]; then
|
||||||
|
config_set --no-restart $APP NO_NGINX=1
|
||||||
|
config_set $APP NO_VHOST=1
|
||||||
|
elif [[ -z "$NO_NGINX" ]]; then
|
||||||
|
config_set --no-restart $APP NO_NGINX=1
|
||||||
|
nginx_build_config $APP
|
||||||
|
else
|
||||||
|
dokku_log_info1 "nginx is already disable for app ($APP)"
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
|
||||||
|
nginx:enable)
|
||||||
|
[[ -z $2 ]] && echo "Please specify an app to run the command on" && exit 1
|
||||||
|
verify_app_name "$2"
|
||||||
|
APP="$2"
|
||||||
|
|
||||||
|
eval "$(config_export app $APP)"
|
||||||
|
if [[ -n "$NO_NGINX" ]]; then
|
||||||
|
config_unset --no-restart $APP NO_NGINX
|
||||||
|
unset NO_NGINX
|
||||||
|
nginx_build_config $APP
|
||||||
|
else
|
||||||
|
dokku_log_info1 "nginx is already enabled for app ($APP)"
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
|
||||||
help | nginx:help)
|
help | nginx:help)
|
||||||
cat<<EOF
|
cat<<EOF
|
||||||
nginx:build-config <app>, (Re)builds nginx config for given app
|
nginx:build-config <app>, (Re)builds nginx config for given app
|
||||||
nginx:access-logs <app> [-t], Show the nginx access logs for an application (-t follows)
|
nginx:access-logs <app> [-t], Show the nginx access logs for an application (-t follows)
|
||||||
nginx:error-logs <app> [-t], Show the nginx error logs for an application (-t follows)
|
nginx:error-logs <app> [-t], Show the nginx error logs for an application (-t follows)
|
||||||
|
nginx:disable <app>, disable nginx for an application (forces container binding to external interface)
|
||||||
|
nginx:enable <app>, enable nginx for an application
|
||||||
EOF
|
EOF
|
||||||
;;
|
;;
|
||||||
|
|
||||||
*)
|
*)
|
||||||
exit $DOKKU_NOT_IMPLEMENTED_EXIT
|
exit $DOKKU_NOT_IMPLEMENTED_EXIT
|
||||||
;;
|
;;
|
||||||
|
|
||||||
esac
|
esac
|
||||||
Executable
+198
@@ -0,0 +1,198 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
|
||||||
|
source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
|
||||||
|
source "$PLUGIN_AVAILABLE_PATH/certs/functions"
|
||||||
|
source "$PLUGIN_AVAILABLE_PATH/config/functions"
|
||||||
|
source "$PLUGIN_AVAILABLE_PATH/domains/functions"
|
||||||
|
|
||||||
|
validate_nginx() {
|
||||||
|
set +e
|
||||||
|
sudo /usr/sbin/nginx -t > /dev/null 2>&1
|
||||||
|
exit_code=$?
|
||||||
|
set -e
|
||||||
|
if [[ "$exit_code" -ne "0" ]]; then
|
||||||
|
sudo /usr/sbin/nginx -t
|
||||||
|
exit "$exit_code"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
restart_nginx() {
|
||||||
|
case "$DOKKU_DISTRO" in
|
||||||
|
ubuntu)
|
||||||
|
sudo /etc/init.d/nginx reload > /dev/null
|
||||||
|
;;
|
||||||
|
|
||||||
|
opensuse)
|
||||||
|
sudo /sbin/service nginx reload > /dev/null
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
}
|
||||||
|
|
||||||
|
nginx_build_config() {
|
||||||
|
local APP="$1"; local DOKKU_APP_LISTEN_PORT="$2"; local DOKKU_APP_LISTEN_IP="$3"
|
||||||
|
verify_app_name "$APP"
|
||||||
|
VHOST_PATH="$DOKKU_ROOT/$APP/VHOST"
|
||||||
|
URLS_PATH="$DOKKU_ROOT/$APP/URLS"
|
||||||
|
WILDCARD_SSL_PATH="$DOKKU_ROOT/tls"
|
||||||
|
APP_SSL_PATH="$DOKKU_ROOT/$APP/tls"
|
||||||
|
APP_NGINX_TEMPLATE="$DOKKU_ROOT/$APP/nginx.conf.template"
|
||||||
|
|
||||||
|
eval "$(config_export global)"
|
||||||
|
eval "$(config_export app $APP)"
|
||||||
|
|
||||||
|
if [[ ! -n "$NO_NGINX" ]]; then
|
||||||
|
if [[ -z "$DOKKU_APP_LISTEN_PORT" ]] && [[ -z "$DOKKU_APP_LISTEN_IP" ]]; then
|
||||||
|
shopt -s nullglob
|
||||||
|
for DOKKU_APP_IP_FILE in $DOKKU_ROOT/$APP/IP.web.*; do
|
||||||
|
DOKKU_APP_PORT_FILE=$(echo $DOKKU_APP_IP_FILE | sed -e "s:IP:PORT:g")
|
||||||
|
DOKKU_APP_LISTENER_IP=$(< $DOKKU_APP_IP_FILE)
|
||||||
|
DOKKU_APP_LISTENER_PORT=$(< $DOKKU_APP_PORT_FILE)
|
||||||
|
|
||||||
|
DOKKU_APP_LISTENERS+=" "
|
||||||
|
DOKKU_APP_LISTENERS+="$DOKKU_APP_LISTENER_IP:$DOKKU_APP_LISTENER_PORT"
|
||||||
|
DOKKU_APP_LISTENERS+=" "
|
||||||
|
done
|
||||||
|
shopt -u nullglob
|
||||||
|
fi
|
||||||
|
|
||||||
|
DOKKU_APP_CIDS=($(get_app_container_ids $APP))
|
||||||
|
docker cp "${DOKKU_APP_CIDS[0]}:/app/nginx.conf.template" "$DOKKU_ROOT/$APP/" 2> /dev/null || true
|
||||||
|
|
||||||
|
[[ -f "$APP_NGINX_TEMPLATE" ]] && NGINX_TEMPLATE="$APP_NGINX_TEMPLATE" && NGINX_CUSTOM_TEMPLATE="true" && dokku_log_info1 'Overriding default nginx.conf with detected nginx.conf.template'
|
||||||
|
|
||||||
|
NGINX_CONF=$(mktemp -t "nginx.conf.XXXXXX")
|
||||||
|
SCHEME="http"
|
||||||
|
|
||||||
|
if [[ -n "$NO_VHOST" ]]; then
|
||||||
|
if [[ -f "$DOKKU_ROOT/$APP/VHOST" ]]; then
|
||||||
|
dokku_log_info1 "VHOST support disabled, deleting $APP/VHOST"
|
||||||
|
rm "$DOKKU_ROOT/$APP/VHOST"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ -z "$DOKKU_NGINX_PORT" ]]; then
|
||||||
|
if [[ -n "$NO_VHOST" ]]; then
|
||||||
|
dokku_log_info1 "no nginx port set. setting to random open high port"
|
||||||
|
local NGINX_PORT=$(get_open_port)
|
||||||
|
else
|
||||||
|
local NGINX_PORT=80
|
||||||
|
fi
|
||||||
|
config_set --no-restart $APP DOKKU_NGINX_PORT=${NGINX_PORT}
|
||||||
|
else
|
||||||
|
NGINX_PORT=$DOKKU_NGINX_PORT
|
||||||
|
fi
|
||||||
|
|
||||||
|
NONSSL_VHOSTS=$(get_app_domains $APP)
|
||||||
|
if [[ -n "$(is_ssl_enabled $APP)" ]]; then
|
||||||
|
SSL_HOSTNAME=$(get_ssl_hostnames $APP)
|
||||||
|
SSL_INUSE=true
|
||||||
|
|
||||||
|
[[ -n "$SSL_HOSTNAME" ]] && SSL_HOSTNAME_REGEX=$(echo "$SSL_HOSTNAME" | xargs | sed 's|\.|\\.|g' | sed 's/\*/\[^\.\]\*/g' | sed 's/ /|/g')
|
||||||
|
if ! (egrep -q "^${SSL_HOSTNAME_REGEX}$" $VHOST_PATH &> /dev/null); then
|
||||||
|
dokku_log_info1 "No matching configured domains for $APP found in SSL certificate. Your app will show as insecure in a browser if accessed via SSL"
|
||||||
|
dokku_log_info1 "Please add appropriate domains via the dokku domains command"
|
||||||
|
[[ -n "$NONSSL_VHOSTS" ]] && dokku_log_info1 "Configured domains for app:"
|
||||||
|
for domain in $(echo $NONSSL_VHOSTS| xargs); do
|
||||||
|
dokku_log_info2 "$domain"
|
||||||
|
done
|
||||||
|
[[ -n "$SSL_HOSTNAME" ]] && dokku_log_info1 "Domains found in SSL certificate:"
|
||||||
|
for domain in $(echo $SSL_HOSTNAME | xargs); do
|
||||||
|
dokku_log_info2 "$domain"
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ "$(is_ssl_enabled $APP)" == "app" ]]; then
|
||||||
|
SSL_DIRECTIVES=$(cat <<EOF
|
||||||
|
ssl_certificate $APP_SSL_PATH/server.crt;
|
||||||
|
ssl_certificate_key $APP_SSL_PATH/server.key;
|
||||||
|
EOF
|
||||||
|
)
|
||||||
|
elif [[ "$(is_ssl_enabled $APP)" == "global" ]]; then
|
||||||
|
SSL_DIRECTIVES=""
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ -n "$SSL_INUSE" ]]; then
|
||||||
|
SCHEME="https"
|
||||||
|
|
||||||
|
[[ -z "$NGINX_TEMPLATE" ]] && NGINX_TEMPLATE="$(dirname $0)/templates/nginx.ssl.conf.template"
|
||||||
|
if [[ -z "$NO_VHOST" ]]; then
|
||||||
|
SSL_VHOSTS=$(egrep "^${SSL_HOSTNAME_REGEX}$" $VHOST_PATH || true)
|
||||||
|
else
|
||||||
|
SSL_VHOSTS="fakedomain.com"
|
||||||
|
fi
|
||||||
|
NONSSL_VHOSTS=$(egrep -v "^${SSL_HOSTNAME_REGEX}$" $VHOST_PATH 2> /dev/null || true)
|
||||||
|
|
||||||
|
if [[ -z "$DOKKU_NGINX_SSL_PORT" ]]; then
|
||||||
|
if [[ -n "$NO_VHOST" ]]; then
|
||||||
|
dokku_log_info1 "no nginx ssl port set. setting to random open high port"
|
||||||
|
local NGINX_SSL_PORT=$(get_open_port)
|
||||||
|
else
|
||||||
|
NGINX_SSL_PORT=443
|
||||||
|
fi
|
||||||
|
config_set --no-restart $APP DOKKU_NGINX_SSL_PORT=${NGINX_SSL_PORT}
|
||||||
|
else
|
||||||
|
local NGINX_SSL_PORT=$DOKKU_NGINX_SSL_PORT
|
||||||
|
fi
|
||||||
|
|
||||||
|
while read line; do
|
||||||
|
[[ -z "$line" ]] && continue
|
||||||
|
dokku_log_info1 "Configuring SSL for $line..."
|
||||||
|
SSL_SERVER_NAME=$line
|
||||||
|
NOSSL_SERVER_NAME=$line
|
||||||
|
eval "cat <<< \"$(< $NGINX_TEMPLATE)\" >> $NGINX_CONF"
|
||||||
|
done <<< "$SSL_VHOSTS"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ -n "$DOKKU_SSL_TERMINATED" ]] && [[ -z "$NGINX_CUSTOM_TEMPLATE" ]]; then
|
||||||
|
NGINX_TEMPLATE="$(dirname $0)/templates/nginx.conf.ssl_terminated.template"
|
||||||
|
elif [[ -z "$NGINX_CUSTOM_TEMPLATE" ]]; then
|
||||||
|
NGINX_TEMPLATE="$(dirname $0)/templates/nginx.conf.template"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ -n "$NONSSL_VHOSTS" ]]; then
|
||||||
|
NOSSL_SERVER_NAME=$(echo $NONSSL_VHOSTS | tr '\n' ' ')
|
||||||
|
xargs -i echo "-----> Configuring {}..." <<< "$NONSSL_VHOSTS"
|
||||||
|
fi
|
||||||
|
eval "cat <<< \"$(< $NGINX_TEMPLATE)\" >> $NGINX_CONF"
|
||||||
|
[[ -n "$NO_VHOST" ]] && sed --in-place -n -e '/^.*server_name.*$/!p' $NGINX_CONF
|
||||||
|
|
||||||
|
if [[ -n "$DOKKU_APP_LISTEN_PORT" ]] && [[ -n "$DOKKU_APP_LISTEN_IP" ]]; then
|
||||||
|
echo "upstream $APP { server $DOKKU_APP_LISTEN_IP:$DOKKU_APP_LISTEN_PORT; }" >> $NGINX_CONF
|
||||||
|
elif [[ -n "$DOKKU_APP_LISTENERS" ]]; then
|
||||||
|
echo "upstream $APP { " >> $NGINX_CONF
|
||||||
|
for listener in $DOKKU_APP_LISTENERS; do
|
||||||
|
echo " server $listener;" >> $NGINX_CONF
|
||||||
|
done
|
||||||
|
echo "}" >> $NGINX_CONF
|
||||||
|
fi
|
||||||
|
|
||||||
|
dokku_log_info1 "Creating $SCHEME nginx.conf"
|
||||||
|
mv $NGINX_CONF "$DOKKU_ROOT/$APP/nginx.conf"
|
||||||
|
|
||||||
|
if is_deployed "$APP"; then
|
||||||
|
dokku_log_info1 "Running nginx-pre-reload"
|
||||||
|
plugn trigger nginx-pre-reload $APP $DOKKU_APP_LISTEN_PORT $DOKKU_APP_LISTEN_IP
|
||||||
|
|
||||||
|
dokku_log_verbose "Reloading nginx"
|
||||||
|
validate_nginx && restart_nginx
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ -z "$NO_VHOST" ]]; then
|
||||||
|
echo "# THIS FILE IS GENERATED BY DOKKU - DO NOT EDIT, YOUR CHANGES WILL BE OVERWRITTEN" > $URLS_PATH
|
||||||
|
xargs -i echo "https://{}" <<< "${SSL_VHOSTS}" >> $URLS_PATH
|
||||||
|
xargs -i echo "http://{}" <<< "${NONSSL_VHOSTS}" >> $URLS_PATH
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
dokku_log_info1 "nginx support is disabled for app ($APP)."
|
||||||
|
if [[ -f "$DOKKU_ROOT/$APP/nginx.conf" ]]; then
|
||||||
|
dokku_log_info1 "deleting nginx.conf"
|
||||||
|
rm "$DOKKU_ROOT/$APP/nginx.conf"
|
||||||
|
|
||||||
|
if is_deployed "$APP"; then
|
||||||
|
dokku_log_info1 "reloading nginx after nginx.conf deletion"
|
||||||
|
validate_nginx && restart_nginx
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
}
|
||||||
@@ -2,6 +2,7 @@
|
|||||||
set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
|
set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
|
||||||
source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
|
source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
|
||||||
source "$PLUGIN_AVAILABLE_PATH/config/functions"
|
source "$PLUGIN_AVAILABLE_PATH/config/functions"
|
||||||
|
source "$PLUGIN_AVAILABLE_PATH/nginx-vhosts/functions"
|
||||||
|
|
||||||
APP="$1"
|
APP="$1"
|
||||||
if [[ -f "$DOKKU_ROOT/$APP/IP.web.1" ]] && [[ -f "$DOKKU_ROOT/$APP/PORT.web.1" ]]; then
|
if [[ -f "$DOKKU_ROOT/$APP/IP.web.1" ]] && [[ -f "$DOKKU_ROOT/$APP/PORT.web.1" ]]; then
|
||||||
@@ -13,5 +14,5 @@ if [[ -f "$DOKKU_ROOT/$APP/IP.web.1" ]] && [[ -f "$DOKKU_ROOT/$APP/PORT.web.1" ]
|
|||||||
dokku domains:setup $APP
|
dokku domains:setup $APP
|
||||||
fi
|
fi
|
||||||
|
|
||||||
dokku nginx:build-config $APP
|
nginx_build_config $APP
|
||||||
fi
|
fi
|
||||||
@@ -1,7 +1,8 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
|
set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
|
||||||
source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
|
source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
|
||||||
|
source "$PLUGIN_AVAILABLE_PATH/nginx-vhosts/functions"
|
||||||
|
|
||||||
APP="$1"
|
APP="$1"
|
||||||
|
|
||||||
dokku nginx:build-config $APP
|
nginx_build_config $APP
|
||||||
@@ -1,8 +1,8 @@
|
|||||||
# Nginx configuration when running behind a load balancer that terminates SSL
|
# Nginx configuration when running behind a load balancer that terminates SSL
|
||||||
# connections (e.g. AWS ELB)
|
# connections (e.g. AWS ELB)
|
||||||
server {
|
server {
|
||||||
listen [::]:80;
|
listen [::]:$NGINX_PORT;
|
||||||
listen 80;
|
listen $NGINX_PORT;
|
||||||
server_name $NOSSL_SERVER_NAME;
|
server_name $NOSSL_SERVER_NAME;
|
||||||
location / {
|
location / {
|
||||||
proxy_pass http://$APP;
|
proxy_pass http://$APP;
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
server {
|
server {
|
||||||
listen [::]:80;
|
listen [::]:$NGINX_PORT;
|
||||||
listen 80;
|
listen $NGINX_PORT;
|
||||||
server_name $NOSSL_SERVER_NAME;
|
server_name $NOSSL_SERVER_NAME;
|
||||||
access_log /var/log/nginx/${APP}-access.log;
|
access_log /var/log/nginx/${APP}-access.log;
|
||||||
error_log /var/log/nginx/${APP}-error.log;
|
error_log /var/log/nginx/${APP}-error.log;
|
||||||
|
|||||||
@@ -1,22 +1,22 @@
|
|||||||
server {
|
server {
|
||||||
listen [::]:80;
|
listen [::]:$NGINX_PORT;
|
||||||
listen 80;
|
listen $NGINX_PORT;
|
||||||
server_name $NOSSL_SERVER_NAME;
|
server_name $NOSSL_SERVER_NAME;
|
||||||
access_log /var/log/nginx/${APP}-access.log;
|
access_log /var/log/nginx/${APP}-access.log;
|
||||||
error_log /var/log/nginx/${APP}-error.log;
|
error_log /var/log/nginx/${APP}-error.log;
|
||||||
return 301 https://\$host\$request_uri;
|
return 301 https://\$host:$NGINX_SSL_PORT\$request_uri;
|
||||||
}
|
}
|
||||||
|
|
||||||
server {
|
server {
|
||||||
listen [::]:443 ssl spdy;
|
listen [::]:$NGINX_SSL_PORT ssl spdy;
|
||||||
listen 443 ssl spdy;
|
listen $NGINX_SSL_PORT ssl spdy;
|
||||||
server_name $SSL_SERVER_NAME;
|
server_name $SSL_SERVER_NAME;
|
||||||
access_log /var/log/nginx/${APP}-access.log;
|
access_log /var/log/nginx/${APP}-access.log;
|
||||||
error_log /var/log/nginx/${APP}-error.log;
|
error_log /var/log/nginx/${APP}-error.log;
|
||||||
$SSL_DIRECTIVES
|
$SSL_DIRECTIVES
|
||||||
|
|
||||||
keepalive_timeout 70;
|
keepalive_timeout 70;
|
||||||
add_header Alternate-Protocol 443:npn-spdy/2;
|
add_header Alternate-Protocol $NGINX_SSL_PORT:npn-spdy/2;
|
||||||
location / {
|
location / {
|
||||||
|
|
||||||
gzip on;
|
gzip on;
|
||||||
|
|||||||
Reference in new issue
Block a user