Fix html transformation for about + syntax hl changes

1 files changed, 48 insertions, 41 deletions

diff --git a/docker-compose.yml b/docker-compose.yml
index 0216d9d..f8316af 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,37 +1,4 @@
 services:
-  nginx-proxy:
-    profiles: [core]
-    container_name: nginx-proxy
-    image: 'jwilder/nginx-proxy:alpine'
-    restart: always
-    ports:
-      - '80:80'
-      - '443:443'
-    environment:
-      - DEFAULT_HOST=ediblemonad.dev
-      - HSTS=off
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
-      - proxy-certs:/etc/nginx/certs:ro
-      - proxy-vhost:/etc/nginx/vhost.d
-      - proxy-html:/usr/share/nginx/html
-
-  proxy-letsencrypt:
-    profiles: [core]
-    image: 'nginxproxy/acme-companion'
-    restart: always
-    environment:
-      - DEFAULT_EMAIL=ediblemonad@gmail.com
-      - NGINX_PROXY_CONTAINER=nginx-proxy
-      - NGINX_DOCKER_GEN_CONTAINER=nginx-proxy
-      - ACME_CA_URI=https://acme-staging-v02.api.letsencrypt.org/directory
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock:ro
-      - proxy-certs:/etc/nginx/certs
-      - proxy-vhost:/etc/nginx/vhost.d
-      - proxy-html:/usr/share/nginx/html
-      - acme:/etc/acme.sh
-
   send:
     profiles: [services]
     image: 'registry.gitlab.com/timvisee/send:v3.4.27'
@@ -39,7 +6,7 @@ services:
     ports:
       - '1234:1234'
     volumes:
-      - ./uploads:/uploads
+      - /uploads:/uploads
     environment:
       - VIRTUAL_PORT=1234
       - VIRTUAL_HOST=send.ediblemonad.dev
@@ -60,27 +27,67 @@ services:
     depends_on:
       - redis
 
-  redis:
-    profiles: [services]
-    image: 'redis:alpine'
-    restart: always
-    volumes:
-      - redis:/data
-
   cgit:
     profiles: [services]
     image: 'joseluisq/alpine-cgit:2.9'
+    restart: always
     ports:
       - 8080:80
     environment:
+      - VIRTUAL_PORT=80
+      - VIRTUAL_HOST=git.ediblemonad.dev
+      - LETSENCRYPT_HOST=git.ediblemonad.dev
+      - DHPARAM_GENERATION=false
       - USE_CUSTOM_CONFIG=true
     volumes:
       - cgit-cache:/var/cache/cgit
       - /home/imsohexy/dev/projects:/srv/git:ro
       - ./cgit/cgitrc:/etc/cgitrc:ro
       - ./cgit/static:/usr/share/webapps/cgit/ediblemonad:ro
+      - ./cgit/nginx.conf:/etc/nginx/conf.d/default.conf:ro
+      - ./cgit/filters:/usr/lib/cgit/filters/ediblemonad:ro
       - ./favicon.ico:/usr/share/webapps/cgit/favicon.ico:ro
 
+  nginx-proxy:
+    profiles: [core]
+    container_name: nginx-proxy
+    image: 'jwilder/nginx-proxy:alpine'
+    restart: always
+    ports:
+      - '80:80'
+      - '443:443'
+    environment:
+      - DEFAULT_HOST=ediblemonad.dev
+      - HSTS=off
+    volumes:
+      - /var/run/docker.sock:/tmp/docker.sock:ro
+      - proxy-certs:/etc/nginx/certs:ro
+      - proxy-vhost:/etc/nginx/vhost.d
+      - proxy-html:/usr/share/nginx/html
+
+  proxy-letsencrypt:
+    profiles: [core]
+    image: 'nginxproxy/acme-companion'
+    restart: always
+    environment:
+      - DEFAULT_EMAIL=ediblemonad@gmail.com
+      - NGINX_PROXY_CONTAINER=nginx-proxy
+      - NGINX_DOCKER_GEN_CONTAINER=nginx-proxy
+      - ACME_CA_URI=https://acme-staging-v02.api.letsencrypt.org/directory
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock:ro
+      - proxy-certs:/etc/nginx/certs
+      - proxy-vhost:/etc/nginx/vhost.d
+      - proxy-html:/usr/share/nginx/html
+      - acme:/etc/acme.sh
+
+  redis:
+    profiles: [services]
+    image: 'redis:alpine'
+    restart: always
+    volumes:
+      - redis:/data
+
 volumes:
   redis:
   cgit-cache: