nginx: git-http-backend, cgit

4 files changed, 17 insertions, 55 deletions

diff --git a/etc/nginx/sites-enabled/git-ssl.site b/etc/nginx/sites-enabled/git-ssl.site
index 338dde4..d54418c 100644
--- a/etc/nginx/sites-enabled/git-ssl.site
+++ b/etc/nginx/sites-enabled/git-ssl.site
@@ -4,11 +4,25 @@ server {
 	# listen   [::]:80 default_server ipv6only=on; ## listen for ipv6
 
 	root /var/git;
-	# Make site accessible from http://localhost/
 	server_name git.taler.net;
         include conf.d/talerssl;
 
+	location ~ ^(.*?)\.git/(HEAD|info/refs|objects/.*|git-upload-pack)$ {
+	    include /etc/nginx/fastcgi_params;
+	    fastcgi_param   SCRIPT_FILENAME /usr/lib/git-core/git-http-backend;
+	    fastcgi_param   GIT_PROJECT_ROOT        /home/git/repositories;
+	    fastcgi_param   PATH_INFO               $uri;
+	    fastcgi_pass unix:/var/run/fcgiwrap.socket;
+	}
+
+	location /cgit {
+	    root /var/www;
+	}
+
 	location / {
-	    autoindex off;
+	    include /etc/nginx/fastcgi_params;
+	    fastcgi_param   SCRIPT_FILENAME /var/www/cgit/cgit.cgi;
+	    fastcgi_param   PATH_INFO               $uri;
+	    fastcgi_pass unix:/var/run/fcgiwrap.socket;
 	}
 }
diff --git a/etc/nginx/sites-enabled/git.site b/etc/nginx/sites-enabled/git.site
index c57e618..4c0c9ea 100644
--- a/etc/nginx/sites-enabled/git.site
+++ b/etc/nginx/sites-enabled/git.site
@@ -4,10 +4,7 @@ server {
 	# listen   [::]:80 default_server ipv6only=on; ## listen for ipv6
 
 	root /var/git;
-	# Make site accessible from http://localhost/
 	server_name git.taler.net;
 
-	location / {
-	    autoindex off;
-	}
+	rewrite ^ https://$server_name$request_uri? permanent;
 }
diff --git a/etc/nginx/sites-enabled/www.git-ssl.site b/etc/nginx/sites-enabled/www.git-ssl.site
deleted file mode 100644
index 4ac7cfa..0000000
--- a/etc/nginx/sites-enabled/www.git-ssl.site
+++ /dev/null
@@ -1,25 +0,0 @@
-server {
-       listen 443 ssl;
-       listen   [::]:443 ssl; ## listen for ipv4; this line is default and implied
-	# listen   [::]:80 default_server ipv6only=on; ## listen for ipv6
-
-	# Make site accessible from http://localhost/
-	server_name www.git.taler.net;
-
-        include conf.d/talerssl;
-
-	location /index.cgi {
-            root /usr/share/gitweb/;
-
-            include fastcgi_params;
-            gzip off;
-	    fastcgi_param SCRIPT_NAME $uri;
-            fastcgi_param   GITWEB_CONFIG  /etc/gitweb.conf;
-            fastcgi_pass    unix:/var/run/fcgiwrap.socket;
-	}
-
-        location / {
-            root /usr/share/gitweb/;
-            index index.cgi;
-        }
-}
diff --git a/etc/nginx/sites-enabled/www.git.site b/etc/nginx/sites-enabled/www.git.site
deleted file mode 100644
index 26679be..0000000
--- a/etc/nginx/sites-enabled/www.git.site
+++ /dev/null
@@ -1,24 +0,0 @@
-server {
-       listen 80;
-	listen   [::]:80; ## listen for ipv4; this line is default and implied
-	# listen   [::]:80 default_server ipv6only=on; ## listen for ipv6
-
-	# Make site accessible from http://localhost/
-	server_name www.git.taler.net;
-
-
-	location /index.cgi {
-            root /usr/share/gitweb/;
-
-            include fastcgi_params;
-            gzip off;
-	    fastcgi_param SCRIPT_NAME $uri;
-            fastcgi_param   GITWEB_CONFIG  /etc/gitweb.conf;
-            fastcgi_pass    unix:/var/run/fcgiwrap.socket;
-	}
-
-        location / {
-            root /usr/share/gitweb/;
-            index index.cgi;
-        }
-}