Improve forgejo

This commit is contained in:
2025-06-30 00:01:37 +02:00
parent e942d364fe
commit 736959c540
7 changed files with 17 additions and 15 deletions

View File

@ -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 | | [uptimekuma.bensuperpc.org](https://uptimekuma.bensuperpc.org) | Sub | Uptime Kuma for monitoring |
| [qbittorrent.bensuperpc.org](https://qbittorrent.bensuperpc.org) | Sub | Torrent client/server | | [qbittorrent.bensuperpc.org](https://qbittorrent.bensuperpc.org) | Sub | Torrent client/server |
| [transmission.bensuperpc.org](https://transmission.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 | | [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 | | [link.bensuperpc.org](https://link.bensuperpc.org) | Sub | For link shortener |
| [jellyfin.bensuperpc.org](https://jellyfin.bensuperpc.org) | Sub | Jellyfin for media server | | [jellyfin.bensuperpc.org](https://jellyfin.bensuperpc.org) | Sub | Jellyfin for media server |
| [syncthing.bensuperpc.org](https://syncthing.bensuperpc.org) | Sub | SyncThing for file synchronization | | [syncthing.bensuperpc.org](https://syncthing.bensuperpc.org) | Sub | SyncThing for file synchronization |

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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