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

Merge 2e8fe7300c into dd3ac20c6d

This commit is contained in:
jwigley 2016-10-01 10:17:36 +00:00 committed by GitHub
parent dd3ac20c6d 2e8fe7300c
commit 8f6208b247
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
bin/compile
View File

@ -138,17 +138,20 @@ EOF
cd "$CUR_DIR"
# Add support for app-nginx.conf.sigil
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
# Check for user provided nginx conf
if [ -f "$BUILD_DIR/app-nginx.conf.sigil" ] || [ -f "$BUILD_DIR/nginx.conf.erb" ] ; then
# Allow deprecated nginx.conf.erb
if [ -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"
# Add support for app-nginx.conf.sigil
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
echo "-----> DEPRECATED: using user provided nginx.conf.erb"
cp "$BUILD_DIR/nginx.conf.erb" "$BUILD_DIR/nginx/nginx.conf.erb"
fi
# ...else, force default file
else
echo "-----> Using default app-nginx.conf.sigil"