james/fembooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Errors

Browse Source
This commit is contained in:
jgen 2014-02-18 00:29:26 -05:00
parent 3097de938d
commit 3e52a1df03
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@ -11,7 +11,6 @@ env:
before_install: before_install:
- sudo apt-get update > /dev/null - sudo apt-get update > /dev/null
- sudo cat /etc/nginx/nginx.conf
install: install:
- sudo chmod u+x tests/setup_test_env.sh - sudo chmod u+x tests/setup_test_env.sh

14
tests/setup_test_env.sh
View File

@ -25,6 +25,8 @@ sudo chmod -R 0777 $SHIMMIE_ROOT
NGINX_CONF="/etc/nginx/sites-enabled/default" NGINX_CONF="/etc/nginx/sites-enabled/default"
sudo cat /etc/nginx/nginx.conf
# nginx configuration # nginx configuration
echo " echo "
server { server {
@ -38,12 +40,12 @@ server {
} }
# For the Nice URLs in Shimmie. # For the Nice URLs in Shimmie.
location / { #location / {
if (!-e $request_filename) { # if (!-e $request_filename) {
rewrite ^(.*)$ /index.php?q=$1 last; # rewrite ^(.*)$ /index.php?q=$1 last;
break; # break;
} # }
} #}
location ~ \.php($|/) { location ~ \.php($|/) {
fastcgi_pass 127.0.0.1:9000; fastcgi_pass 127.0.0.1:9000;