X-Git-Url: https://git.cyclocoop.org/?p=lhc%2Fateliers.git;a=blobdiff_plain;f=etc%2Fnginx%2Fsite.d%2Fgitweb%2Fsite.conf;h=d27614cb47f52f6aeea49d099bdd33ada164a23a;hp=f15b04612e704a64747693486da8baa83df34306;hb=bac5cba029aebec55df758a3c18e8edcf684af1f;hpb=b7595a000cae850e0702938336ce116376bc7d67

diff --git a/etc/nginx/site.d/gitweb/site.conf b/etc/nginx/site.d/gitweb/site.conf
index f15b046..d27614c 100644
--- a/etc/nginx/site.d/gitweb/site.conf
+++ b/etc/nginx/site.d/gitweb/site.conf
@@ -2,11 +2,8 @@ server_name git.heureux-cyclage.org;
 
 client_body_buffer_size 8k;
 client_max_body_size 10m;
-location / {
-	index index.html;
+location ~* ^.+\.(css|png|js)$ {
 	root /usr/share/gitweb;
- }
-location ~* ^.+.(css|gif|html|ico|jpeg|js|jpg|png|txt|xml)$ {
 	access_log off;
 	expires 30d;
 	log_not_found off;
@@ -16,21 +13,24 @@ location ~ /\. {
 	deny all;
 	log_not_found off;
  }
-location ~ ^.*\.git/objects/([0-9a-f]+/[0-9a-f]+|pack/pack-[0-9a-f]+.(pack|idx)) {
- # NOTE: static repo files for cloning over HTTP
-	root /home/git/pub;
- }
-location ~ ^.*\.git/(HEAD|info/refs|objects/info/.*|git-(upload|receive)-pack)$ {
- # NOTE: requests that need to go to git-http-backend
-	root /home/git/pub;
-	include /etc/nginx/conf.d/fastcgi.conf;
-	fastcgi_param GIT_HTTP_EXPORT_ALL "";
-	fastcgi_param GIT_PROJECT_ROOT /home/git/pub;
-	fastcgi_param PATH_INFO $uri;
-	fastcgi_param REMOTE_USER $remote_user;
-	fastcgi_param SCRIPT_FILENAME /usr/lib/git-core/git-http-backend;
- }
+# NOTE: commenté car exporte tous les dépôts indistinctement
+#location ~ ^.*\.git/(HEAD|info/refs|objects/info/.*|git-(upload|receive)-pack)$ {
+# # NOTE: requests that need to go to git-http-backend
+#	root /home/git/pub;
+#	fastcgi_param SCRIPT_FILENAME /usr/lib/git-core/git-http-backend;
+#	include /etc/nginx/conf.d/fastcgi.conf;
+#	fastcgi_param GIT_HTTP_EXPORT_ALL "";
+#	fastcgi_param GIT_PROJECT_ROOT /home/git/pub;
+#	fastcgi_param PATH_INFO $uri;
+#	fastcgi_pass unix:/run/spawn-fcgi/gitweb;
+# }
+#location ~ ^.*\.git/objects/([0-9a-f]+/[0-9a-f]+|pack/pack-[0-9a-f]+.(pack|idx)) {
+# # NOTE: static repo files for cloning over HTTP
+#	root /home/git/pub;
+# }
 location @gitweb {
+	root /usr/share/gitweb;
+	fastcgi_param SCRIPT_FILENAME /usr/share/gitweb/gitweb.cgi;
 	include /etc/nginx/conf.d/fastcgi.conf;
 	set $no_cache "0";
 	if ($request_method !~ ^(GET|HEAD)$) {
@@ -55,9 +55,6 @@ location @gitweb {
 	fastcgi_no_cache $no_cache;
 	fastcgi_param GITWEB_CONFIG /etc/gitweb/gitweb.conf;
 	fastcgi_param PATH_INFO $uri;
-	fastcgi_param REDIRECT_STATUS 200;
-		# NOTE: PHP only, required if PHP was built with --enable-force-cgi-redirect
-	fastcgi_param SCRIPT_FILENAME /usr/share/gitweb/gitweb.cgi;
 	
 	fastcgi_pass_header Cookie;
 	fastcgi_pass_header Set-Cookie;