diff options
| author | Gareth Rees <gareth@mysociety.org> | 2014-08-15 15:38:10 +0100 |
|---|---|---|
| committer | Gareth Rees <gareth@mysociety.org> | 2014-08-18 13:36:09 +0100 |
| commit | 2e24bbc520152bd63e71c5c47404e1b9789b440b (patch) | |
| tree | ad2dd0c2661a9dd8aea5fab5b94d7265c646ddca | |
| parent | 1057380bcce97b5ff1c829cc2dd6c6fc5d77e9b7 (diff) | |
Use legacy alaveteli install path for nginx root
For backwards compatability with the install script, use
PREFIX/HOST/SITE
| -rw-r--r-- | config/nginx-ssl.conf-example | 4 | ||||
| -rw-r--r-- | config/nginx.conf.example | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/config/nginx-ssl.conf-example b/config/nginx-ssl.conf-example index 6920e0e96..c623c8e96 100644 --- a/config/nginx-ssl.conf-example +++ b/config/nginx-ssl.conf-example @@ -5,7 +5,7 @@ upstream alaveteli { server { listen 443; server_name www.example.com; - root /var/www/alaveteli/public; + root /var/www/alaveteli/alaveteli/public; server_tokens off; @@ -25,7 +25,7 @@ server { proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-Proto https; proxy_set_header X-Sendfile-Type X-Accel-Redirect; - proxy_set_header X-Accel-Mapping /var/www/alaveteli/cache/zips/production/download=/download; + proxy_set_header X-Accel-Mapping /var/www/alaveteli/alaveteli/cache/zips/production/download=/download; proxy_redirect off; proxy_pass http://alaveteli; } diff --git a/config/nginx.conf.example b/config/nginx.conf.example index bad1484a5..be937b7fd 100644 --- a/config/nginx.conf.example +++ b/config/nginx.conf.example @@ -15,7 +15,7 @@ server { # Set the server name to your domain name if you have multiple nginx servers # running on your machine # server_name www.example.com; - root /var/www/alaveteli/public; + root /var/www/alaveteli/alaveteli/public; server_tokens off; @@ -30,7 +30,7 @@ server { location /download { internal; - alias /var/www/alaveteli/cache/zips/production/download; + alias /var/www/alaveteli/alaveteli/cache/zips/production/download; } location @alaveteli { @@ -39,7 +39,7 @@ server { proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-Proto http; proxy_set_header X-Sendfile-Type X-Accel-Redirect; - proxy_set_header X-Accel-Mapping /var/www/alaveteli/cache/zips/production/download=/download; + proxy_set_header X-Accel-Mapping /var/www/alaveteli/alaveteli/cache/zips/production/download=/download; proxy_redirect off; proxy_pass http://alaveteli; } |