prime8dev

commit 45b332224558364d048a7eb2d9f245fa8067aac0
parent 714ed53a3aaad09512094424e1a50fa6e10e0a4e
Author: Damian Myrda <damian@prime8.dev>
Date:   Fri, 20 Sep 2024 13:20:36 -0500

feat(gitweb): custom image, theme and authorized keys

Diffstat:
A
.gitmodules
 | 
3
+++
M
compose.yml
 | 
29
++++++++++-------------------
M
git/.gitignore
 | 
4
++--
A
git/Dockerfile
 | 
4
++++
A
git/gitweb.conf
 | 
10
++++++++++
A
git/theme
 | 
1
+

6 files changed, 30 insertions(+), 21 deletions(-)
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "git/theme"]
+	path = git/theme
+	url = https://github.com/CBenoit/gitweb-dark-theme.git
diff --git a/compose.yml b/compose.yml
@@ -6,8 +6,6 @@ services:
       - ./jail:/etc/fail2ban/jail.local:ro
       - /var/log/mail/mail.log:/var/log/mail/mail.log:ro
       - /var/log/auth.log:/var/log/auth.log:ro
-    networks:
-      - www
     restart: always
 
   updates:
@@ -28,8 +26,6 @@ services:
     ports:
       - "80:80"
       - "443:443"
-    networks:
-      - www
     volumes:
       - ./caddy:/etc/caddy/Caddyfile:ro
       - ./web/data/:/data/caddy/
@@ -47,8 +43,6 @@ services:
       - "465:465"
       - "587:587"
       - "993:993"
-    networks:
-      - www
     volumes:
       - ./mail/data/:/var/mail/
       - ./mail/state/:/var/mail-state/
@@ -61,28 +55,29 @@ services:
       - NET_ADMIN
     restart: always
 
-  repos:
-    container_name: repos
+  gitolite:
+    container_name: gitolite
     image: jgiannuzzi/gitolite
     env_file: ./git/env
     volumes:
-      - ./git/.gitolite.rc:/etc/gitolite/gitolite.rc:ro
-      - ./git/:/var/lib/git/
       - ./git/.ssh/keys/:/etc/ssh/keys/
+      - ./git/:/var/lib/git/
     ports:
       - "22:22"
+    restart: always
 
   gitweb:
     container_name: gitweb
-    image: rockstorm/gitweb
+    image: moncheeta/gitweb
     depends_on:
-      - repos
+      - gitolite
     volumes:
+      - ./git/gitweb.conf:/etc/gitweb.conf:ro
+      - ./git/theme/:/usr/share/gitweb/theme/:ro
       - ./git/:/srv/git/:ro
     expose:
       - "80"
-    networks:
-      - www
+    restart: always
 
   csc:
     container_name: csc
@@ -94,8 +89,4 @@ services:
       - ./csc/auth.json:/app/google_auth.json:ro
     expose:
       - "80"
-    networks:
-      - www
-
-networks:
-  www:
+    restart: always
diff --git a/git/.gitignore b/git/.gitignore
@@ -1,4 +1,4 @@
-/.gitolite
-/projects.list
+/.gitolite/
 /.ssh/
 /repositories/
+/projects.list
diff --git a/git/Dockerfile b/git/Dockerfile
@@ -0,0 +1,4 @@
+FROM rockstorm/gitweb
+
+RUN	apk --no-cache --update add \
+	highlight
diff --git a/git/gitweb.conf b/git/gitweb.conf
@@ -0,0 +1,10 @@
+our $site_name = "prime8.dev >> repos";
+
+our $projectroot = "/srv/git/repositories/";
+our $projects_list = "/srv/git/projects.list";
+
+$feature{"highlight"}{"default"} = [1];
+
+our $favicon = "theme/git-favicon.png";
+our $logo = "theme/git-logo.png";
+our @stylesheets = "theme/gitweb.css";
diff --git a/git/theme b/git/theme
@@ -0,0 +1 @@
+Subproject commit 200eada21e260160a5ff8e6acd01f22073fd1af6