Merge pull request #783 from progrium/nginx-cleanup
New domains plugin and nginx extension
This commit is contained in:
commit
5bf1ba7ed7
11 files changed
+297
-131
No files matched your search
@@ -37,7 +37,7 @@ case "$1" in
|
|||||||
echo "-----> Deploying $APP ..."
|
echo "-----> Deploying $APP ..."
|
||||||
dokku deploy $APP
|
dokku deploy $APP
|
||||||
echo "=====> Application deployed:"
|
echo "=====> Application deployed:"
|
||||||
echo " $(dokku url $APP)"
|
echo "$(dokku urls $APP | sed "s/^/ /")"
|
||||||
echo
|
echo
|
||||||
;;
|
;;
|
||||||
|
|
||||||
|
|||||||
@@ -52,13 +52,26 @@ case "$1" in
|
|||||||
docker run -i -t $DOCKER_ARGS $IMAGE /exec "$@"
|
docker run -i -t $DOCKER_ARGS $IMAGE /exec "$@"
|
||||||
;;
|
;;
|
||||||
|
|
||||||
url)
|
url | urls)
|
||||||
[[ -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
|
||||||
[[ ! -d "$DOKKU_ROOT/$2" ]] && echo "App $2 does not exist" && exit 1
|
[[ ! -d "$DOKKU_ROOT/$2" ]] && echo "App $2 does not exist" && exit 1
|
||||||
APP="$2";
|
APP="$2"; SCHEME="http"; SSL="$DOKKU_ROOT/$APP/tls"
|
||||||
|
|
||||||
if [[ -f "$DOKKU_ROOT/$APP/URL" ]]; then
|
if [[ -e "$SSL/server.crt" ]] && [[ -e "$SSL/server.key" ]]; then
|
||||||
echo $(< "$DOKKU_ROOT/$APP/URL")
|
SCHEME="https"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ -f "$DOKKU_ROOT/$APP/VHOST" ]]; then
|
||||||
|
case "$1" in
|
||||||
|
url)
|
||||||
|
echo "$SCHEME://$(head -n1 "$DOKKU_ROOT/$APP/VHOST")"
|
||||||
|
;;
|
||||||
|
urls)
|
||||||
|
for vhost in $(< "$DOKKU_ROOT/$APP/VHOST"); do
|
||||||
|
echo "$SCHEME://$vhost"
|
||||||
|
done
|
||||||
|
;;
|
||||||
|
esac
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
|
|
||||||
@@ -73,7 +86,8 @@ case "$1" in
|
|||||||
cat && cat<<EOF
|
cat && cat<<EOF
|
||||||
logs <app> [-t] Show the last logs for an application (-t follows)
|
logs <app> [-t] Show the last logs for an application (-t follows)
|
||||||
run <app> <cmd> Run a command in the environment of an application
|
run <app> <cmd> Run a command in the environment of an application
|
||||||
url <app> Show the URL for an application
|
url <app> Show the first URL for an application (compatibility)
|
||||||
|
urls <app> Show all URLs for an application
|
||||||
version Print dokku's version
|
version Print dokku's version
|
||||||
EOF
|
EOF
|
||||||
;;
|
;;
|
||||||
|
|||||||
Executable
+9
@@ -0,0 +1,9 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
|
||||||
|
|
||||||
|
shopt -s nullglob
|
||||||
|
VERSION="$1"
|
||||||
|
BASE_DIR="$2"
|
||||||
|
|
||||||
|
cat; for i in $BASE_DIR/*/VHOST; do echo $i; done
|
||||||
|
cat; for i in $BASE_DIR/*/nginx.conf.template; do echo $i; done
|
||||||
Executable
+15
@@ -0,0 +1,15 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
|
||||||
|
|
||||||
|
shopt -s nullglob
|
||||||
|
VERSION="$1"
|
||||||
|
IMPORT_DIR="$2"
|
||||||
|
TARGET_DIR="$3"
|
||||||
|
|
||||||
|
cd $IMPORT_DIR
|
||||||
|
for file in */VHOST; do
|
||||||
|
cp $file "$TARGET_DIR/$file"
|
||||||
|
done
|
||||||
|
for file in */nginx.conf.template; do
|
||||||
|
cp $file "$TARGET_DIR/$file"
|
||||||
|
done
|
||||||
Executable
+103
@@ -0,0 +1,103 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
|
||||||
|
|
||||||
|
case "$1" in
|
||||||
|
domains)
|
||||||
|
[[ -z $2 ]] && echo "Please specify an app to run the command on" && exit 1
|
||||||
|
[[ ! -d "$DOKKU_ROOT/$2" ]] && echo "App $2 does not exist" && exit 1
|
||||||
|
APP="$2"
|
||||||
|
|
||||||
|
dokku domains:setup $APP
|
||||||
|
echo "=== $APP Domain Names"
|
||||||
|
cat "$DOKKU_ROOT/$APP/VHOST"
|
||||||
|
;;
|
||||||
|
|
||||||
|
domains:setup)
|
||||||
|
[[ -z $2 ]] && echo "Please specify an app to run the command on" && exit 1
|
||||||
|
[[ ! -d "$DOKKU_ROOT/$2" ]] && echo "App $2 does not exist" && exit 1
|
||||||
|
APP="$2"; VHOST_PATH="$DOKKU_ROOT/$APP/VHOST"
|
||||||
|
|
||||||
|
if [[ ! -f $VHOST_PATH ]]; then
|
||||||
|
echo "-----> Creating new $VHOST_PATH..."
|
||||||
|
VHOST=$(< "$DOKKU_ROOT/VHOST")
|
||||||
|
SUBDOMAIN=${APP/%\.${VHOST}/}
|
||||||
|
hostname=$(: | pluginhook nginx-hostname $APP $SUBDOMAIN $VHOST)
|
||||||
|
if [[ ! -n $hostname ]]; then
|
||||||
|
if [[ "$APP" == *.* ]] && [[ "$SUBDOMAIN" == "$APP" ]]; then
|
||||||
|
hostname="${APP/\//-}"
|
||||||
|
else
|
||||||
|
hostname="${APP/\//-}.$VHOST"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo $hostname > $VHOST_PATH
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
|
||||||
|
domains:add)
|
||||||
|
[[ -z $2 ]] && echo "Please specify an app to run the command on" && exit 1
|
||||||
|
[[ ! -d "$DOKKU_ROOT/$2" ]] && echo "App $2 does not exist" && exit 1
|
||||||
|
APP="$2"
|
||||||
|
|
||||||
|
if [[ -z $3 ]]; then
|
||||||
|
echo "Usage: dokku $1 $APP DOMAIN"
|
||||||
|
echo "Must specify DOMAIN."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ $(grep $3 "$DOKKU_ROOT/$APP/VHOST" > /dev/null 2>&1; echo $?) -eq 0 ]]; then
|
||||||
|
echo "$3 is already defined for $APP"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
dokku domains:setup $APP
|
||||||
|
echo "$3" >> "$DOKKU_ROOT/$APP/VHOST"
|
||||||
|
pluginhook post-domains-update $APP
|
||||||
|
echo "-----> Added $3 to $APP"
|
||||||
|
|
||||||
|
;;
|
||||||
|
|
||||||
|
domains:clear)
|
||||||
|
[[ -z $2 ]] && echo "Please specify an app to run the command on" && exit 1
|
||||||
|
[[ ! -d "$DOKKU_ROOT/$2" ]] && echo "App $2 does not exist" && exit 1
|
||||||
|
APP="$2"
|
||||||
|
|
||||||
|
rm -f "$DOKKU_ROOT/$APP/VHOST"
|
||||||
|
dokku domains:setup $APP
|
||||||
|
pluginhook post-domains-update $APP
|
||||||
|
echo "-----> Cleared domains in $APP"
|
||||||
|
|
||||||
|
;;
|
||||||
|
|
||||||
|
domains:remove)
|
||||||
|
[[ -z $2 ]] && echo "Please specify an app to run the command on" && exit 1
|
||||||
|
[[ ! -d "$DOKKU_ROOT/$2" ]] && echo "App $2 does not exist" && exit 1
|
||||||
|
APP="$2"
|
||||||
|
|
||||||
|
if [[ -z $3 ]]; then
|
||||||
|
echo "Usage: dokku $1 $2 DOMAIN"
|
||||||
|
echo "Must specify DOMAIN."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
dokku domains:setup $APP
|
||||||
|
sed -i "/^$3$/d" "$DOKKU_ROOT/$APP/VHOST"
|
||||||
|
pluginhook post-domains-update $APP
|
||||||
|
echo "-----> Removed $3 from $APP"
|
||||||
|
|
||||||
|
;;
|
||||||
|
|
||||||
|
help | domains:help)
|
||||||
|
cat && cat<<EOF
|
||||||
|
domains <app> List custom domains for app
|
||||||
|
domains:add <app> DOMAIN Add a custom domain to app
|
||||||
|
domains:clear <app> Clear all custom domains for app
|
||||||
|
domains:remove <app> DOMAIN Remove a custom domain from app
|
||||||
|
EOF
|
||||||
|
;;
|
||||||
|
|
||||||
|
*)
|
||||||
|
exit $DOKKU_NOT_IMPLEMENTED_EXIT
|
||||||
|
;;
|
||||||
|
|
||||||
|
esac
|
||||||
Executable
+7
@@ -0,0 +1,7 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
|
||||||
|
|
||||||
|
for app in $(ls -d $DOKKU_ROOT/*/CONTAINER); do
|
||||||
|
APP=$(basename $(dirname $app));
|
||||||
|
dokku domains:setup $APP
|
||||||
|
done
|
||||||
@@ -1,7 +1,92 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
|
set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
|
||||||
|
|
||||||
|
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)
|
||||||
|
APP="$2"; PORT="$3"
|
||||||
|
[[ -z "$PORT" ]] && PORT=$(< "$DOKKU_ROOT/$APP/PORT")
|
||||||
|
VHOST_PATH="$DOKKU_ROOT/$APP/VHOST"
|
||||||
|
WILDCARD_SSL="$DOKKU_ROOT/tls"
|
||||||
|
SSL="$DOKKU_ROOT/$APP/tls"
|
||||||
|
NONSSL_VHOSTS=`cat $VHOST_PATH`
|
||||||
|
|
||||||
|
if [[ ! -n "$NO_VHOST" ]]; then
|
||||||
|
if [[ -e "$SSL/server.crt" ]] && [[ -e "$SSL/server.key" ]]; then
|
||||||
|
SSL_INUSE="$SSL"
|
||||||
|
SSL_DIRECTIVES=$(cat <<EOF
|
||||||
|
ssl_certificate $SSL_INUSE/server.crt;
|
||||||
|
ssl_certificate_key $SSL_INUSE/server.key;
|
||||||
|
EOF
|
||||||
|
)
|
||||||
|
elif [[ -e "$WILDCARD_SSL/server.crt" ]] && [[ -e "$WILDCARD_SSL/server.key" ]]; then
|
||||||
|
SSL_INUSE="$WILDCARD_SSL"
|
||||||
|
SSL_DIRECTIVES=""
|
||||||
|
fi
|
||||||
|
|
||||||
|
NGINX_CONF="$PLUGIN_PATH/nginx-vhosts/templates/nginx.conf"
|
||||||
|
SCHEME="http"
|
||||||
|
if [[ -n "$SSL_INUSE" ]]; then
|
||||||
|
NGINX_CONF="$PLUGIN_PATH/nginx-vhosts/templates/nginx.ssl.conf"
|
||||||
|
SCHEME="https"
|
||||||
|
|
||||||
|
SSL_HOSTNAME=`openssl x509 -in $SSL_INUSE/server.crt -noout -subject | tr '/' '\n' | grep CN= | cut -c4-`
|
||||||
|
SSL_HOSTNAME=`echo "$SSL_HOSTNAME" | sed 's|\.|\\.|g' | sed 's/\*/\.\*/g'`
|
||||||
|
SSL_VHOSTS=`egrep ^"$SSL_HOSTNAME"$ $VHOST_PATH`
|
||||||
|
NONSSL_VHOSTS=`egrep -v ^"$SSL_HOSTNAME"$ $VHOST_PATH || exit 0`
|
||||||
|
|
||||||
|
while read line; do
|
||||||
|
echo "-----> Configuring SSL for $line..."
|
||||||
|
SSL_SERVER_NAME=$line
|
||||||
|
eval "cat <<< \"$(< $NGINX_CONF)\" >> $DOKKU_ROOT/$APP/nginx.conf"
|
||||||
|
done <<< "$SSL_VHOSTS"
|
||||||
|
fi
|
||||||
|
|
||||||
|
APP_NGINX_TEMPLATE="$DOKKU_ROOT/$APP/nginx.conf.template"
|
||||||
|
if [[ -f $APP_NGINX_TEMPLATE ]]; then
|
||||||
|
echo "-----> Overriding default nginx.conf with detected nginx.conf.template"
|
||||||
|
NGINX_CONF=$APP_NGINX_TEMPLATE
|
||||||
|
fi
|
||||||
|
|
||||||
|
cat $VHOST_PATH | xargs -i echo "-----> Configuring {}..."
|
||||||
|
# Include SSL_VHOSTS so we can redirect http to https on that hostname as well
|
||||||
|
NOSSL_SERVER_NAME=`echo $NONSSL_VHOSTS $SSL_VHOSTS| tr '\n' ' '`
|
||||||
|
|
||||||
|
echo "-----> Creating $SCHEME nginx.conf"
|
||||||
|
echo "upstream $APP { server 127.0.0.1:$PORT; }" > $DOKKU_ROOT/$APP/nginx.conf
|
||||||
|
eval "cat <<< \"$(< $NGINX_CONF)\" >> $DOKKU_ROOT/$APP/nginx.conf"
|
||||||
|
|
||||||
|
echo "-----> Running nginx-pre-reload"
|
||||||
|
pluginhook nginx-pre-reload $APP $PORT
|
||||||
|
|
||||||
|
echo " Reloading nginx"
|
||||||
|
restart_nginx
|
||||||
|
else
|
||||||
|
if [[ -f "$DOKKU_ROOT/$APP/VHOST" ]]; then
|
||||||
|
echo "-----> NO_VHOST set, deleting $APP/VHOST"
|
||||||
|
rm "$DOKKU_ROOT/$APP/VHOST"
|
||||||
|
fi
|
||||||
|
if [[ -f "$DOKKU_ROOT/$APP/nginx.conf" ]]; then
|
||||||
|
echo "-----> NO_VHOST set, deleting nginx.conf"
|
||||||
|
rm "$DOKKU_ROOT/$APP/nginx.conf"
|
||||||
|
|
||||||
|
echo "-----> NO_VHOST set, reloading nginx after nginx.conf deletion"
|
||||||
|
restart_nginx
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
|
||||||
nginx:import-ssl)
|
nginx:import-ssl)
|
||||||
[[ -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
|
||||||
[[ ! -d "$DOKKU_ROOT/$2" ]] && echo "App $2 does not exist" && exit 1
|
[[ ! -d "$DOKKU_ROOT/$2" ]] && echo "App $2 does not exist" && exit 1
|
||||||
@@ -17,12 +102,15 @@ case "$1" in
|
|||||||
mkdir -p "$DOKKU_ROOT/$APP/tls"
|
mkdir -p "$DOKKU_ROOT/$APP/tls"
|
||||||
mv "$TEMP_DIR/server.crt" "$DOKKU_ROOT/$APP/tls/server.crt"
|
mv "$TEMP_DIR/server.crt" "$DOKKU_ROOT/$APP/tls/server.crt"
|
||||||
mv "$TEMP_DIR/server.key" "$DOKKU_ROOT/$APP/tls/server.key"
|
mv "$TEMP_DIR/server.key" "$DOKKU_ROOT/$APP/tls/server.key"
|
||||||
|
cd $DOKKU_ROOT
|
||||||
rm -rf $TEMP_DIR
|
rm -rf $TEMP_DIR
|
||||||
|
dokku nginx:build-config $APP
|
||||||
;;
|
;;
|
||||||
|
|
||||||
help | nginx:help)
|
help | nginx:help)
|
||||||
cat && cat<<EOF
|
cat && cat<<EOF
|
||||||
nginx:import-ssl <app> Imports a tarball from stdin; should contain server.crt and server.key
|
nginx:import-ssl <app> Imports a tarball from stdin; should contain server.crt and server.key
|
||||||
|
nginx:build-config <app> (Re)builds nginx config for given app
|
||||||
EOF
|
EOF
|
||||||
;;
|
;;
|
||||||
|
|
||||||
|
|||||||
@@ -2,134 +2,13 @@
|
|||||||
set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
|
set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
|
||||||
|
|
||||||
APP="$1"; PORT="$2"
|
APP="$1"; PORT="$2"
|
||||||
WILDCARD_SSL="$DOKKU_ROOT/tls"
|
|
||||||
SSL="$DOKKU_ROOT/$APP/tls"
|
|
||||||
|
|
||||||
set +e
|
set +e; NO_VHOST=$(dokku config:get $APP NO_VHOST); set -e
|
||||||
NO_VHOST=$(dokku config:get $APP NO_VHOST)
|
|
||||||
set -e
|
|
||||||
|
|
||||||
if [[ -n "$NO_VHOST" ]]; then
|
if [[ -n "$NO_VHOST" ]]; then
|
||||||
echo "-----> NO_VHOST config detected"
|
echo "-----> NO_VHOST config detected"
|
||||||
|
elif [[ ! -f "$DOKKU_ROOT/$APP/VHOST" ]]; then
|
||||||
|
dokku domains:setup $APP
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ -f "$DOKKU_ROOT/VHOST" && ! -n "$NO_VHOST" ]]; then
|
dokku nginx:build-config $APP $PORT
|
||||||
VHOST=$(< "$DOKKU_ROOT/VHOST")
|
|
||||||
SUBDOMAIN=${APP/%\.${VHOST}/}
|
|
||||||
hostname=$(: | pluginhook nginx-hostname $APP $SUBDOMAIN $VHOST)
|
|
||||||
if [[ ! -n $hostname ]]; then
|
|
||||||
if [[ "$APP" == *.* ]] && [[ "$SUBDOMAIN" == "$APP" ]]; then
|
|
||||||
hostname="${APP/\//-}"
|
|
||||||
else
|
|
||||||
hostname="${APP/\//-}.$VHOST"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ -e "$SSL/server.crt" ]] && [[ -e "$SSL/server.key" ]]; then
|
|
||||||
SSL_INUSE="$SSL"
|
|
||||||
SSL_DIRECTIVES=$(cat <<EOF
|
|
||||||
ssl_certificate $SSL_INUSE/server.crt;
|
|
||||||
ssl_certificate_key $SSL_INUSE/server.key;
|
|
||||||
EOF
|
|
||||||
)
|
|
||||||
elif [[ -e "$WILDCARD_SSL/server.crt" ]] && [[ -e "$WILDCARD_SSL/server.key" ]] && [[ $hostname = `openssl x509 -in $WILDCARD_SSL/server.crt -noout -subject | tr '/' '\n' | grep CN= | cut -c4-` ]]; then
|
|
||||||
SSL_INUSE="$WILDCARD_SSL"
|
|
||||||
SSL_DIRECTIVES=""
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ -n "$SSL_INUSE" ]]; then
|
|
||||||
echo "-----> Creating ssl nginx.conf"
|
|
||||||
cat<<EOF > $DOKKU_ROOT/$APP/nginx.conf
|
|
||||||
upstream $APP { server 127.0.0.1:$PORT; }
|
|
||||||
server {
|
|
||||||
listen [::]:80;
|
|
||||||
listen 80;
|
|
||||||
server_name $hostname;
|
|
||||||
return 301 https://\$host\$request_uri;
|
|
||||||
}
|
|
||||||
|
|
||||||
server {
|
|
||||||
listen [::]:443 ssl spdy;
|
|
||||||
listen 443 ssl spdy;
|
|
||||||
server_name $hostname;
|
|
||||||
$SSL_DIRECTIVES
|
|
||||||
|
|
||||||
keepalive_timeout 70;
|
|
||||||
add_header Alternate-Protocol 443:npn-spdy/2;
|
|
||||||
|
|
||||||
location / {
|
|
||||||
proxy_pass http://$APP;
|
|
||||||
proxy_http_version 1.1;
|
|
||||||
proxy_set_header Upgrade \$http_upgrade;
|
|
||||||
proxy_set_header Connection "upgrade";
|
|
||||||
proxy_set_header Host \$http_host;
|
|
||||||
proxy_set_header X-Forwarded-Proto \$scheme;
|
|
||||||
proxy_set_header X-Forwarded-For \$remote_addr;
|
|
||||||
proxy_set_header X-Forwarded-Port \$server_port;
|
|
||||||
proxy_set_header X-Request-Start \$msec;
|
|
||||||
}
|
|
||||||
include $DOKKU_ROOT/$APP/nginx.conf.d/*.conf;
|
|
||||||
}
|
|
||||||
EOF
|
|
||||||
|
|
||||||
echo "https://$hostname" > "$DOKKU_ROOT/$APP/URL"
|
|
||||||
else
|
|
||||||
echo "-----> Creating non-ssl nginx.conf"
|
|
||||||
cat<<EOF > $DOKKU_ROOT/$APP/nginx.conf
|
|
||||||
upstream $APP { server 127.0.0.1:$PORT; }
|
|
||||||
server {
|
|
||||||
listen [::]:80;
|
|
||||||
listen 80;
|
|
||||||
server_name $hostname;
|
|
||||||
location / {
|
|
||||||
proxy_pass http://$APP;
|
|
||||||
proxy_http_version 1.1;
|
|
||||||
proxy_set_header Upgrade \$http_upgrade;
|
|
||||||
proxy_set_header Connection "upgrade";
|
|
||||||
proxy_set_header Host \$http_host;
|
|
||||||
proxy_set_header X-Forwarded-Proto \$scheme;
|
|
||||||
proxy_set_header X-Forwarded-For \$remote_addr;
|
|
||||||
proxy_set_header X-Forwarded-Port \$server_port;
|
|
||||||
proxy_set_header X-Request-Start \$msec;
|
|
||||||
}
|
|
||||||
include $DOKKU_ROOT/$APP/nginx.conf.d/*.conf;
|
|
||||||
}
|
|
||||||
EOF
|
|
||||||
|
|
||||||
echo "http://$hostname" > "$DOKKU_ROOT/$APP/URL"
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "-----> Running nginx-pre-reload"
|
|
||||||
pluginhook nginx-pre-reload $APP $PORT
|
|
||||||
|
|
||||||
echo " Reloading nginx"
|
|
||||||
case "$DOKKU_DISTRO" in
|
|
||||||
ubuntu)
|
|
||||||
sudo /etc/init.d/nginx reload > /dev/null
|
|
||||||
;;
|
|
||||||
|
|
||||||
opensuse)
|
|
||||||
sudo /sbin/service nginx reload > /dev/null
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
else
|
|
||||||
if [[ -f "$DOKKU_ROOT/$APP/URL" ]]; then
|
|
||||||
echo "------> NO_VHOST set, deleting $APP/URL"
|
|
||||||
rm "$DOKKU_ROOT/$APP/URL"
|
|
||||||
fi
|
|
||||||
if [[ -f "$DOKKU_ROOT/$APP/nginx.conf" ]]; then
|
|
||||||
echo "------> NO_VHOST set, deleting $APP/nginx.conf"
|
|
||||||
rm "$DOKKU_ROOT/$APP/nginx.conf"
|
|
||||||
echo "------> NO_VHOST set, reloading nginx after nginx.conf deletion"
|
|
||||||
case "$DOKKU_DISTRO" in
|
|
||||||
ubuntu)
|
|
||||||
sudo /etc/init.d/nginx reload > /dev/null
|
|
||||||
;;
|
|
||||||
|
|
||||||
opensuse)
|
|
||||||
sudo /sbin/service nginx reload > /dev/null
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
sudo /etc/init.d/nginx reload > /dev/null
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
Executable
+6
@@ -0,0 +1,6 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
|
||||||
|
|
||||||
|
APP="$1"
|
||||||
|
|
||||||
|
dokku nginx:build-config $APP
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
server {
|
||||||
|
listen [::]:80;
|
||||||
|
listen 80;
|
||||||
|
server_name $NOSSL_SERVER_NAME;
|
||||||
|
location / {
|
||||||
|
proxy_pass http://$APP;
|
||||||
|
proxy_http_version 1.1;
|
||||||
|
proxy_set_header Upgrade \$http_upgrade;
|
||||||
|
proxy_set_header Connection "upgrade";
|
||||||
|
proxy_set_header Host \$http_host;
|
||||||
|
proxy_set_header X-Forwarded-Proto \$scheme;
|
||||||
|
proxy_set_header X-Forwarded-For \$remote_addr;
|
||||||
|
proxy_set_header X-Forwarded-Port \$server_port;
|
||||||
|
proxy_set_header X-Request-Start \$msec;
|
||||||
|
}
|
||||||
|
include $DOKKU_ROOT/$APP/nginx.conf.d/*.conf;
|
||||||
|
}
|
||||||
@@ -0,0 +1,28 @@
|
|||||||
|
server {
|
||||||
|
listen [::]:80;
|
||||||
|
listen 80;
|
||||||
|
server_name $NOSSL_SERVER_NAME;
|
||||||
|
return 301 https://$SSL_SERVER_NAME\$request_uri;
|
||||||
|
}
|
||||||
|
|
||||||
|
server {
|
||||||
|
listen [::]:443 ssl spdy;
|
||||||
|
listen 443 ssl spdy;
|
||||||
|
server_name $SSL_SERVER_NAME;
|
||||||
|
$SSL_DIRECTIVES
|
||||||
|
|
||||||
|
keepalive_timeout 70;
|
||||||
|
add_header Alternate-Protocol 443:npn-spdy/2;
|
||||||
|
location / {
|
||||||
|
proxy_pass http://$APP;
|
||||||
|
proxy_http_version 1.1;
|
||||||
|
proxy_set_header Upgrade \$http_upgrade;
|
||||||
|
proxy_set_header Connection "upgrade";
|
||||||
|
proxy_set_header Host \$http_host;
|
||||||
|
proxy_set_header X-Forwarded-Proto \$scheme;
|
||||||
|
proxy_set_header X-Forwarded-For \$remote_addr;
|
||||||
|
proxy_set_header X-Forwarded-Port \$server_port;
|
||||||
|
proxy_set_header X-Request-Start \$msec;
|
||||||
|
}
|
||||||
|
include $DOKKU_ROOT/$APP/nginx.conf.d/*.conf;
|
||||||
|
}
|
||||||
Reference in new issue
Block a user