From 764131d99eafeaf96da7fd2519705b275fa56ff7 Mon Sep 17 00:00:00 2001
From: Otho Ulrich <otho@othoulrich.com>
Date: Sat, 16 Jul 2022 02:15:46 -0400
Subject: [PATCH] Added gpg and git configs to docker-compose.

---
 docker-compose.yml | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 464e776..1827275 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -25,6 +25,11 @@ services:
       - GITEA__database__PASSWD=gitea
       - GITEA__repository__ENABLE_PUSH_CREATE_USER=true
       - GITEA__repository__ENABLE_PUSH_CREATE_ORG=true
+      - GITEA__repository__signing__SIGNING_KEY=default
+      - GITEA__repository__signing__INITIAL_COMMIT=pubkey
+      - GITEA__repository__signing__WIKI=pubkey
+      - GITEA__repository__signing__CRUD_ACTIONS=pubkey
+      - GITEA__repository__signing__MERGES=pubkey,commitssigned
       - VIRTUAL_HOST=code.othoulrich.com
       - VIRTUAL_PORT=3000
       - LETSENCRYPT_HOST=code.othoulrich.com
@@ -32,9 +37,11 @@ services:
       - gitea
       - proxy
     volumes:
-      - ./.data/gitea:/data
+      - .data/gitea:/data
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
+      - gitea/gitconfig:/root/.gitconfig:ro
+      - .secret/gitea/gnupg:/root/.gnupg:ro
     ports:
       - "922:22"
     depends_on:
@@ -51,7 +58,7 @@ services:
     networks:
       - gitea
     volumes:
-      - ./.data/gitea-db:/var/lib/postgresql/data
+      - .data/gitea-db:/var/lib/postgresql/data
 
   apache:
     image: httpd:2.4
@@ -63,7 +70,7 @@ services:
     networks:
       - proxy
     volumes:
-      - ./htdocs:/usr/local/apache2/htdocs
+      - htdocs:/usr/local/apache2/htdocs
 
 ####################################3
 ## nginx proxy
@@ -79,7 +86,7 @@ services:
       com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy: "true"
     volumes:
       - certs:/etc/nginx/certs:ro
-      - ./vhost.d:/etc/nginx/vhost.d
+      - vhost.d:/etc/nginx/vhost.d
       - html:/usr/share/nginx/html
       - /var/run/docker.sock:/tmp/docker.sock:ro
     networks:
@@ -92,7 +99,7 @@ services:
     volumes:
       - certs:/etc/nginx/certs
       - acme:/etc/acme.sh
-      - ./vhost.d:/etc/nginx/vhost.d
+      - vhost.d:/etc/nginx/vhost.d
       - html:/usr/share/nginx/html
       - /var/run/docker.sock:/var/run/docker.sock:ro
     networks: