From: Julien Moutinho <julm+heureux-cyclage@autogeree.net>
Date: Tue, 27 Aug 2013 15:48:14 +0000 (+0200)
Subject: Correction : nginx : échappement regexp.
X-Git-Url: https://git.cyclocoop.org/?p=lhc%2Fateliers.git;a=commitdiff_plain;h=e77a454ce713dde6eaec17043e756104e9fb5ecc

Correction : nginx : échappement regexp.
---

diff --git a/etc/nginx/site.d/agendav/site.conf b/etc/nginx/site.d/agendav/site.conf
index 21f3e8f..5c39115 100644
--- a/etc/nginx/site.d/agendav/site.conf
+++ b/etc/nginx/site.d/agendav/site.conf
@@ -49,7 +49,7 @@ location ~* ^.+\.php(|/.*)$ {
 	
 	fastcgi_pass unix:/run/php5/fpm/agendav;
  }
-location ~* ^.+.(css|gif|html|ico|jpeg|js|jpg|png|txt|xml)$ {
+location ~* ^.+\.(css|gif|html|ico|jpeg|js|jpg|png|txt|xml)$ {
 	root /home/www/data/agendav/web/public/;
 	access_log off;
 	expires 30d;
diff --git a/etc/nginx/site.d/caldavzap/site.conf b/etc/nginx/site.d/caldavzap/site.conf
index 4fbd09e..91a382e 100644
--- a/etc/nginx/site.d/caldavzap/site.conf
+++ b/etc/nginx/site.d/caldavzap/site.conf
@@ -5,7 +5,7 @@ server_name
 client_body_buffer_size 1024k;
 client_max_body_size 10m;
 
-location ~* ^/davical/htdocs/caldav.php(|/.*)$ {
+location ~* ^/davical/htdocs/caldav\.php(|/.*)$ {
 	root /usr/share/;
 	keepalive_timeout 10;
 	include /etc/nginx/conf.d/fastcgi.conf;
@@ -41,13 +41,13 @@ location ~* ^/davical/htdocs/caldav.php(|/.*)$ {
 	
 	fastcgi_pass unix:/run/php5/fpm/davical;
  }
-location ~* ^/davical/htdocs/.+.(css|gif|html|ico|jpeg|js|jpg|png|txt|xml)$ {
+location ~* ^/davical/htdocs/.+\.(css|gif|html|ico|jpeg|js|jpg|png|txt|xml)$ {
 	root /usr/share/;
 	access_log off;
 	expires 30d;
 	log_not_found off;
  }
-location ~* ^.+.(css|gif|html|ico|jpeg|js|jpg|png|txt|xml)$ {
+location ~* ^.+\.(css|gif|html|ico|jpeg|js|jpg|png|txt|xml)$ {
 	access_log off;
 	expires 30d;
 	log_not_found off;
diff --git a/etc/nginx/site.d/cyclo-www/site.conf b/etc/nginx/site.d/cyclo-www/site.conf
index 63387ec..d8bbcc8 100644
--- a/etc/nginx/site.d/cyclo-www/site.conf
+++ b/etc/nginx/site.d/cyclo-www/site.conf
@@ -6,7 +6,7 @@ server_name
 location / {
 	index index.html index.htm index.php;
  }
-location ~* ^.+.(css|gif|html|ico|jpeg|js|jpg|png|txt|xml)$ {
+location ~* ^.+\.(css|gif|html|ico|jpeg|js|jpg|png|txt|xml)$ {
 	access_log off;
 	expires 30d;
 	log_not_found off;
diff --git a/etc/nginx/site.d/cyclocamp-www/site.conf b/etc/nginx/site.d/cyclocamp-www/site.conf
index ce1b0fb..ddd94d5 100644
--- a/etc/nginx/site.d/cyclocamp-www/site.conf
+++ b/etc/nginx/site.d/cyclocamp-www/site.conf
@@ -6,7 +6,7 @@ server_name
 location / {
 	index index.html index.htm index.php;
  }
-location ~* ^.+.(css|gif|html|ico|jpeg|js|jpg|png|txt|xml)$ {
+location ~* ^.+\.(css|gif|html|ico|jpeg|js|jpg|png|txt|xml)$ {
 	access_log off;
 	expires 30d;
 	log_not_found off;
diff --git a/etc/nginx/site.d/davical/site.conf b/etc/nginx/site.d/davical/site.conf
index 999d40d..278306a 100644
--- a/etc/nginx/site.d/davical/site.conf
+++ b/etc/nginx/site.d/davical/site.conf
@@ -13,7 +13,7 @@ location / {
  # NOTE: to get DAViCal and nginx working with iCal 6.0 clients.
 	return 301 /caldav.php$1;
  }
-location ~* ^.+.(css|gif|html|ico|jpeg|js|jpg|png|txt|xml)$ {
+location ~* ^.+\.(css|gif|html|ico|jpeg|js|jpg|png|txt|xml)$ {
 	root /usr/share/davical/htdocs/;
 	access_log off;
 	expires 30d;
diff --git a/etc/nginx/site.d/lhc-questionnaires/site.conf b/etc/nginx/site.d/lhc-questionnaires/site.conf
index bd4365d..714ec2c 100644
--- a/etc/nginx/site.d/lhc-questionnaires/site.conf
+++ b/etc/nginx/site.d/lhc-questionnaires/site.conf
@@ -8,7 +8,7 @@ location / {
 	 }
 	index index.html index.htm index.php;
  }
-location ~* ^.+.(css|gif|html|ico|jpeg|js|jpg|png|txt|xml)$ {
+location ~* ^.+\.(css|gif|html|ico|jpeg|js|jpg|png|txt|xml)$ {
 	access_log off;
 	expires 30d;
 	log_not_found off;
diff --git a/etc/nginx/site.d/lhc-remorque/site.conf b/etc/nginx/site.d/lhc-remorque/site.conf
index 959b8cd..e85663a 100644
--- a/etc/nginx/site.d/lhc-remorque/site.conf
+++ b/etc/nginx/site.d/lhc-remorque/site.conf
@@ -50,7 +50,7 @@ location ~ ^/gitweb($|/) {
 location / {
 	index index.xhtml;
  }
-location ~* ^.+.(css|gif|html|ico|jpeg|js|jpg|png|txt|xml)$ {
+location ~* ^.+\.(css|gif|html|ico|jpeg|js|jpg|png|txt|xml)$ {
 	access_log off;
 	expires 30d;
 	log_not_found off;
diff --git a/etc/nginx/site.d/lhc-www/site.conf b/etc/nginx/site.d/lhc-www/site.conf
index 13786a6..7ed7d17 100644
--- a/etc/nginx/site.d/lhc-www/site.conf
+++ b/etc/nginx/site.d/lhc-www/site.conf
@@ -5,7 +5,7 @@ client_max_body_size 10m;
 location / {
 	index index.html index.htm index.php;
  }
-location ~* ^.+.(css|gif|html|ico|jpeg|js|jpg|png|txt|xml)$ {
+location ~* ^.+\.(css|gif|html|ico|jpeg|js|jpg|png|txt|xml)$ {
 	access_log off;
 	expires 30d;
 	log_not_found off;
diff --git a/etc/nginx/site.d/roundcube/site.conf b/etc/nginx/site.d/roundcube/site.conf
index c8fd7cb..6511577 100644
--- a/etc/nginx/site.d/roundcube/site.conf
+++ b/etc/nginx/site.d/roundcube/site.conf
@@ -14,7 +14,7 @@ location ~ /\. {
 	deny all;
 	log_not_found off;
  }
-location ~ ^/favicon.ico$ {
+location = /favicon.ico {
 	root /usr/share/roundcube/skins/default/images/;
 	access_log off;
 	expires max;
@@ -31,13 +31,13 @@ location ~ ^/(README|INSTALL|LICENSE|CHANGELOG|UPGRADING)$ {
 location ~ ^/(bin|SQL)/ {
 	deny all;
  }
-location ~ ^/images/.+(png) {
+location ~ ^/images/.+\.(png) {
 	root /home/www/data/roundcube;
 	access_log off;
 	expires 30d;
 	log_not_found off;
  }
-location ~* ^.+.(css|gif|html|ico|jpeg|js|jpg|png|txt|xml)$ {
+location ~* ^.+\.(css|gif|html|ico|jpeg|js|jpg|png|txt|xml)$ {
 	root /usr/share/roundcube;
 	access_log off;
 	expires 30d;