diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-01-23 16:58:05 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-01-26 11:28:11 +0000 |
| commit | a7dc93c5961d4d821af916679f084e9905464df0 (patch) | |
| tree | ddcef4ca5a70dbff5b0006a1654ccaf38f8cf55a | |
| parent | 366ea56e9976667b506486d787633078817812d2 (diff) | |
| download | infrastructure-a7dc93c5961d4d821af916679f084e9905464df0.tar.gz | |
openid_provider: Update Cherokee config to serve static files
We need to serve static content like CSS from /var/www/static, which
requires extra web server config.
| -rw-r--r-- | baserock_openid_provider/cherokee.conf | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/baserock_openid_provider/cherokee.conf b/baserock_openid_provider/cherokee.conf index b1e557fc..38c4f1fa 100644 --- a/baserock_openid_provider/cherokee.conf +++ b/baserock_openid_provider/cherokee.conf @@ -14,7 +14,8 @@ server!server_tokens = full server!timeout = 15 server!user = cherokee -# One virtual server which communicates with the uwsgi-django source. +# One virtual server which communicates with the uwsgi-django code and +# also serves static files. vserver!1!directory_index = index.html vserver!1!document_root = /var/www/cherokee vserver!1!error_writer!filename = /var/log/cherokee/error_log @@ -24,14 +25,16 @@ vserver!1!logger!access!buffsize = 16384 vserver!1!logger!access!filename = /var/log/cherokee/access_log vserver!1!logger!access!type = file vserver!1!nick = default -vserver!1!rule!1!document_root = /var/www -vserver!1!rule!1!handler = uwsgi -vserver!1!rule!1!handler!balancer = round_robin -vserver!1!rule!1!handler!balancer!source!10 = 1 -vserver!1!rule!1!handler!iocache = 1 -vserver!1!rule!1!match = default - -# The uWSGI communication is set up here. +vserver!1!rule!110!document_root = /var/www/static +vserver!1!rule!110!handler = file +vserver!1!rule!110!match = directory +vserver!1!rule!110!match!directory = /static +vserver!1!rule!10!document_root = /var/www +vserver!1!rule!10!handler = uwsgi +vserver!1!rule!10!handler!balancer = round_robin +vserver!1!rule!10!handler!balancer!source!10 = 1 +vserver!1!rule!10!handler!iocache = 1 +vserver!1!rule!10!match = default source!1!env_inherited = 1 source!1!host = 127.0.0.1:45023 source!1!interpreter = /usr/sbin/uwsgi --socket 127.0.0.1:45023 --ini=/srv/baserock_openid_provider/uwsgi.ini |