Merge branch 'gitweb'

software/gitrepo/gitweb.conf.in

@@ -2,5 +2,8 @@ $projectroot = '${git-repos:base-directory}';
 
 $site_name = '${slap-parameter:title}';
 
+our @git_base_url_list = qw(${:url-list});
+
 # Beautiful URLs
 $feature{'pathinfo'}{'default'} = [1];
+$feature{'blame'}{'default'} = [1];

software/gitrepo/instance-gitrepo.cfg

@@ -10,6 +10,7 @@ parts =
   httpd-conf
   gitweb-conf
   gitweb-cgi
+  gitdaemon
   git-http-backend-cgi
   htpasswd
   pwgen
@@ -17,7 +18,9 @@ parts =
 
 [publish]
 recipe = slapos.cookbook:publish
-url = http://$${pwgen:user}:$${pwgen:password}@[$${slap-network-information:global-ipv6}]:$${httpd-conf:port}/
+url = http://[$${slap-network-information:global-ipv6}]:$${httpd-conf:port}/
+user = $${pwgen:user}
+password = $${pwgen:password}
 
 [httpd]
 recipe = slapos.cookbook:wrapper
@@ -45,6 +48,7 @@ port = 8080
 recipe = slapos.recipe.template
 url = ${template-gitweb-conf:location}/${template-gitweb-conf:filename}
 output = $${rootdirectory:etc}/gitweb.conf
+url-list = http://[$${slap-network-information:global-ipv6}]:$${httpd-conf:port} git://[$${slap-network-information:global-ipv6}]
 
 [gitweb-cgi]
 recipe = slapos.recipe.template
@@ -64,6 +68,12 @@ mode = 700
 
 githttpbackend = ${git:location}/libexec/git-core/git-http-backend
 
+[gitdaemon]
+recipe = slapos.cookbook:wrapper
+ip = $${slap-network-information:global-ipv6}
+port = 9418
+command-line = ${git:location}/bin/git daemon --export-all --listen=$${:ip} --port=$${:port} --interpolated-path=$${git-repos:base-directory}/%D
+output = $${basedirectory:services}/git-daemon
 
 [htpasswd]
 recipe = collective.recipe.cmd

software/gitrepo/software.cfg

@@ -27,7 +27,7 @@ mode = 0644
 [template-gitrepo]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-gitrepo.cfg
-md5sum = 2ad8457628996bf0b71d80e10b3b5aa9
+md5sum = 15dd1b7ea3259197b847e94342adf872
 output = ${buildout:directory}/template-gitrepo.cfg
 mode = 0644
 
@@ -44,7 +44,7 @@ md5sum = 5c720202053bfba06eec6e97d8d47cd0
 [template-gitweb-conf]
 <= template-download
 filename = gitweb.conf.in
-md5sum = d3cb0c16f54da0ea02ac982dd59d7924
+md5sum = 580d4bd2723f7e0a44ec8fc5b360b429
 
 [template-git-http-backend-cgi]
 <= template-download