kawaiipunk/buildpack-nginx
1
0
Fork 0
mirror of https://github.com/dokku/buildpack-nginx.git synced 2024-11-29 03:43:05 +00:00
Code Issues Releases Wiki Activity

Merge pull request #11 from dennmart/master

Browse Source 
Copy nginx.conf.sigil
This commit is contained in:
Jose Diaz-Gonzalez 2016-09-19 23:22:20 -06:00 committed by GitHub
commit d3a90d7520
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bin/compile
View File

@ -28,6 +28,7 @@ if [[ ! -e "$BUILD_DIR/www" ]]; then
mv $CACHE_DIR/www/* $BUILD_DIR/www mv $CACHE_DIR/www/* $BUILD_DIR/www
# Check for a copy the nginx conf file override to the build dir # 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.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/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/CHECKS" ]] && mv $BUILD_DIR/www/CHECKS $BUILD_DIR
[[ -f "$BUILD_DIR/www/app.json" ]] && mv $BUILD_DIR/www/app.json $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 if [ -f $BUILD_DIR/nginx.conf.erb ] ; then
echo "-----> using user provided nginx.conf.erb" echo "-----> using user provided nginx.conf.erb"
cp $BUILD_DIR/nginx.conf.erb $BUILD_DIR/nginx/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, force default file
else else