Merge pull request hestiacp#627 from n1trux/master

serghey-rodin · web-flow · commit a4c0e13065d7 · 2016-06-27T11:32:40.000+03:00
fix dokuwiki nginx template
diff --git a/install/debian/7/templates/web/nginx/php5-fpm/dokuwiki.stpl b/install/debian/7/templates/web/nginx/php5-fpm/dokuwiki.stpl
@@ -32,7 +32,7 @@ server {
         }
     }
 
-    location ^~ /lib/ {
+    location ~ ^/lib.*\.(gif|png|ico|jpg)$ {
         expires 30d;
     }
 
diff --git a/install/debian/7/templates/web/nginx/php5-fpm/dokuwiki.tpl b/install/debian/7/templates/web/nginx/php5-fpm/dokuwiki.tpl
@@ -28,7 +28,7 @@ server {
         }
     }
 
-    location ^~ /lib/ {
+    location ~ ^/lib.*\.(gif|png|ico|jpg)$ {
         expires 30d;
     }
 
diff --git a/install/debian/8/templates/web/nginx/php5-fpm/dokuwiki.stpl b/install/debian/8/templates/web/nginx/php5-fpm/dokuwiki.stpl
@@ -32,7 +32,7 @@ server {
         }
     }
 
-    location ^~ /lib/ {
+    location ~ ^/lib.*\.(gif|png|ico|jpg)$ {
         expires 30d;
     }
 
diff --git a/install/debian/8/templates/web/nginx/php5-fpm/dokuwiki.tpl b/install/debian/8/templates/web/nginx/php5-fpm/dokuwiki.tpl
@@ -28,7 +28,7 @@ server {
         }
     }
 
-    location ^~ /lib/ {
+    location ~ ^/lib.*\.(gif|png|ico|jpg)$ {
         expires 30d;
     }
 
diff --git a/install/rhel/5/templates/web/nginx/php-fpm/dokuwiki.stpl b/install/rhel/5/templates/web/nginx/php-fpm/dokuwiki.stpl
@@ -32,7 +32,7 @@ server {
         }
     }
 
-    location ^~ /lib/ {
+    location ~ ^/lib.*\.(gif|png|ico|jpg)$ {
         expires 30d;
     }
 
diff --git a/install/rhel/5/templates/web/nginx/php-fpm/dokuwiki.tpl b/install/rhel/5/templates/web/nginx/php-fpm/dokuwiki.tpl
@@ -28,7 +28,7 @@ server {
         }
     }
 
-    location ^~ /lib/ {
+    location ~ ^/lib.*\.(gif|png|ico|jpg)$ {
         expires 30d;
     }
 
diff --git a/install/rhel/6/templates/web/nginx/php-fpm/dokuwiki.stpl b/install/rhel/6/templates/web/nginx/php-fpm/dokuwiki.stpl
@@ -32,7 +32,7 @@ server {
         }
     }
 
-    location ^~ /lib/ {
+    location ~ ^/lib.*\.(gif|png|ico|jpg)$ {
         expires 30d;
     }
 
diff --git a/install/rhel/6/templates/web/nginx/php-fpm/dokuwiki.tpl b/install/rhel/6/templates/web/nginx/php-fpm/dokuwiki.tpl
@@ -28,7 +28,7 @@ server {
         }
     }
 
-    location ^~ /lib/ {
+    location ~ ^/lib.*\.(gif|png|ico|jpg)$ {
         expires 30d;
     }
 
diff --git a/install/rhel/7/templates/web/nginx/php-fpm/dokuwiki.stpl b/install/rhel/7/templates/web/nginx/php-fpm/dokuwiki.stpl
@@ -32,7 +32,7 @@ server {
         }
     }
 
-    location ^~ /lib/ {
+    location ~ ^/lib.*\.(gif|png|ico|jpg)$ {
         expires 30d;
     }
 
diff --git a/install/rhel/7/templates/web/nginx/php-fpm/dokuwiki.tpl b/install/rhel/7/templates/web/nginx/php-fpm/dokuwiki.tpl
@@ -28,7 +28,7 @@ server {
         }
     }
 
-    location ^~ /lib/ {
+    location ~ ^/lib.*\.(gif|png|ico|jpg)$ {
         expires 30d;
     }
 
diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/dokuwiki.stpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/dokuwiki.stpl
@@ -32,7 +32,7 @@ server {
         }
     }
 
-    location ^~ /lib/ {
+    location ~ ^/lib.*\.(gif|png|ico|jpg)$ {
         expires 30d;
     }
 
diff --git a/install/ubuntu/12.04/templates/web/nginx/php5-fpm/dokuwiki.tpl b/install/ubuntu/12.04/templates/web/nginx/php5-fpm/dokuwiki.tpl
@@ -28,7 +28,7 @@ server {
         }
     }
 
-    location ^~ /lib/ {
+    location ~ ^/lib.*\.(gif|png|ico|jpg)$ {
         expires 30d;
     }
 
diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/dokuwiki.stpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/dokuwiki.stpl
@@ -32,7 +32,7 @@ server {
         }
     }
 
-    location ^~ /lib/ {
+    location ~ ^/lib.*\.(gif|png|ico|jpg)$ {
         expires 30d;
     }
 
diff --git a/install/ubuntu/12.10/templates/web/nginx/php5-fpm/dokuwiki.tpl b/install/ubuntu/12.10/templates/web/nginx/php5-fpm/dokuwiki.tpl
@@ -28,7 +28,7 @@ server {
         }
     }
 
-    location ^~ /lib/ {
+    location ~ ^/lib.*\.(gif|png|ico|jpg)$ {
         expires 30d;
     }
 
diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/dokuwiki.stpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/dokuwiki.stpl
@@ -32,7 +32,7 @@ server {
         }
     }
 
-    location ^~ /lib/ {
+    location ~ ^/lib.*\.(gif|png|ico|jpg)$ {
         expires 30d;
     }
 
diff --git a/install/ubuntu/13.04/templates/web/nginx/php5-fpm/dokuwiki.tpl b/install/ubuntu/13.04/templates/web/nginx/php5-fpm/dokuwiki.tpl
@@ -28,7 +28,7 @@ server {
         }
     }
 
-    location ^~ /lib/ {
+    location ~ ^/lib.*\.(gif|png|ico|jpg)$ {
         expires 30d;
     }
 
diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/dokuwiki.stpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/dokuwiki.stpl
@@ -32,7 +32,7 @@ server {
         }
     }
 
-    location ^~ /lib/ {
+    location ~ ^/lib.*\.(gif|png|ico|jpg)$ {
         expires 30d;
     }
 
diff --git a/install/ubuntu/13.10/templates/web/nginx/php5-fpm/dokuwiki.tpl b/install/ubuntu/13.10/templates/web/nginx/php5-fpm/dokuwiki.tpl
@@ -28,7 +28,7 @@ server {
         }
     }
 
-    location ^~ /lib/ {
+    location ~ ^/lib.*\.(gif|png|ico|jpg)$ {
         expires 30d;
     }
 
diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/dokuwiki.stpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/dokuwiki.stpl
@@ -32,7 +32,7 @@ server {
         }
     }
 
-    location ^~ /lib/ {
+    location ~ ^/lib.*\.(gif|png|ico|jpg)$ {
         expires 30d;
     }
 
diff --git a/install/ubuntu/14.04/templates/web/nginx/php5-fpm/dokuwiki.tpl b/install/ubuntu/14.04/templates/web/nginx/php5-fpm/dokuwiki.tpl
@@ -28,7 +28,7 @@ server {
         }
     }
 
-    location ^~ /lib/ {
+    location ~ ^/lib.*\.(gif|png|ico|jpg)$ {
         expires 30d;
     }
 
diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/dokuwiki.stpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/dokuwiki.stpl
@@ -32,7 +32,7 @@ server {
         }
     }
 
-    location ^~ /lib/ {
+    location ~ ^/lib.*\.(gif|png|ico|jpg)$ {
         expires 30d;
     }
 
diff --git a/install/ubuntu/14.10/templates/web/nginx/php5-fpm/dokuwiki.tpl b/install/ubuntu/14.10/templates/web/nginx/php5-fpm/dokuwiki.tpl
@@ -28,7 +28,7 @@ server {
         }
     }
 
-    location ^~ /lib/ {
+    location ~ ^/lib.*\.(gif|png|ico|jpg)$ {
         expires 30d;
     }
 
diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/dokuwiki.stpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/dokuwiki.stpl
@@ -32,7 +32,7 @@ server {
         }
     }
 
-    location ^~ /lib/ {
+    location ~ ^/lib.*\.(gif|png|ico|jpg)$ {
         expires 30d;
     }
 
diff --git a/install/ubuntu/15.04/templates/web/nginx/php5-fpm/dokuwiki.tpl b/install/ubuntu/15.04/templates/web/nginx/php5-fpm/dokuwiki.tpl
@@ -28,7 +28,7 @@ server {
         }
     }
 
-    location ^~ /lib/ {
+    location ~ ^/lib.*\.(gif|png|ico|jpg)$ {
         expires 30d;
     }
 
diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/dokuwiki.stpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/dokuwiki.stpl
@@ -32,7 +32,7 @@ server {
         }
     }
 
-    location ^~ /lib/ {
+    location ~ ^/lib.*\.(gif|png|ico|jpg)$ {
         expires 30d;
     }
 
diff --git a/install/ubuntu/15.10/templates/web/nginx/php5-fpm/dokuwiki.tpl b/install/ubuntu/15.10/templates/web/nginx/php5-fpm/dokuwiki.tpl
@@ -28,7 +28,7 @@ server {
         }
     }
 
-    location ^~ /lib/ {
+    location ~ ^/lib.*\.(gif|png|ico|jpg)$ {
         expires 30d;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ server {`
`32`	`32`	`}`
`33`	`33`	`}`
`34`	`34`
`35`		`- location ^~ /lib/ {`
	`35`	`+ location ~ ^/lib.*\.(gif\|png\|ico\|jpg)$ {`
`36`	`36`	`expires 30d;`
`37`	`37`	`}`
`38`	`38`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ server {`
`28`	`28`	`}`
`29`	`29`	`}`
`30`	`30`
`31`		`- location ^~ /lib/ {`
	`31`	`+ location ~ ^/lib.*\.(gif\|png\|ico\|jpg)$ {`
`32`	`32`	`expires 30d;`
`33`	`33`	`}`
`34`	`34`