From 4c4f558579374d067757477b2feb19488af8d1c9 Mon Sep 17 00:00:00 2001
From: Pim Kunis <pim@kunis.nl>
Date: Fri, 6 Jan 2023 17:35:36 +0100
Subject: [PATCH] change forgejo ssh port

---
 README.md                              | 2 --
 roles/forgejo/files/docker-compose.yml | 8 +++++++-
 roles/forgejo/templates/app.ini        | 2 +-
 roles/traefik/files/docker-compose.yml | 1 +
 roles/traefik/files/traefik.toml       | 2 ++
 5 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 83bd051..d0373eb 100644
--- a/README.md
+++ b/README.md
@@ -17,8 +17,6 @@ Seems to be a little annoying with all the docker stuff
 
 ### Gitea
 
-- Move to forgejo
-- Fix SSH port
 - Move over some repos
 - Setup automatic syncing
 - Use own git servers
diff --git a/roles/forgejo/files/docker-compose.yml b/roles/forgejo/files/docker-compose.yml
index a4e8a97..b9a7542 100644
--- a/roles/forgejo/files/docker-compose.yml
+++ b/roles/forgejo/files/docker-compose.yml
@@ -16,7 +16,7 @@ services:
       - traefik
     volumes:
       - /data/forgejo:/data
-      - /apps/forgejo/conf:/data/forgejo/conf
+      - /apps/forgejo/conf:/data/gitea/conf
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
     labels:
@@ -24,4 +24,10 @@ services:
       - traefik.http.routers.forgejo.rule=Host(`git.pizzapim.nl`)
       - traefik.http.routers.forgejo.tls=true
       - traefik.http.routers.forgejo.tls.certresolver=pizzapim
+      - traefik.tcp.routers.forgejo-ssh.service=forgejo
       - traefik.http.services.forgejo.loadbalancer.server.port=3000
+
+      - traefik.tcp.routers.forgejo-ssh.rule=HostSNI(`*`)
+      - traefik.tcp.routers.forgejo-ssh.entrypoints=ssh
+      - traefik.tcp.routers.forgejo-ssh.service=forgejo-ssh
+      - traefik.tcp.services.forgejo-ssh.loadbalancer.server.port=22
diff --git a/roles/forgejo/templates/app.ini b/roles/forgejo/templates/app.ini
index 1122587..6b0c0b3 100644
--- a/roles/forgejo/templates/app.ini
+++ b/roles/forgejo/templates/app.ini
@@ -18,7 +18,7 @@ SSH_DOMAIN       = git.pizzapim.nl
 HTTP_PORT        = 3000
 ROOT_URL         = {{ forgejo.root_url }}
 DISABLE_SSH      = false
-SSH_PORT         = 2222
+SSH_PORT         = 56287
 SSH_LISTEN_PORT  = 22
 LFS_START_SERVER = true
 LFS_JWT_SECRET   = {{ forgejo.lfs_jwt_secret }}
diff --git a/roles/traefik/files/docker-compose.yml b/roles/traefik/files/docker-compose.yml
index 0c35aeb..70570d1 100644
--- a/roles/traefik/files/docker-compose.yml
+++ b/roles/traefik/files/docker-compose.yml
@@ -17,6 +17,7 @@ services:
     ports:
       - "443:443"
       - "80:80"
+      - "56287:56287"
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
       - /apps/traefik/traefik.toml:/etc/traefik/traefik.toml
diff --git a/roles/traefik/files/traefik.toml b/roles/traefik/files/traefik.toml
index c15a2be..19c85f0 100644
--- a/roles/traefik/files/traefik.toml
+++ b/roles/traefik/files/traefik.toml
@@ -5,6 +5,8 @@ loglevel = "DEBUG"
   address = ":80"
   [entryPoints.websecure]
   address = ":443"
+  [entryPoints.ssh]
+  address = ":56287"
 
 [api]