From ebbc9098d98589545c3bcdfc5454c585464bfcf2 Mon Sep 17 00:00:00 2001 From: Paul Caselton Date: Sat, 4 Jul 2015 23:04:54 +0100 Subject: [PATCH] Fixing nginx user override. --- bin/compile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bin/compile b/bin/compile index 78c4f7f..4833af9 100755 --- a/bin/compile +++ b/bin/compile @@ -26,6 +26,8 @@ if [[ ! -e "$BUILD_DIR/www" ]]; then mv $BUILD_DIR/* $CACHE_DIR/www mkdir -p $BUILD_DIR/www mv $CACHE_DIR/www/* $BUILD_DIR/www + # Check for an 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/CHECKS" ]] && mv $BUILD_DIR/www/CHECKS $BUILD_DIR rm -rf $CACHE_DIR/www fi @@ -113,6 +115,7 @@ 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 # ...else, force default file else