diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/nginx-ssl.conf.example (renamed from config/nginx-ssl.conf-example) | 12 | ||||
| -rw-r--r-- | config/nginx.conf.example | 3 | ||||
| -rw-r--r-- | config/packages | 1 | ||||
| -rw-r--r-- | config/packages.debian-squeeze | 1 | ||||
| -rw-r--r-- | config/packages.debian-wheezy | 1 | ||||
| -rw-r--r-- | config/packages.ubuntu-precise | 1 |
6 files changed, 16 insertions, 3 deletions
diff --git a/config/nginx-ssl.conf-example b/config/nginx-ssl.conf.example index c623c8e96..af2e9e4ab 100644 --- a/config/nginx-ssl.conf-example +++ b/config/nginx-ssl.conf.example @@ -2,6 +2,13 @@ upstream alaveteli { server 127.0.0.1:3000; } +# Redirect any http:// request to https://www.example.com +server { + listen 80; + server_name www.example.com; + rewrite ^(.*) https://www.example.com$request_uri permanent; +} + server { listen 443; server_name www.example.com; @@ -14,6 +21,11 @@ server { access_log /var/log/nginx/alaveteli_ssl_access.log; error_log /var/log/nginx/alaveteli_ssl_error.log error; + location /download { + internal; + alias /var/www/alaveteli/alaveteli/cache/zips/production/download; + } + ssl on; ssl_certificate /etc/ssl/certs/www.example.com.cert; ssl_certificate_key /etc/ssl/private/www.example.com.key; diff --git a/config/nginx.conf.example b/config/nginx.conf.example index be937b7fd..7b8af2bd9 100644 --- a/config/nginx.conf.example +++ b/config/nginx.conf.example @@ -24,9 +24,6 @@ server { try_files $uri/index.html $uri @alaveteli; - error_page 500 502 503 504 /500.html; - error_page 404 /404.html; - error_page 422 /422.html; location /download { internal; diff --git a/config/packages b/config/packages index e11fa1d52..a6eeb8079 100644 --- a/config/packages +++ b/config/packages @@ -18,6 +18,7 @@ libsqlite3-dev libxml2-dev libxslt-dev links +lockfile-progs memcached mutt pdftk (>> 1.41+dfsg-1) | pdftk (<< 1.41+dfsg-1) # that version has a non-functionining uncompress option diff --git a/config/packages.debian-squeeze b/config/packages.debian-squeeze index 52bdbc376..c34abefde 100644 --- a/config/packages.debian-squeeze +++ b/config/packages.debian-squeeze @@ -15,6 +15,7 @@ libsqlite3-dev libxml2-dev libxslt-dev links +lockfile-progs mutt pdftk php5-cli diff --git a/config/packages.debian-wheezy b/config/packages.debian-wheezy index 381e25daa..4129aa930 100644 --- a/config/packages.debian-wheezy +++ b/config/packages.debian-wheezy @@ -13,6 +13,7 @@ libsqlite3-dev libxml2-dev libxslt-dev links +lockfile-progs mutt pdftk php5-cli diff --git a/config/packages.ubuntu-precise b/config/packages.ubuntu-precise index 87b9591bf..d97579bc1 100644 --- a/config/packages.ubuntu-precise +++ b/config/packages.ubuntu-precise @@ -12,6 +12,7 @@ libsqlite3-dev libxml2-dev libxslt1-dev links +lockfile-progs mutt pdftk poppler-utils |