From 2e8fe7300cc25419e33f4bf2452b7a454a374f2a Mon Sep 17 00:00:00 2001
From: James Wigley <jwigley@gmail.com>
Date: Sat, 1 Oct 2016 19:24:40 +1000
Subject: [PATCH] User provided nginx conf

---
 bin/compile | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/bin/compile b/bin/compile
index 7f4b32e..533d1eb 100755
--- a/bin/compile
+++ b/bin/compile
@@ -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"