bugfixes
- don't match substrings in VHOSTS - handle case where NOSSL_SERVER_NAME is \' \' - rebuild nginx config on ssl import - prevent cwd errors after we rm the temp dir
This commit is contained in:
1 parent
a6cdae5abf
commit
1b208778f3
1 file changed
+6
-2
@@ -43,8 +43,8 @@ EOF
|
|||||||
|
|
||||||
SSL_HOSTNAME=`openssl x509 -in $SSL_INUSE/server.crt -noout -subject | tr '/' '\n' | grep CN= | cut -c4-`
|
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_HOSTNAME=`echo "$SSL_HOSTNAME" | sed 's|\.|\\.|g' | sed 's/\*/\.\*/g'`
|
||||||
SSL_VHOSTS=`grep "$SSL_HOSTNAME" $VHOST_PATH`
|
SSL_VHOSTS=`egrep ^"$SSL_HOSTNAME"$ $VHOST_PATH`
|
||||||
NONSSL_VHOSTS=`grep -v "$SSL_HOSTNAME" $VHOST_PATH`
|
NONSSL_VHOSTS=`egrep -v ^"$SSL_HOSTNAME"$ $VHOST_PATH || exit 0`
|
||||||
|
|
||||||
while read line; do
|
while read line; do
|
||||||
echo "-----> Configuring SSL for $line..."
|
echo "-----> Configuring SSL for $line..."
|
||||||
@@ -61,6 +61,8 @@ EOF
|
|||||||
|
|
||||||
cat $VHOST_PATH | xargs -i echo "-----> Configuring {}..."
|
cat $VHOST_PATH | xargs -i echo "-----> Configuring {}..."
|
||||||
NOSSL_SERVER_NAME=`echo $NONSSL_VHOSTS | tr '\n' ' '`
|
NOSSL_SERVER_NAME=`echo $NONSSL_VHOSTS | tr '\n' ' '`
|
||||||
|
# if NOSSL_SERVER_NAME is just ' ' then set NOSSL_SERVER_NAME to SSL_HOSTNAME since we redirect anyway
|
||||||
|
[[ "$NOSSL_SERVER_NAME" = ' ' ]] && NOSSL_SERVER_NAME=$(echo $SSL_VHOSTS | tr '\n' ' ')
|
||||||
|
|
||||||
echo "-----> Creating $SCHEME nginx.conf"
|
echo "-----> Creating $SCHEME nginx.conf"
|
||||||
echo "upstream $APP { server 127.0.0.1:$PORT; }" > $DOKKU_ROOT/$APP/nginx.conf
|
echo "upstream $APP { server 127.0.0.1:$PORT; }" > $DOKKU_ROOT/$APP/nginx.conf
|
||||||
@@ -101,7 +103,9 @@ EOF
|
|||||||
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)
|
||||||
|
|||||||
Reference in new issue
Block a user