diff options
author | Alfredo Ramos <alfredo.ramos.sanchez@gmail.com> | 2020-01-09 19:10:25 -0600 |
---|---|---|
committer | Alfredo Ramos <alfredo.ramos.sanchez@gmail.com> | 2020-01-09 19:10:25 -0600 |
commit | 5d5f34518d8b3d73c7acdace10da17cff6cc1114 (patch) | |
tree | 4e0e5e030cc4e4525ca2513aaa7e3c1524d1e483 /travis | |
parent | Merge pull request #5823 from JoshyPHP/ticket/16309 (diff) | |
download | phpbb-5d5f34518d8b3d73c7acdace10da17cff6cc1114.tar.gz phpbb-5d5f34518d8b3d73c7acdace10da17cff6cc1114.tar.bz2 phpbb-5d5f34518d8b3d73c7acdace10da17cff6cc1114.zip |
[ticket/16313] Remove http block from sample Nginx configuration file
Change placeholder domain to example.com
Also prefer fastcgi.conf over fastcgi_params as per Nginx documentation.
PHPBB3-16313
Diffstat (limited to 'travis')
-rwxr-xr-x | travis/setup-webserver.sh | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/travis/setup-webserver.sh b/travis/setup-webserver.sh index fd87d97449..68bcd6ac00 100755 --- a/travis/setup-webserver.sh +++ b/travis/setup-webserver.sh @@ -22,6 +22,7 @@ PHPBB_ROOT_PATH=$(realpath "$DIR/../phpBB") NGINX_SITE_CONF="/etc/nginx/sites-enabled/default" NGINX_CONF="/etc/nginx/nginx.conf" APP_SOCK=$(realpath "$DIR")/php-app.sock +NGINX_PHP_CONF="$DIR/nginx-php.conf" # php-fpm PHP_FPM_BIN="$HOME/.phpenv/versions/$TRAVIS_PHP_VERSION/sbin/php-fpm" @@ -45,13 +46,21 @@ sudo $PHP_FPM_BIN \ --fpm-config "$DIR/php-fpm.conf" # nginx -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 cp "$DIR/../phpBB/docs/nginx.sample.conf" "$NGINX_SITE_CONF" +sudo sed -i \ + -e "s/example\.com/localhost/g" \ + -e "s|root /path/to/phpbb;|root $PHPBB_ROOT_PATH;|g" \ + $NGINX_SITE_CONF +# Generate FastCGI configuration for Nginx +echo " +upstream php { + server unix:$APP_SOCK; +} +" > $NGINX_PHP_CONF + +sudo mv "$NGINX_PHP_CONF" /etc/nginx/conf.d/php.conf + +sudo nginx -T sudo service nginx start |