Merge pull request #21 from ineffyble/master

Add port_in_redirect directive to NGINX configuration template

README.md

@@ -8,10 +8,9 @@ All static files that you want to serve should be in the root directory of your
 
 ### Dokku
 
-To trigger detection of this buildpack in Dokku, you have two options:
+To trigger detection of this buildpack you need to add a dotfile:
 
-- Automatic: Add an *empty* file called `.static` to your root directory of your web project.
-- Manual: Set your `BUILDPACK_URL` via `dokku config:set BUILDPACK_URL=https://github.com/dokku/buildpack-nginx.git`
+Add an *empty* file called `.static` to your root directory of your web project (regardless if you use a custom value for NGINX_ROOT)
 
 ### Heroku
 

bin/compile

@@ -4,11 +4,11 @@ set -eo pipefail; [[ $TRACE ]] && set -x
 
 NGINX_VERSION="1.10.1"
 NGINX_TARBALL="nginx-${NGINX_VERSION}.tar.gz"
-PCRE_VERSION="8.39"
+PCRE_VERSION="8.40"
 PCRE_TARBALL="pcre-${PCRE_VERSION}.tar.gz"
 SIGIL_VERSION="0.4.0"
 SIGIL_TARBALL="sigil_${SIGIL_VERSION}_Linux_x86_64.tgz"
-ZLIB_VERSION="1.2.8"
+ZLIB_VERSION="1.2.11"
 ZLIB_TARBALL="zlib-${ZLIB_VERSION}.tar.gz"
 
 suppress() {
@@ -54,13 +54,13 @@ fi
 
 if [[ ! -d "${PCRE_TARBALL%.tar.gz}" ]]; then
   echo "-----> Download and unzip pcre"
-  curl -sSL "http://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${PCRE_TARBALL}" -o "${PCRE_TARBALL}"
+  curl -sSL "https://ftp.pcre.org/pub/pcre/${PCRE_TARBALL}" -o "${PCRE_TARBALL}"
   tar xzf "${PCRE_TARBALL}" && rm -f "${PCRE_TARBALL}"
 fi
 
 if [[ ! -d "${ZLIB_TARBALL%.tar.gz}" ]]; then
   echo "-----> Download and unzip zlib"
-  curl -sSL "http://zlib.net/${ZLIB_TARBALL}" -o "${ZLIB_TARBALL}"
+  curl -sSL "https://github.com/madler/zlib/archive/v${ZLIB_VERSION}.tar.gz" -o "${ZLIB_TARBALL}"
   tar xzf "${ZLIB_TARBALL}" && rm -rf "${ZLIB_TARBALL}"
 fi
 
@@ -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"
 

conf/app-nginx.conf.sigil

@@ -19,6 +19,7 @@ http {
       root /app/www;
     {{ end }}
     index index.html;
+    port_in_redirect off;
 
     location / {
       try_files $uri $uri/ /index.html;