kawaiipunk/buildpack-nginx
1
0
Fork 0
mirror of https://github.com/dokku/buildpack-nginx.git synced 2025-06-26 18:40:45 +00:00
Code Issues Releases Wiki Activity

Compare commits

base: kawaiipunk:v6
Branches Tags
kawaiipunk:master
kawaiipunk:v26 kawaiipunk:v25 kawaiipunk:v24 kawaiipunk:v23 kawaiipunk:v22 kawaiipunk:v21 kawaiipunk:v20 kawaiipunk:v19 kawaiipunk:v18 kawaiipunk:v17 kawaiipunk:v16 kawaiipunk:v15 kawaiipunk:v14 kawaiipunk:v13 kawaiipunk:v12 kawaiipunk:v11 kawaiipunk:v10 kawaiipunk:v9 kawaiipunk:v8 kawaiipunk:v7 kawaiipunk:v6 kawaiipunk:v5 kawaiipunk:v4 kawaiipunk:v3
..
compare: kawaiipunk:v7
Branches Tags
kawaiipunk:master
kawaiipunk:v26 kawaiipunk:v25 kawaiipunk:v24 kawaiipunk:v23 kawaiipunk:v22 kawaiipunk:v21 kawaiipunk:v20 kawaiipunk:v19 kawaiipunk:v18 kawaiipunk:v17 kawaiipunk:v16 kawaiipunk:v15 kawaiipunk:v14 kawaiipunk:v13 kawaiipunk:v12 kawaiipunk:v11 kawaiipunk:v10 kawaiipunk:v9 kawaiipunk:v8 kawaiipunk:v7 kawaiipunk:v6 kawaiipunk:v5 kawaiipunk:v4 kawaiipunk:v3

2 Commits
v6 ... v7

Author SHA1 Message Date
Jose Diaz-Gonzalez
c8ab63c69b Merge pull request #13 from larose/nginx-conf 
Use app-nginx.conf.sigil if provided
 2016-12-07 11:20:37 -07:00
Mathieu Larose
c2748f137e Use app-nginx.conf.sigil if provided 2016-12-06 22:14:24 -05:00
1 changed files with 1 additions and 2 deletions
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"