X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=etc%2Fnginx%2Fsite.d%2Fcyclo-wiki%2Fsite.conf;h=1ede3791df4cd33892ec848e0fc37914bad6c321;hb=4785f37c83a72a8e881941e47a10bcacfd2fb1bc;hp=834df1001eb341b9e9a6e857977c2315ff580056;hpb=3ea23a03cf85542ecc1134e25e0a56cab82139f8;p=lhc%2Fateliers.git

diff --git a/etc/nginx/site.d/cyclo-wiki/site.conf b/etc/nginx/site.d/cyclo-wiki/site.conf
index 834df10..1ede379 100644
--- a/etc/nginx/site.d/cyclo-wiki/site.conf
+++ b/etc/nginx/site.d/cyclo-wiki/site.conf
@@ -1,8 +1,9 @@
 server_name
  wiki.cyclocoop.org;
 
-auth_basic "pour demander un compte: admin+wiki@cyclocoop.org";
-auth_basic_user_file /home/www/data/cyclo-wiki/.htpasswd;
+access_log /home/www/log/cyclo-wiki/nginx/access.piwik.log piwik;
+#auth_basic "pour demander un compte: admin+wiki@cyclocoop.org";
+#auth_basic_user_file /home/www/data/cyclo-wiki/.htpasswd;
 client_body_buffer_size 8k;
 client_max_body_size 10m;
 error_page 404 /cgi/ikiwiki.cgi?do=create&page=$uri;
@@ -14,6 +15,8 @@ location ~ ^/gitweb/static/.+\.(css|png|js)$ {
 	log_not_found off;
  }
 location ~ ^/gitweb($|/) {
+	#auth_basic "no pasaran";
+	#auth_basic_user_file /home/www/data/cyclo-wiki/.htpasswd;
 	root /usr/share/gitweb;
 	fastcgi_param SCRIPT_FILENAME /usr/share/gitweb/gitweb.cgi;
 	include /etc/nginx/conf.d/fastcgi.conf;
@@ -49,14 +52,27 @@ location ~ ^/gitweb($|/) {
 
 location /cgi/ikiwiki.cgi {
 	include /etc/nginx/conf.d/fastcgi.conf;
+	set $r "$https$arg_do";
+	if ($r = "create") {
+		return 301 https://$host$request_uri;
+	 }
+	if ($r = "edit") {
+		return 301 https://$host$request_uri;
+	 }
+	if ($r = "prefs") {
+		return 301 https://$host$request_uri;
+	 }
 	fastcgi_index cgi/ikiwiki.cgi;
 	fastcgi_pass unix:/run/spawn-fcgi/cyclo-wiki;
  }
-location ~* ^.+\.(css|gif|html|ico|jpeg|js|jpg|png|txt|xml)$ {
+location ~* ^.+\.(css|gif|ico|jpeg|js|jpg|png)$ {
 	access_log off;
 	expires 30d;
 	log_not_found off;
  }
+location ~* ^.+\.(html|txt|xhtml|xml)$ {
+	expires 60s;
+ }
 location ~ /\. {
 	access_log off;
 	deny all;
@@ -65,5 +81,9 @@ location ~ /\. {
 location / {
 	index index.html;
  }
+location /3615 {
+	rewrite ^/3615(.*)$ https://3615.cyclocoop.org$1 last;
+	#return 301 https://3615.cyclocoop.org;
+ }
 
 # vim: ft=sh