mirror of
https://github.com/dokku/buildpack-nginx.git
synced 2024-11-22 09:23:05 +00:00
Merge pull request #6 from Crispy1975/hotfix/fix-override
Fixing nginx user override.
This commit is contained in:
commit
56bd6c514d
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user