diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2018-12-30 23:19:01 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2018-12-31 22:46:59 +0100 |
| commit | 444e5e6498c90c6c6e64f03d520b12eaf27b73db (patch) | |
| tree | 9c9eb3c13871ea862f2651515335c7a0619b96da /travis/setup-webserver.sh | |
| parent | a578ce01199a0296a5c83212acb2d8a503ca6c58 (diff) | |
| download | forums-444e5e6498c90c6c6e64f03d520b12eaf27b73db.tar forums-444e5e6498c90c6c6e64f03d520b12eaf27b73db.tar.gz forums-444e5e6498c90c6c6e64f03d520b12eaf27b73db.tar.bz2 forums-444e5e6498c90c6c6e64f03d520b12eaf27b73db.tar.xz forums-444e5e6498c90c6c6e64f03d520b12eaf27b73db.zip | |
[ticket/15924] Switch to trusty build environment
PHPBB3-15924
Diffstat (limited to 'travis/setup-webserver.sh')
| -rwxr-xr-x | travis/setup-webserver.sh | 7 |
1 files changed, 5 insertions, 2 deletions
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 |