diff --git a/Makefile b/Makefile index 960ee9b..3090d29 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,7 @@ DOCKER := docker -PROFILES := caddy wordpress gitea adminer uptime-kuma qbittorrent jellyfin watchtower backup syncthing openssh gitea-runner +PROFILES := caddy wordpress adminer uptime-kuma qbittorrent jellyfin watchtower backup syncthing openssh gitea gitea-runner PROFILE_CMD := $(addprefix --profile ,$(PROFILES)) COMPOSE_FILES := $(shell find docker-compose*.yml | sed -e 's/^/--file /') diff --git a/caddy/bensuperpc.org/Caddyfile b/caddy/bensuperpc.org/Caddyfile index 6995c0f..da68597 100644 --- a/caddy/bensuperpc.org/Caddyfile +++ b/caddy/bensuperpc.org/Caddyfile @@ -59,10 +59,6 @@ jellyfin.bensuperpc.org { reverse_proxy jellyfin:8096 } -ssh.bensuperpc.org { - reverse_proxy openssh:2222 -} - syncthing.bensuperpc.org { reverse_proxy syncthing:8384 { header_up Host {upstream_hostport} diff --git a/docker-compose.adminer.yml b/docker-compose.adminer.yml index 8853590..879839d 100644 --- a/docker-compose.adminer.yml +++ b/docker-compose.adminer.yml @@ -1,5 +1,3 @@ -version: '3.9' - services: # Adminer adminer: diff --git a/docker-compose.backup.yml b/docker-compose.backup.yml index ac1fdb8..33a1c07 100644 --- a/docker-compose.backup.yml +++ b/docker-compose.backup.yml @@ -1,5 +1,3 @@ -version: '3.9' - services: # Backup backup: diff --git a/docker-compose.caddy.yml b/docker-compose.caddy.yml index 0aed171..dfe017d 100644 --- a/docker-compose.caddy.yml +++ b/docker-compose.caddy.yml @@ -1,5 +1,3 @@ -version: '3.9' - services: # Caddy caddy: diff --git a/docker-compose.gitea.yml b/docker-compose.gitea.yml index a0a144e..f7771f5 100644 --- a/docker-compose.gitea.yml +++ b/docker-compose.gitea.yml @@ -1,5 +1,3 @@ -version: '3.9' - services: # Gitea gitea: @@ -12,7 +10,7 @@ services: - database_gitea - caddy ports: - - "2222:2222" + - "22:22" env_file: - env/gitea.env volumes: diff --git a/docker-compose.jellyfin.yml b/docker-compose.jellyfin.yml index 693fba2..53cc42f 100644 --- a/docker-compose.jellyfin.yml +++ b/docker-compose.jellyfin.yml @@ -1,5 +1,3 @@ -version: '3.9' - services: # Jellyfin jellyfin: diff --git a/docker-compose.openssh.yml b/docker-compose.openssh.yml index 352e8eb..ce29dcb 100644 --- a/docker-compose.openssh.yml +++ b/docker-compose.openssh.yml @@ -1,5 +1,3 @@ -version: '3.9' - services: # Openssh openssh: diff --git a/docker-compose.qbittorrent.yml b/docker-compose.qbittorrent.yml index 7d69f6c..9c3dffc 100644 --- a/docker-compose.qbittorrent.yml +++ b/docker-compose.qbittorrent.yml @@ -1,5 +1,3 @@ -version: '3.9' - services: # qBittorrent qbittorrent: diff --git a/docker-compose.syncthing.yml b/docker-compose.syncthing.yml index 6a00b8d..8642a26 100644 --- a/docker-compose.syncthing.yml +++ b/docker-compose.syncthing.yml @@ -1,5 +1,3 @@ -version: '3.9' - services: # syncthing syncthing: diff --git a/docker-compose.uptime-kuma.yml b/docker-compose.uptime-kuma.yml index 6f86878..33fe56d 100644 --- a/docker-compose.uptime-kuma.yml +++ b/docker-compose.uptime-kuma.yml @@ -1,5 +1,3 @@ -version: '3.9' - services: # Uptime Kuma uptime-kuma: diff --git a/docker-compose.watchtower.yml b/docker-compose.watchtower.yml index 4f7692c..2340bb5 100644 --- a/docker-compose.watchtower.yml +++ b/docker-compose.watchtower.yml @@ -1,5 +1,3 @@ -version: '3.9' - services: # Watchtower watchtower: diff --git a/docker-compose.wordpress.yml b/docker-compose.wordpress.yml index a774cc2..16391a6 100644 --- a/docker-compose.wordpress.yml +++ b/docker-compose.wordpress.yml @@ -1,5 +1,3 @@ -version: '3.9' - services: # Wordpress wordpress: diff --git a/env/gitea.env b/env/gitea.env index 616f1f9..deda923 100644 --- a/env/gitea.env +++ b/env/gitea.env @@ -6,4 +6,10 @@ GITEA__database__NAME=gitea GITEA__database__USER=bensuperpc GITEA__database__PASSWD=K7s5yoHknnEd7vsZoxb8I3dK9mjToF1j #GITEA__security__SECRET_KEY= -#GITEA__security__INTERNAL_TOKEN= \ No newline at end of file +#GITEA__security__INTERNAL_TOKEN= +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__ROOT_URL=https://git.bensuperpc.org \ No newline at end of file