1 files changed, 26 insertions, 45 deletions
diff --git a/travis/setup-webserver.sh b/travis/setup-webserver.sh
index 911ba12f3c..fd87d97449 100755
--- a/travis/setup-webserver.sh
+++ b/travis/setup-webserver.sh
@@ -19,58 +19,39 @@ sudo service nginx stop
 DIR=$(dirname "$0")
 USER=$(whoami)
 PHPBB_ROOT_PATH=$(realpath "$DIR/../phpBB")
-NGINX_CONF="/etc/nginx/sites-enabled/default"
+NGINX_SITE_CONF="/etc/nginx/sites-enabled/default"
+NGINX_CONF="/etc/nginx/nginx.conf"
 APP_SOCK=$(realpath "$DIR")/php-app.sock
 
-if [ "$TRAVIS_PHP_VERSION" = 'hhvm' ]
-then
-	HHVM_LOG=$(realpath "$DIR")/hhvm.log
+# php-fpm
+PHP_FPM_BIN="$HOME/.phpenv/versions/$TRAVIS_PHP_VERSION/sbin/php-fpm"
+PHP_FPM_CONF="$DIR/php-fpm.conf"
 
-    sudo service hhvm stop
-	sudo hhvm \
-		--mode daemon \
-		--user "$USER" \
-		-vServer.Type=fastcgi \
-		-vServer.FileSocket="$APP_SOCK" \
-		-vLog.File="$HHVM_LOG"
-else
-	# php-fpm
-	PHP_FPM_BIN="$HOME/.phpenv/versions/$TRAVIS_PHP_VERSION/sbin/php-fpm"
-	PHP_FPM_CONF="$DIR/php-fpm.conf"
-
-	echo "
-		[global]
+echo "
+	[global]
 
-		[travis]
-		user = $USER
-		group = $USER
-		listen = $APP_SOCK
-		listen.mode = 0666
-		pm = static
-		pm.max_children = 2
+	[travis]
+	user = $USER
+	group = $USER
+	listen = $APP_SOCK
+	listen.mode = 0666
+	pm = static
+	pm.max_children = 2
 
-		php_admin_value[memory_limit] = 128M
-	" > $PHP_FPM_CONF
+	php_admin_value[memory_limit] = 128M
+" > $PHP_FPM_CONF
 
-	sudo $PHP_FPM_BIN \
-		--fpm-config "$DIR/php-fpm.conf"
-fi
+sudo $PHP_FPM_BIN \
+	--fpm-config "$DIR/php-fpm.conf"
 
 # nginx
-echo "
-	server {
-		listen	80;
-		root	$PHPBB_ROOT_PATH/;
-		index	index.php index.html;
-
-		location ~ \.php {
-			include							fastcgi_params;
-			fastcgi_split_path_info			^(.+\.php)(/.*)$;
-			fastcgi_param PATH_INFO			\$fastcgi_path_info;
-			fastcgi_param SCRIPT_FILENAME	\$document_root\$fastcgi_script_name;
-			fastcgi_pass					unix:$APP_SOCK;
-		}
-	}
-" | sudo tee $NGINX_CONF > /dev/null
+cat $DIR/../phpBB/docs/nginx.sample.conf \
+| sed "s/root \/path\/to\/phpbb/root $(echo $PHPBB_ROOT_PATH | sed -e 's/\\/\\\\/g' -e 's/\//\\\//g' -e 's/&/\\\&/g')/g" \
+| sed -e '1,/The actual board domain/d' \
+| sed -e '/If running php as fastcgi/,$d' \
+| sed -e "s/fastcgi_pass php;/fastcgi_pass unix:$(echo $APP_SOCK | sed -e 's/\\/\\\\/g' -e 's/\//\\\//g' -e 's/&/\\\&/g');/g" \
+| sed -e 's/#listen 80/listen 80/' \
+| sudo tee $NGINX_SITE_CONF
+sudo sed -i "s/user www-data;/user $USER;/g" $NGINX_CONF
 
 sudo service nginx start