From f30af833704b73edebcc914596ba4305110c95c7 Mon Sep 17 00:00:00 2001
From: Paul Brinkmeier <hallo@pbrinkmeier.de>
Date: Wed, 14 Sep 2022 23:36:37 +0200
Subject: [PATCH] Configure gitea SSH

---
 ansible/misc-docker.yaml         | 28 ++++++++++++++--------------
 docker/caddy/docker-compose.yaml |  4 ++--
 docker/gitea/docker-compose.yaml | 12 ++++++++----
 3 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/ansible/misc-docker.yaml b/ansible/misc-docker.yaml
index 802758c..dea4338 100644
--- a/ansible/misc-docker.yaml
+++ b/ansible/misc-docker.yaml
@@ -1,6 +1,20 @@
 ---
 - hosts: misc
   tasks:
+    - name: Add users for running containers
+      become: yes
+      ansible.builtin.user:
+        name: "{{ item.name }}"
+        uid: "{{ item.uid }}"
+        create_home: no
+        state: present
+      loop:
+        - name: jupyter
+          uid: 42000
+          state: present
+        - name: gitea
+          uid: 42001
+          state: present
     # All services that are behind Caddy need to be in this network
     - name: Create Caddy network
       become: yes
@@ -39,20 +53,6 @@
           state: present
         - name: caddy
           state: present
-    - name: Add users for running containers
-      become: yes
-      ansible.builtin.user:
-        name: "{{ item.name }}"
-        uid: "{{ item.uid }}"
-        create_home: no
-        state: present
-      loop:
-        - name: jupyter
-          uid: 42000
-          state: present
-        - name: gitea
-          uid: 42001
-          state: present
     - name: Add Notebooks folder
       become: yes
       ansible.builtin.file:
diff --git a/docker/caddy/docker-compose.yaml b/docker/caddy/docker-compose.yaml
index 1f44ffb..a5a035c 100644
--- a/docker/caddy/docker-compose.yaml
+++ b/docker/caddy/docker-compose.yaml
@@ -6,8 +6,8 @@ services:
     image: pbrinkmeier/web
     build: .
     ports:
-      - 80:80
-      - 443:443
+      - "80:80"
+      - "443:443"
     volumes:
       - /var/lib/pbri/docker/caddy_data:/data
       - /var/lib/pbri/docker/caddy_config:/config
diff --git a/docker/gitea/docker-compose.yaml b/docker/gitea/docker-compose.yaml
index 6563760..ddb4d3c 100644
--- a/docker/gitea/docker-compose.yaml
+++ b/docker/gitea/docker-compose.yaml
@@ -5,14 +5,18 @@ services:
     image: gitea/gitea:1.17.1
     restart: always
     environment:
+      # Ref: https://docs.gitea.io/en-us/config-cheat-sheet
+      # User is created by misc-docker.yaml
       USER: gitea
       USER_UID: 42001
       USER_GID: 42001
-      GITEA__server__DOMAIN: pbrinkmeier.de
+      GITEA__repository__ENABLE_PUSH_CREATE_USER: "true"
+      GITEA__repository__ENABLE_PUSH_CREATE_ORG: "true"
+      GITEA__server__DOMAIN: git.pbrinkmeier.de
       GITEA__server__HTTP_PORT: 3000
       GITEA__server__ROOT_URL: https://git.pbrinkmeier.de/
-      GITEA__server__SSH_DOMAIN: pbrinkmeier.de
-      GITEA__server__SSH_LISTEN_PORT: 22
+      GITEA__server__SSH_DOMAIN: git.pbrinkmeier.de
+      GITEA__server__SSH_LISTEN_PORT: 2222
       GITEA__server__SSH_PORT: 22
       GITEA__server__OFFLINE_MODE: "true"
       GITEA__database__DB_TYPE: postgres
@@ -41,7 +45,7 @@ services:
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
     ports:
-      - 22:22
+      - "22:2222"
     depends_on:
       - gitea_db