From: Julien Moutinho <julm+heureux-cyclage@autogeree.net>
Date: Thu, 4 Sep 2014 23:00:40 +0000 (+0200)
Subject: Modification : cyclo-wiki accessible par HTTP désormais.
X-Git-Url: https://git.cyclocoop.org/?p=lhc%2Fateliers.git;a=commitdiff_plain;h=e83883924c6b8dae45615c442253e83d839a43d1

Modification : cyclo-wiki accessible par HTTP désormais.
---

diff --git a/etc/nginx/site.d/cyclo-wiki/http.conf b/etc/nginx/site.d/cyclo-wiki/http.conf
index cb6aa0b..b118c08 100644
--- a/etc/nginx/site.d/cyclo-wiki/http.conf
+++ b/etc/nginx/site.d/cyclo-wiki/http.conf
@@ -1,7 +1,10 @@
 server {
 	listen 80;
-	server_name
-	 wiki.cyclocoop.org;
+	access_log /home/www/log/cyclo-wiki/nginx/access.log main;
+	error_log  /home/www/log/cyclo-wiki/nginx/error.log warn;
+	root       /home/www/data/cyclo-wiki;
+	include    /etc/nginx/site.d/cyclo-wiki/local.conf;
 	
-	return 301 https://$host$request_uri;
+	#return 301 https://$host$request_uri;
+	include /etc/nginx/site.d/cyclo-wiki/site.conf;
  }