summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSerghei Mihai <smihai@entrouvert.com>2015-06-02 16:18:24 (GMT)
committerSerghei Mihai <smihai@entrouvert.com>2015-06-08 09:21:22 (GMT)
commit8030037984b19ccdbba8227af72907f1c2b3a1b5 (patch)
treed4ab92e383bdd67e71125d5badc2be748fda392b
parent75ab7a7bab8767fd6375f5e07a811d636bf4534c (diff)
downloadu-auth-8030037984b19ccdbba8227af72907f1c2b3a1b5.zip
u-auth-8030037984b19ccdbba8227af72907f1c2b3a1b5.tar.gz
u-auth-8030037984b19ccdbba8227af72907f1c2b3a1b5.tar.bz2
debian: nginx example update
Removed from .docs
-rw-r--r--debian/share/nginx-example.conf18
-rw-r--r--debian/u-auth.docs1
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