feat(git): add private repo support.

5 files changed, 16 insertions, 14 deletions

diff --git a/services/docker/git-server/git-auth.conf b/services/docker/git-server/git-auth.conf
index 1acb316..d643659 100644
--- a/services/docker/git-server/git-auth.conf
+++ b/services/docker/git-server/git-auth.conf
@@ -1,3 +1,3 @@
-auth.backend = "htpasswd" 
-auth.backend.htpasswd.userfile = "/git/private/user-info" 
+auth.backend = "htpasswd"
+auth.backend.htpasswd.userfile = "/git/user-info"
 auth.require = ( "" => ("method" => "basic", "realm" => "Git Access", "require" => "valid-user") )
diff --git a/services/docker/git-server/git-lighttpd.conf b/services/docker/git-server/git-lighttpd.conf
index 567303a..d284ee1 100644
--- a/services/docker/git-server/git-lighttpd.conf
+++ b/services/docker/git-server/git-lighttpd.conf
@@ -10,9 +10,10 @@ $HTTP["url"] =^ "/git" {
     mimetype.assign = ( ".css" => "text/css" )
 
     $HTTP["url"] =^ "/git/private" {
-        url.access-deny = ("")
+        include "git-auth.conf"
     }
-    else $HTTP["url"] =~ "^/git/.*/(HEAD|info/refs|objects/info/[^/]+|git-(upload|receive)-pack)$" {
+
+    $HTTP["url"] =~ "^/git/.*/(HEAD|info/refs|objects/info/[^/]+|git-(upload|receive)-pack)$" {
         $HTTP["querystring"] =~ "service=git-receive-pack" {
             include "git-auth.conf"
         }
@@ -21,14 +22,14 @@ $HTTP["url"] =^ "/git" {
         }
         alias.url += ( "/git" => "/usr/lib/git-core/git-http-backend" )
         setenv.add-environment = (
-            "GIT_PROJECT_ROOT" => "/git",
+            "GIT_PROJECT_ROOT" => "/git/repos",
             "GIT_HTTP_EXPORT_ALL" => ""
         )
         cgi.assign = ("" => "")
     }
     else $HTTP["url"] =~ "^/git/.*/((objects/[0-9a-f]{2}/[0-9a-f]{38})|(pack/pack-[0-9a-f]{40}.(pack|idx)))$" {
         alias.url += (
-            "/git" => "/git",
+            "/git" => "/git/repos",
         )
     }
     else $HTTP["url"] =^ "/git/static" {
diff --git a/services/docker/git-server/hooks/update b/services/docker/git-server/hooks/update
index 4cfcacc..d6bfc1a 100755
--- a/services/docker/git-server/hooks/update
+++ b/services/docker/git-server/hooks/update
@@ -26,7 +26,7 @@ if [[ -f "$protected_file" ]]; then
   done <"$protected_file"
 fi
 
-global_hook="/git/private/git/hooks/update"
+global_hook="/git/hooks/update"
 local_hook="$GIT_DIR/hooks/update"
 
 if [[ -x "$global_hook" ]]; then
diff --git a/services/docker/git-server/lighttpd-wrapper.bash b/services/docker/git-server/lighttpd-wrapper.bash
index 06dc78f..a33015a 100755
--- a/services/docker/git-server/lighttpd-wrapper.bash
+++ b/services/docker/git-server/lighttpd-wrapper.bash
@@ -2,7 +2,7 @@
 
 set -e
 
-touch -a /git/private/user-info
+touch -a /git/user-info
 
 exec 3>&1
 exec lighttpd -D -f /app/git-lighttpd.conf
diff --git a/services/templates/cgitrc.template b/services/templates/cgitrc.template
index 277bb11..7e05ead 100644
--- a/services/templates/cgitrc.template
+++ b/services/templates/cgitrc.template
@@ -1,6 +1,8 @@
 css=/git/static/cgit.css
 logo=/git/static/cgit.png
 root-title=crupest Git Repos
+source-filter=/usr/lib/cgit/filters/syntax-highlighting.py
+about-filter=/usr/lib/cgit/filters/about-formatting.sh
 
 enable-http-clone=0
 enable-commit-graph=1
@@ -8,13 +10,12 @@ enable-index-links=1
 enable-index-owner=0
 enable-log-filecount=1
 enable-log-linecount=1
-section-from-path=1
-
-clone-url=@@CRUPEST_ROOT_URL@@git/$CGIT_REPO_URL
+enable-git-config=1
 snapshots=tar.gz tar.bz2 zip
-source-filter=/usr/lib/cgit/filters/syntax-highlighting.py
-about-filter=/usr/lib/cgit/filters/about-formatting.sh
+
 readme=:README.md
 readme=:README
 
-scan-path=/git/
+clone-prefix=@@CRUPEST_ROOT_URL@@git/
+section-from-path=1
+scan-path=/git/repos/