diff --git a/bin/compile b/bin/compile index 53e0979..bd2b601 100755 --- a/bin/compile +++ b/bin/compile @@ -28,6 +28,7 @@ if [[ ! -e "$BUILD_DIR/www" ]]; then mv $CACHE_DIR/www/* $BUILD_DIR/www # Check for a copy the nginx conf file override to the build dir [[ -f "$BUILD_DIR/www/nginx.conf.erb" ]] && mv $BUILD_DIR/www/nginx.conf.erb $BUILD_DIR + [[ -f "$BUILD_DIR/www/nginx.conf.sigil" ]] && mv $BUILD_DIR/www/nginx.conf.sigil $BUILD_DIR [[ -f "$BUILD_DIR/www/mime.types" ]] && mv $BUILD_DIR/www/mime.types $BUILD_DIR [[ -f "$BUILD_DIR/www/CHECKS" ]] && mv $BUILD_DIR/www/CHECKS $BUILD_DIR [[ -f "$BUILD_DIR/www/app.json" ]] && mv $BUILD_DIR/www/app.json $BUILD_DIR @@ -123,7 +124,12 @@ cd $CUR_DIR if [ -f $BUILD_DIR/nginx.conf.erb ] ; then echo "-----> using user provided nginx.conf.erb" cp $BUILD_DIR/nginx.conf.erb $BUILD_DIR/nginx/nginx.conf.erb - #rm $BUILD_DIR/nginx.conf.erb + +# Dokku 0.5.0+ uses nginx.conf.sigil for customizing the +# Nginx configuration, so let's check if it exists +elif [ -f $BUILD_DIR/nginx.conf.sigil ] ; then + echo "-----> using user provided nginx.conf.sigil" + cp $BUILD_DIR/nginx.conf.sigil $BUILD_DIR/nginx/nginx.conf.sigil # ...else, force default file else