kawaiipunk
/
buildpack-nginx
mirror of https://github.com/dokku/buildpack-nginx.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #6 from Crispy1975/hotfix/fix-override 

Fixing nginx user override.
This commit is contained in:
Florian Heinemann 2015-07-04 21:12:37 -04:00
parent 1955dcaa72 ebbc9098d9
commit 56bd6c514d
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bin/compile
View File

@ -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