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: http://git.cyclocoop.org/%7B%24admin_url%7Dcompta/comptes/%40%20%27entree_login%27%20=%3E%20%27Your%20login%27%2C%20%27entree_login_connexion_1%27%20=%3E%20%27Connection%20login%27%2C%20%27entree_login_connexion_2%27%20=%3E%20%27%28Sometimes%20matches%20your%20FTP%20account%20login%20and%20sometimes%20left%20empty%29%27%2C-%27entree_login_ldap%27%20=%3E%20%27Initial%20LDAP%20login%27%2C%20%27entree_mot_passe%27%20=%3E%20%27Your%20password%27%2C%20%27entree_mot_passe_1%27%20=%3E%20%27Password%27%2C%20%27entree_mot_passe_2%27%20=%3E%20%27%28Sometimes%20matches%20your%20FTP%20access%20password%20and%20sometimes%20left%20empty%29%27%2C%40%40%20-150%2C7%20%20121%2C7%20%40%40%20Do%20not%20submit%20this%20import%20request.%3Cp%3EFor%20more%20information%2C%20please%20see%20%3Ca%20href=?a=commitdiff_plain;h=e83883924c6b8dae45615c442253e83d839a43d1;p=lhc%2Fateliers.git

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;
  }