diff --git a/.travis.yml b/.travis.yml index dbd794f9..514f02e4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,6 @@ env: before_install: - sudo apt-get update > /dev/null - - sudo cat /etc/nginx/nginx.conf install: - sudo chmod u+x tests/setup_test_env.sh diff --git a/tests/setup_test_env.sh b/tests/setup_test_env.sh index efba7c3a..567fd93e 100644 --- a/tests/setup_test_env.sh +++ b/tests/setup_test_env.sh @@ -25,6 +25,8 @@ sudo chmod -R 0777 $SHIMMIE_ROOT NGINX_CONF="/etc/nginx/sites-enabled/default" +sudo cat /etc/nginx/nginx.conf + # nginx configuration echo " server { @@ -38,12 +40,12 @@ server { } # For the Nice URLs in Shimmie. - location / { - if (!-e $request_filename) { - rewrite ^(.*)$ /index.php?q=$1 last; - break; - } - } + #location / { + # if (!-e $request_filename) { + # rewrite ^(.*)$ /index.php?q=$1 last; + # break; + # } + #} location ~ \.php($|/) { fastcgi_pass 127.0.0.1:9000;