From a76b0646f92fb4ffed2e39529975058e231883b2 Mon Sep 17 00:00:00 2001
From: Mitchell Krog <mitchellkrog@gmail.com>
Date: Sun, 19 Feb 2017 18:05:04 +0200
Subject: [PATCH] Some tidying up of TravisCI build settings

---
 travisCI/hhvm.tpl.ini     | 12 ------------
 travisCI/install-nginx.sh | 15 +--------------
 2 files changed, 1 insertion(+), 26 deletions(-)
 delete mode 100644 travisCI/hhvm.tpl.ini

diff --git a/travisCI/hhvm.tpl.ini b/travisCI/hhvm.tpl.ini
deleted file mode 100644
index 0faa0c7b0..000000000
--- a/travisCI/hhvm.tpl.ini
+++ /dev/null
@@ -1,12 +0,0 @@
-;hhvm
-hhvm.server.user = {USER}
-hhvm.server.type = fastcgi
-;hhvm.server.file_socket = {SERVER}
-hhvm.server.port = {PORT}
-hhvm.log.use_log_file = true
-hhvm.log.file = /tmp/error.log
-hhvm.log.level = Warning
-hhvm.log.always_log_unhandled_exceptions = true
-hhvm.log.runtime_error_reporting_level = 8191
-hhvm.mysql.typed_results = false
-hhvm.eval.jit = false
diff --git a/travisCI/install-nginx.sh b/travisCI/install-nginx.sh
index 0b4af892a..97fe87a11 100755
--- a/travisCI/install-nginx.sh
+++ b/travisCI/install-nginx.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Travis CI Code to Install Nginx
+# Travis CI Code to Configure Nginx
 set -e
 set -x
 
@@ -28,18 +28,6 @@ mkdir "$DIR/nginx/bots.d"
 mkdir "$DIR/var"
 
 # Configure the PHP handler.
-if [ "$PHP_VERSION" = 'hhvm' ] || [ "$PHP_VERSION" = 'hhvm-nightly' ]
-then
-    HHVM_CONF="$DIR/nginx/hhvm.ini"
-
-    tpl "$DIR/hhvm.tpl.ini" "$HHVM_CONF"
-
-    cat "$HHVM_CONF"
-
-    hhvm \
-        --mode=daemon \
-        --config="$HHVM_CONF"
-else
     PHP_FPM_BIN="$HOME/.phpenv/versions/$PHP_VERSION/sbin/php-fpm"
     PHP_FPM_CONF="$DIR/nginx/php-fpm.conf"
 
@@ -48,7 +36,6 @@ else
 
     # Start php-fpm
     "$PHP_FPM_BIN" --fpm-config "$PHP_FPM_CONF"
-fi
 
 # Build the default nginx config files.
 tpl "$DIR/nginx.tpl.conf" "$DIR/nginx/nginx.conf"