dépôts
/
lhc
/
ateliers.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Correction : redirection HTTPS pour edit et create également.
[lhc/ateliers.git]
/
etc
/
nginx
/
site.d
/
cyclo-wiki
/
site.conf
diff --git
a/etc/nginx/site.d/cyclo-wiki/site.conf
b/etc/nginx/site.d/cyclo-wiki/site.conf
index
e96dc74
..
1ede379
100644
(file)
--- a/
etc/nginx/site.d/cyclo-wiki/site.conf
+++ b/
etc/nginx/site.d/cyclo-wiki/site.conf
@@
-2,8
+2,8
@@
server_name
wiki.cyclocoop.org;
access_log /home/www/log/cyclo-wiki/nginx/access.piwik.log piwik;
wiki.cyclocoop.org;
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;
+
#
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;
client_body_buffer_size 8k;
client_max_body_size 10m;
error_page 404 /cgi/ikiwiki.cgi?do=create&page=$uri;
@@
-15,8
+15,8
@@
location ~ ^/gitweb/static/.+\.(css|png|js)$ {
log_not_found off;
}
location ~ ^/gitweb($|/) {
log_not_found off;
}
location ~ ^/gitweb($|/) {
- auth_basic "no pasaran";
- auth_basic_user_file /home/www/data/cyclo-wiki/.htpasswd;
+
#
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;
root /usr/share/gitweb;
fastcgi_param SCRIPT_FILENAME /usr/share/gitweb/gitweb.cgi;
include /etc/nginx/conf.d/fastcgi.conf;
@@
-52,6
+52,16
@@
location ~ ^/gitweb($|/) {
location /cgi/ikiwiki.cgi {
include /etc/nginx/conf.d/fastcgi.conf;
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;
}
fastcgi_index cgi/ikiwiki.cgi;
fastcgi_pass unix:/run/spawn-fcgi/cyclo-wiki;
}