X-Git-Url: https://git.cyclocoop.org/?p=lhc%2Fateliers.git;a=blobdiff_plain;f=etc%2Fnginx%2Fsite.d%2Fcyclo-wiki%2Fhttp.conf;h=b118c0860d9f0bf0c3ef1cfe760f1bcf81164b91;hp=cb6aa0b6c324007ff24bb36035cee189cb764b06;hb=e83883924c6b8dae45615c442253e83d839a43d1;hpb=a3ebc7e9c9125db9da4cf72843bb8272c1812d1f

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