Improve forgejo

README.md

@@ -87,8 +87,9 @@ And then, caddy will generate the certificate for you and renew it automatically
 | [uptimekuma.bensuperpc.org](https://uptimekuma.bensuperpc.org) | Sub | Uptime Kuma for monitoring |
 | [qbittorrent.bensuperpc.org](https://qbittorrent.bensuperpc.org) | Sub | Torrent client/server |
 | [transmission.bensuperpc.org](https://transmission.bensuperpc.org) | Sub | Torrent client/server |
-| [git.bensuperpc.org](https://git.bensuperpc.org) | Sub | Gitea for git |
+| [gitea.bensuperpc.org](https://gitea.bensuperpc.org) | Sub | Gitea for git |
 | [forgejo.bensuperpc.org](https://forgejo.bensuperpc.org/) | Sub | Fork of Gitea for git |
+| [git.bensuperpc.org](https://git.bensuperpc.org) | Sub | Fork of Gitea for git |
 | [link.bensuperpc.org](https://link.bensuperpc.org) | Sub | For link shortener |
 | [jellyfin.bensuperpc.org](https://jellyfin.bensuperpc.org) | Sub | Jellyfin for media server |
 | [syncthing.bensuperpc.org](https://syncthing.bensuperpc.org) | Sub | SyncThing for file synchronization |

infrastructure/services/caddy/config/bensuperpc.org/Caddyfile

@@ -87,11 +87,11 @@ transmission.{$MAIN_DOMAIN} {
 }
 
 gitea.{$MAIN_DOMAIN} {
-	redir https://git.{$MAIN_DOMAIN} permanent
+	reverse_proxy gitea:3000
 }
 
 git.{$MAIN_DOMAIN} {
-	reverse_proxy gitea:3000
+	reverse_proxy forgejo:3000
 }
 
 forgejo.{$MAIN_DOMAIN} {

infrastructure/services/forgejo/docker-compose.forgejo.yml

@@ -10,7 +10,7 @@ services:
       - database_forgejo
       - caddy
     ports:
-      - "5555:5555"
+      - "22:22"
     env_file:
       - ./env/forgejo.env
     volumes:
@@ -70,10 +70,8 @@ services:
       docker-in-docker:
         condition: service_started
     container_name: 'forgejo_runner'
-    environment:
-      DOCKER_HOST: tcp://docker:2376
-      DOCKER_CERT_PATH: /certs/client
-      DOCKER_TLS_VERIFY: "1"
+    env_file:
+      - ./env/forgejo_runner.env
 #    user: 1001:1001
     volumes:
 #      - ./config/forgejo_runner/config.yaml:/config.yaml:ro
@@ -81,8 +79,8 @@ services:
       - forgejo_certs:/certs
     restart: 'unless-stopped'
 
-    command: '/bin/sh -c "while : ; do sleep 1 ; done ;"'
-#    command: '/bin/sh -c "sleep 5; forgejo-runner -c /data/config.yml daemon"'
+#    command: '/bin/sh -c "while : ; do sleep 1 ; done ;"'
+    command: '/bin/sh -c "sleep 5; forgejo-runner -c /data/config.yml daemon"'
 
 volumes:
   forgejo_data:

infrastructure/services/forgejo/env/forgejo.env

@@ -10,8 +10,8 @@ FORGEJO__APP_SLOGAN=Personal Code, Mirrors, and More
 FORGEJO__server__DOMAIN=forgejo.bensuperpc.org
 FORGEJO__server__SSH_DOMAIN=forgejo.bensuperpc.org
 FORGEJO__server__HTTP_PORT=3000
-FORGEJO__server__SSH_LISTEN_PORT=5555
-FORGEJO__server__SSH_PORT=5555
+FORGEJO__server__SSH_LISTEN_PORT=22
+FORGEJO__server__SSH_PORT=22
 FORGEJO__server__ROOT_URL=https://forgejo.bensuperpc.org
 FORGEJO__security__SECRET_KEY=ykcZt23an1E4lFHWvrCKdAyt16WAiK9c
 #FORGEJO__security__INTERNAL_TOKEN=

infrastructure/services/forgejo/env/forgejo_runner.env

@@ -0,0 +1,3 @@
+DOCKER_HOST=tcp://docker:2376
+DOCKER_CERT_PATH=/certs/client
+DOCKER_TLS_VERIFY=1

infrastructure/services/gitea/docker-compose.gitea.yml

@@ -10,7 +10,7 @@ services:
       - database_gitea
       - caddy
     ports:
-      - "22:22"
+      - "5555:5555"
     env_file:
       - ./env/gitea.env
     volumes:

infrastructure/services/gitea/env/gitea.env

@@ -10,6 +10,6 @@ GITEA__security__SECRET_KEY=ykcZt23an1E4lFHWvrCKdAyt16WAiK9c
 GITEA__server__DOMAIN=git.bensuperpc.org
 GITEA__server__SSH_DOMAIN=git.bensuperpc.org
 GITEA__server__HTTP_PORT=3000
-GITEA__server__SSH_LISTEN_PORT=22
-GITEA__server__SSH_PORT=22
+GITEA__server__SSH_LISTEN_PORT=5555
+GITEA__server__SSH_PORT=5555
 GITEA__server__ROOT_URL=https://git.bensuperpc.org