X-Git-Url: http://git.cyclocoop.org/?p=lhc%2Fateliers.git;a=blobdiff_plain;f=etc%2Fnginx%2Fsite.d%2Fdavical%2Fsite.conf;h=999d40d6a8de282b7473b9ee8401772d20debde2;hp=914608546049f6569c4f1bc84505b2c19269a2cc;hb=49e8dcfd4c02e1648b1318eb1dc6874a01a8b614;hpb=aa227b359bc50c41c7760edf38d326a2e36ddc77

diff --git a/etc/nginx/site.d/davical/site.conf b/etc/nginx/site.d/davical/site.conf
index 9146085..999d40d 100644
--- a/etc/nginx/site.d/davical/site.conf
+++ b/etc/nginx/site.d/davical/site.conf
@@ -1,6 +1,7 @@
 server_name
  davical.heureux-cyclage.org
- davical.autogeree.net;
+ davical.autogeree.net
+ davical.cyclocoop.org;
 
 client_body_buffer_size 8k;
 client_max_body_size 10m;
@@ -25,17 +26,17 @@ location ~ /\. {
  }
 location ~ \.php(|/.*)$ {
 	root /usr/share/davical/htdocs/;
-	keepalive_timeout 0;
+	keepalive_timeout 10;
 	include /etc/nginx/conf.d/fastcgi.conf;
-	if ($request_method = OPTIONS) {
-		add_header Access-Control-Allow-Credentials "true";
-		add_header Access-Control-Allow-Headers "User-Agent,Authorization,Content-type,Depth,If-match,If-None-Match,Lock-Token,Timeout,Destination,Overwrite,X-client,X-Requested-With";
-		add_header Access-Control-Allow-Methods "GET,POST,OPTIONS,PROPFIND,REPORT,PUT,MOVE,DELETE,LOCK,UNLOCK";
-		add_header Access-Control-Allow-Origin "*";
-		add_header Content-Length 0;
-		add_header Content-Type text/plain;
-		return 200;
-	 }
+	#if ($request_method = OPTIONS) {
+	#	add_header Access-Control-Allow-Credentials "true";
+	#	add_header Access-Control-Allow-Headers "User-Agent,Authorization,Content-type,Depth,If-match,If-None-Match,Lock-Token,Timeout,Destination,Overwrite,X-client,X-Requested-With";
+	#	add_header Access-Control-Allow-Methods "GET,POST,OPTIONS,PROPFIND,REPORT,PUT,MOVE,DELETE,LOCK,UNLOCK";
+	#	add_header Access-Control-Allow-Origin "*";
+	#	add_header Content-Length 0;
+	#	add_header Content-Type text/plain;
+	#	return 200;
+	# }
 	set $no_cache "0";
 	if ($request_method !~ ^(GET|HEAD)$) {
 	 # NOTE: if non GET/HEAD, don't cache and mark user as uncacheable for 1 second via cookie.