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

View file

@ -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

View file

@ -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;