Fix wrong git-http-backend path in apache.conf

software/trac-svn/instance-trac.cfg

@@ -222,7 +222,7 @@ trac_plugins = $${:project_dir}/plugins
 git_bin = ${git:location}/bin/git
 git_project_base = $${:project_dir}/git
 git_project_list = 
-git_url = $${:project_url}/git
+git_url = $${:project_url}git
 admin_email = $${slap-parameter:admin-email}
 project_description = $${slap-parameter:project-desc}
 project_footer = $${slap-parameter:project-footer}
@@ -286,7 +286,7 @@ python_lib = ${python2.7:location}/lib
 recipe = slapos.recipe.template
 url = ${template-gitweb-conf:location}/${template-gitweb-conf:filename}
 output = $${rootdirectory:etc}/gitweb.conf
-url-list = $${trac-config:project_url}/git http://[$${slap-network-information:global-ipv6}]:8080/git git://[$${slap-network-information:global-ipv6}]
+url-list = $${trac-config:project_url}git http://[$${slap-network-information:global-ipv6}]:8080/git git://[$${slap-network-information:global-ipv6}]
 base-directory = $${trac-config:project_dir}/git
 
 [gitweb-cgi]
@@ -450,9 +450,9 @@ config-custom_domain = $${slap-parameter:domain}
 [publish-connection-informations]
 recipe = slapos.cookbook:publish
 backend_url = http://[$${httpd-conf:ip}]:$${httpd-conf:port}/
-url = $${request-frontend:connection-site_url}
-git = $${request-frontend:connection-site_url}/git
-svn = $${request-frontend:connection-site_url}/svn
+frontend_url = $${request-frontend:connection-site_url}
+git = $${request-frontend:connection-site_url}git/
+svn = $${request-frontend:connection-site_url}svn/
 admin_user = $${trac-admin:user}
 admin_password = $${trac-admin:password}
 admin_shell = https://[$${shellinabox:ipv6}]:$${shellinabox:port}/

software/trac-svn/software.cfg

@@ -89,7 +89,7 @@ md5sum = bc6ed91a1862a10af661713aa0691848
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-trac.cfg
 output = ${buildout:directory}/template-trac.cfg
-md5sum = bbdadd638ac10c5ca652fca27bf18fff
+md5sum = 1546a60e086b4d083d58ad4fca6dcca8
 mode = 0644
 
 [instance-mariadb]
@@ -138,7 +138,7 @@ md5sum = 3e4d25ce53dcc3729f4bc682e0d2d239
 [template-httpd-conf]
 <= template-download
 filename = apache.in
-md5sum = 452ff6c77211e312be0227155a83931c
+md5sum = 4f6d1b748c149f32a39c89931e0cd94a
 
 [template-gitweb-cgi]
 <= template-download

software/trac-svn/templates/apache.in

@@ -71,7 +71,7 @@ ScriptAliasMatch \
                                  [0-9a-f]{2}/[0-9a-f]{38} | \
                                  pack/pack-[0-9a-f]{40}\.(pack|idx)) | \
                         git-(upload|receive)-pack))$" \
-        "/srv/slapgrid/slappart19/srv/runner/instance/slappart0/bin/git-http-backend.cgi/$1"
+        "${:git-http-backend}/$1"
 
 # Everything else is gitweb interface
 ScriptAlias "/git"                                                "${:gitweb-script}"