From 24771d2c5176bc96caca3ea4e1c80d1059fb914f Mon Sep 17 00:00:00 2001
From: Mitchell Krog <mitchellkrog@gmail.com>
Date: Tue, 7 Feb 2017 18:21:32 +0200
Subject: [PATCH] Fixing Travis - Last Try for Tonight - Getting Closer

---
 travis/hhvm.tpl.ini     |  2 +-
 travis/install-nginx.sh |  5 ++---
 travis/nginx.tpl.conf   | 41 ++++++++++++++++++++---------------------
 3 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/travis/hhvm.tpl.ini b/travis/hhvm.tpl.ini
index bddd2727b..0faa0c7b0 100644
--- a/travis/hhvm.tpl.ini
+++ b/travis/hhvm.tpl.ini
@@ -4,7 +4,7 @@ hhvm.server.type = fastcgi
 ;hhvm.server.file_socket = {SERVER}
 hhvm.server.port = {PORT}
 hhvm.log.use_log_file = true
-hhvm.log.file = {DIR}/tmp/error.log
+hhvm.log.file = /tmp/error.log
 hhvm.log.level = Warning
 hhvm.log.always_log_unhandled_exceptions = true
 hhvm.log.runtime_error_reporting_level = 8191
diff --git a/travis/install-nginx.sh b/travis/install-nginx.sh
index 5c5d35cc3..2bd6e2457 100755
--- a/travis/install-nginx.sh
+++ b/travis/install-nginx.sh
@@ -26,8 +26,8 @@ mkdir "$DIR/nginx"
 mkdir "$DIR/nginx/sites-enabled"
 mkdir "$DIR/var"
 mkdir "$DIR/nginx/bots.d"
-mkdir "$DIR/nginx/conf.d"
-mkdir "$DIR/tmp"
+#mkdir "$DIR/nginx/conf.d"
+#mkdir "$DIR/tmp"
 
 # Configure the PHP handler.
 if [ "$PHP_VERSION" = 'hhvm' ] || [ "$PHP_VERSION" = 'hhvm-nightly' ]
@@ -61,5 +61,4 @@ tpl "$DIR/blockbots.tpl.conf" "$DIR/nginx/bots.d/blockbots.conf"
 tpl "$DIR/ddos.tpl.conf" "$DIR/nginx/bots.d/ddos.conf"
 
 # Start nginx.
-nginx -p . -g 'error_log error.log;'
 nginx -c "$DIR/nginx/nginx.conf"
\ No newline at end of file
diff --git a/travis/nginx.tpl.conf b/travis/nginx.tpl.conf
index 6d86aded1..926503de9 100644
--- a/travis/nginx.tpl.conf
+++ b/travis/nginx.tpl.conf
@@ -1,6 +1,6 @@
+error_log /tmp/error.log;
+pid /tmp/nginx.pid;
 worker_processes 1;
-pid pid {DIR}/tmp/nginx.pid;
-
 events {
 	worker_connections 1024;
 }
@@ -16,19 +16,16 @@ http {
     ##
     # Basic Settings
     ##
-	sendfile on;
-	tcp_nopush on;
-	tcp_nodelay on;
-	keepalive_timeout 90s;
-	keepalive_requests 1000;
-	server_tokens off;
-	client_body_buffer_size 32k;
-	client_header_buffer_size    1k;
-	client_max_body_size 50M;
-	types_hash_max_size 2048;
-	server_names_hash_bucket_size 64;
-	server_names_hash_max_size 4096;
-	large_client_header_buffers 4 16k;
+    sendfile on;
+    tcp_nopush on;
+    tcp_nodelay on;
+    keepalive_timeout 65;
+    types_hash_max_size 2048;
+    # server_tokens off;
+    # server_names_hash_bucket_size 64;
+    # server_name_in_redirect off;
+    include /etc/nginx/mime.types;
+    default_type application/octet-stream;
 
 	# Our request limiter zone for wp-login attacks - for later use in Travis 
 	#limit_req_zone $binary_remote_addr zone=wp-login:10m rate=1r/s;
@@ -42,16 +39,18 @@ http {
     limit_conn_zone $ratelimited zone=addr:50m;
 
 
-    # server_name_in_redirect off;
-    include /etc/nginx/mime.types;
-    default_type application/octet-stream;
-
     ##
     # Logging Settings
     ##
-    access_log {DIR}/tmp/access.log;
-    error_log {DIR}/tmp/error.log;
+    access_log /tmp/access.log;
+    error_log /tmp/error.log;
 
+    ##
+    # Gzip Settings
+    ##
+    gzip on;
+    gzip_disable "msie6";
+    
     ##
     # Virtual Host Configs
     ##