1
0
mirror of https://github.com/dokku/buildpack-nginx.git synced 2024-12-27 06:15:25 +00:00

Use app-nginx.conf.sigil if provided

This commit is contained in:
Mathieu Larose 2016-12-06 22:14:24 -05:00
parent dd3ac20c6d
commit c2748f137e

View File

@ -142,10 +142,9 @@ cd "$CUR_DIR"
if [ -f "$BUILD_DIR/app-nginx.conf.sigil" ] ; then if [ -f "$BUILD_DIR/app-nginx.conf.sigil" ] ; then
echo "-----> Using user provided app-nginx.conf.sigil" echo "-----> Using user provided app-nginx.conf.sigil"
cp "$BUILD_DIR/app-nginx.conf.sigil" "$BUILD_DIR/nginx/app-nginx.conf.sigil" cp "$BUILD_DIR/app-nginx.conf.sigil" "$BUILD_DIR/nginx/app-nginx.conf.sigil"
fi
# Allow deprecated nginx.conf.erb # Allow deprecated nginx.conf.erb
if [ -f "$BUILD_DIR/nginx.conf.erb" ] ; then elif [ -f "$BUILD_DIR/nginx.conf.erb" ] ; then
echo "-----> DEPRECATED: using user provided nginx.conf.erb" echo "-----> DEPRECATED: using user provided nginx.conf.erb"
cp "$BUILD_DIR/nginx.conf.erb" "$BUILD_DIR/nginx/nginx.conf.erb" cp "$BUILD_DIR/nginx.conf.erb" "$BUILD_DIR/nginx/nginx.conf.erb"