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

Merge pull request #5 from Crispy1975/feature/inject-conf

Browse Source 
Check for user defined nginx config
This commit is contained in:
Florian Heinemann 2015-07-03 23:10:43 -04:00
commit 1955dcaa72
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bin/compile
View File

@ -108,11 +108,17 @@ fi
cd $CUR_DIR cd $CUR_DIR
# build nginx config unless overridden by user
#if [ ! -f $BUILD_DIR/nginx/nginx.conf ] ; then # Test for user override on nginx config...
echo "-----> using default nginx.conf.erb" if [ -f $BUILD_DIR/nginx.conf.erb ] ; then
cp conf/nginx.conf.erb $BUILD_DIR/nginx/nginx.conf.erb echo "-----> using user provided nginx.conf.erb"
#fi cp $BUILD_DIR/nginx.conf.erb $BUILD_DIR/nginx/nginx.conf.erb
# ...else, force default file
else
echo "-----> using default nginx.conf.erb"
cp conf/nginx.conf.erb $BUILD_DIR/nginx/nginx.conf.erb
fi
# build mime.types unless overridden by user # build mime.types unless overridden by user
#if [ ! -f $BUILD_DIR/mime.types ] ; then #if [ ! -f $BUILD_DIR/mime.types ] ; then