From 8030037984b19ccdbba8227af72907f1c2b3a1b5 Mon Sep 17 00:00:00 2001 From: Serghei Mihai Date: Tue, 2 Jun 2015 18:18:24 +0200 Subject: [PATCH] debian: nginx example update Removed from .docs --- debian/share/nginx-example.conf | 18 +++++++----------- debian/u-auth.docs | 1 - 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/debian/share/nginx-example.conf b/debian/share/nginx-example.conf index bd8283b..fbe984d 100644 --- a/debian/share/nginx-example.conf +++ b/debian/share/nginx-example.conf @@ -9,16 +9,11 @@ server { access_log /var/log/nginx/u-auth.example.org-access.log combined; error_log /var/log/nginx/u-auth.example.org-error.log; - location ~ ^/([^/]*)/static/(.+)$ { + location ~ ^/static/([^/]+)/(.+)$ { root /; try_files /var/lib/u-auth/organizations/$1/static/$2 - =404; - } - - location ~ ^/static/(.+) { - root /; - try_files /var/lib/u-auth/static/$1 - /var/lib/u-auth/collectstatic/$1 + /var/lib/u-auth/static/$1/$2 + /var/lib/u-auth/collectstatic/$1/$2 =404; } @@ -45,10 +40,11 @@ server { access_log /var/log/nginx/u-auth.example.org-access.log combined; error_log /var/log/nginx/u-auth.example.org-error.log; - location ~ ^/static/(.+)$ { + location ~ ^/static/([^/]+)/(.+)$ { root /; - try_files /var/lib/u-auth/static/$1 - /var/lib/u-auth/collectstatic/$1 + try_files /var/lib/u-auth/organizations/$1/static/$2 + /var/lib/u-auth/static/$1/$2 + /var/lib/u-auth/collectstatic/$1/$2 =404; } diff --git a/debian/u-auth.docs b/debian/u-auth.docs index 68b8457..2e3abae 100644 --- a/debian/u-auth.docs +++ b/debian/u-auth.docs @@ -1,3 +1,2 @@ COPYING README -debian/nginx-example.conf