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

Merge pull request #13 from larose/nginx-conf 

Use app-nginx.conf.sigil if provided
This commit is contained in:
Jose Diaz-Gonzalez 2016-12-07 11:20:37 -07:00 committed by GitHub
parent dd3ac20c6d c2748f137e
commit c8ab63c69b
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bin/compile
View File

@ -142,10 +142,9 @@ cd "$CUR_DIR"
if [ -f "$BUILD_DIR/app-nginx.conf.sigil" ] ; then
echo "-----> Using user provided app-nginx.conf.sigil"
cp "$BUILD_DIR/app-nginx.conf.sigil" "$BUILD_DIR/nginx/app-nginx.conf.sigil"
fi
# Allow deprecated nginx.conf.erb
if [ -f "$BUILD_DIR/nginx.conf.erb" ] ; then
elif [ -f "$BUILD_DIR/nginx.conf.erb" ] ; then
echo "-----> DEPRECATED: using user provided nginx.conf.erb"
cp "$BUILD_DIR/nginx.conf.erb" "$BUILD_DIR/nginx/nginx.conf.erb"