Some tidying up of TravisCI build settings

This commit is contained in:
Mitchell Krog 2017-02-19 18:05:04 +02:00
parent 23155d3c22
commit a76b0646f9
2 changed files with 1 additions and 26 deletions

View file

@ -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"