From 3a20517687a8bd159ee15a14f225a769ca053998 Mon Sep 17 00:00:00 2001 From: Dennis Martinez Date: Wed, 27 Apr 2016 15:31:46 +0900 Subject: [PATCH] Check for existence of nginx.conf.sigil for Dokku 0.5.0+ --- bin/compile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/bin/compile b/bin/compile index 593befe..3c6b8eb 100755 --- a/bin/compile +++ b/bin/compile @@ -122,7 +122,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 +if [ -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