diff options
| author |   Tristan Darricau <tristan.darricau@sensiolabs.com> | 2016-03-25 11:46:15 +0100 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2016-03-25 11:46:15 +0100 |
| commit | 3eb6f7176ac44b5786379162fc73df3abd196646 (patch) | |
| tree | ae5106d10c1515588243a016fc089a98c71fd8e5 /travis | |
| parent | Merge branch '3.1.x' into 3.2.x (diff) | |
| parent | [ticket/14497] Do not check for doctype on index and use correct return (diff) | |
| download | phpbb-3eb6f7176ac44b5786379162fc73df3abd196646.tar.gz phpbb-3eb6f7176ac44b5786379162fc73df3abd196646.tar.bz2 phpbb-3eb6f7176ac44b5786379162fc73df3abd196646.zip | |
Merge pull request #4193 from marc1706/ticket/14497
[ticket/14497] Support second app.php script in install folder
* marc1706/ticket/14497:
[ticket/14497] Do not check for doctype on index and use correct return
[ticket/14497] Add test for visiting installer
[ticket/14497] Use nginx sample config in travis tests
[ticket/14497] Support second app.php script in install folder
Diffstat (limited to 'travis')
| -rwxr-xr-x | travis/setup-webserver.sh | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/travis/setup-webserver.sh b/travis/setup-webserver.sh index 911ba12f3c..3369d740fe 100755 --- a/travis/setup-webserver.sh +++ b/travis/setup-webserver.sh @@ -57,20 +57,12 @@ else fi # 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_CONF sudo service nginx start |