From 444e5e6498c90c6c6e64f03d520b12eaf27b73db Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 30 Dec 2018 23:19:01 +0100 Subject: [ticket/15924] Switch to trusty build environment PHPBB3-15924 --- travis/setup-webserver.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'travis/setup-webserver.sh') diff --git a/travis/setup-webserver.sh b/travis/setup-webserver.sh index 7fb67e0454..f4e78124d8 100755 --- a/travis/setup-webserver.sh +++ b/travis/setup-webserver.sh @@ -19,7 +19,8 @@ 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 # php-fpm @@ -50,6 +51,8 @@ cat $DIR/../phpBB/docs/nginx.sample.conf \ | 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_CONF +| sudo tee $NGINX_SITE_CONF +sudo sed -i "s/user www-data;/user $USER;/g" $NGINX_CONF +sudo nginx -t sudo service nginx start -- cgit v1.2.1