Merge pull request #8 from mrdavidlaing/master

Update to nginx 1.7.4 (with ssl support)
cloudfoundry · Oct 23, 2014 · 8d68d83 · 8d68d83
2 parents 7c94557 + 893991b
commit 8d68d83
Show file tree

Hide file tree

Showing 9 changed files with 65 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -132,13 +132,14 @@ https://github.com/cloudfoundry-community/staticfile-buildpack-acceptance-tests
 Local development
 =================
 
-There are four example apps that should all compile successfully:
+There are five example apps that should all compile successfully:
 
 ```
-cf push staticfile -p test/fixtures/staticfile_app -b https://github.com/drnic/staticfile-buildpack.git
-cf push staticfile -p test/fixtures/alternate_root -b https://github.com/drnic/staticfile-buildpack.git
-cf push staticfile -p test/fixtures/directory_index -b https://github.com/drnic/staticfile-buildpack.git
-cf push staticfile -p test/fixtures/basic_auth -b https://github.com/drnic/staticfile-buildpack.git
+cf push staticfile -p test/fixtures/staticfile_app -b https://github.com/cloudfoundry-community/staticfile-buildpack.git
+cf push staticfile -p test/fixtures/alternate_root -b https://github.com/cloudfoundry-community/staticfile-buildpack.git
+cf push staticfile -p test/fixtures/directory_index -b https://github.com/cloudfoundry-community/staticfile-buildpack.git
+cf push staticfile -p test/fixtures/basic_auth -b https://github.com/cloudfoundry-community/staticfile-buildpack.git
+cf push staticfile -p test/fixtures/reverse_proxy -b https://github.com/cloudfoundry-community/staticfile-buildpack.git
 ```
 
 Building Nginx

diff --git a/bin/boot.sh b/bin/boot.sh
@@ -13,6 +13,7 @@
 # ------------------------------------------------------------------------------------------------
 
 export APP_ROOT=$HOME
+export LD_LIBRARY_PATH=$APP_ROOT/nginx/lib:$LD_LIBRARY_PATH
 
 conf_file=$APP_ROOT/nginx/conf/nginx.conf
 if [ -f $APP_ROOT/public/nginx.conf ]

diff --git a/bin/build_nginx b/bin/build_nginx
@@ -9,9 +9,10 @@ sudo apt-get update
 sudo apt-get install -fy build-essential zlib1g-dev
 
 src=~/src
-build=/usr/local
+build=/app/nginx
 target=/vagrant/vendor
 
+rm -rf $build && mkdir -p $build
 mkdir -p $src
 cd $src
 
@@ -29,10 +30,18 @@ wget http://nginx.org/download/nginx-$nginx_version.tar.gz
 tar -xvzf nginx-$nginx_version.tar.gz
 cd nginx-$nginx_version
 
-./configure --prefix=$build
+./configure --prefix=$build --with-http_ssl_module
 make
 sudo make install
 
+# Remove extras (help, utilities etc)
+
+sudo rm -rf /app/nginx/bin
+sudo rm -rf /app/nginx/sbin/nginx.old
+sudo rm -rf /app/nginx/include
+sudo rm -rf /app/nginx/share
+
+# Archive it all up
 mkdir -p $target
-cd $build
-tar -zcvpf $target/nginx-$nginx_version.tar.gz nginx/
+cd /app 
+tar -zcvpf $target/nginx-$nginx_version.tar.gz nginx/  
diff --git a/bin/compile b/bin/compile
@@ -10,8 +10,8 @@ build_dir=$1
 cache_dir=$2
 
 # Version
-nginx_version="1.5.10"
-# nginx_version="1.7.4"
+#nginx_version="1.5.10"
+nginx_version="1.7.4"
 
 compile_buildpack_dir=$(cd $(dirname $0); cd ..; pwd)
 compile_buildpack_bin=$compile_buildpack_dir/bin

diff --git a/test/fixtures/reverse_proxy/Staticfile b/test/fixtures/reverse_proxy/Staticfile
diff --git a/test/fixtures/reverse_proxy/index.html b/test/fixtures/reverse_proxy/index.html
@@ -0,0 +1,6 @@
+<html>
+<body>
+	<p>The iframe below should show https://www.google.it/intl/en/policies/?fg=1 proxied via /intl/en/policies</p>
+	<iframe src="/intl/en/policies"></iframe>
+</body>
+</html>
diff --git a/test/fixtures/reverse_proxy/nginx.conf b/test/fixtures/reverse_proxy/nginx.conf
@@ -0,0 +1,37 @@
+worker_processes 1;
+daemon off;
+
+error_log <%= ENV["APP_ROOT"] %>/nginx/logs/error.log;
+events { worker_connections 1024; }
+
+http {
+  log_format cloudfoundry '$http_x_forwarded_for - $http_referer - [$time_local] "$request" $status $body_bytes_sent';
+  access_log <%= ENV["APP_ROOT"] %>/nginx/logs/access.log cloudfoundry;
+  default_type application/octet-stream;
+  include mime.types;
+  sendfile on;
+  gzip on;
+  tcp_nopush on;
+  keepalive_timeout 30;
+
+  server {
+    listen <%= ENV["PORT"] %>;
+    server_name localhost;
+
+    location /intl/en/policies {
+        proxy_pass "https://www.google.it/intl/en/policies/?fg=1";
+    }
+
+    location / {
+      root <%= ENV["APP_ROOT"] %>/public;
+      index index.html index.htm Default.htm;
+      <% if File.exists?(File.join(ENV["APP_ROOT"], "nginx/conf/.enable_directory_index")) %>
+      autoindex on;
+      <% end %>
+      <% if File.exists?(auth_file = File.join(ENV["APP_ROOT"], "nginx/conf/.htpasswd")) %>
+      auth_basic "Restricted";                                #For Basic Auth
+      auth_basic_user_file <%= auth_file %>;  #For Basic Auth
+      <% end %>
+    }
+  }
+}
diff --git a/vendor/nginx-1.5.10.tar.gz b/vendor/nginx-1.5.10.tar.gz
diff --git a/vendor/nginx-1.7.4.tar.gz b/vendor/nginx-1.7.4.tar.gz