diff --git a/gitea/compose.yaml b/gitea/compose.yaml index 2956b7f..376cda9 100644 --- a/gitea/compose.yaml +++ b/gitea/compose.yaml @@ -8,9 +8,9 @@ services: # Database - GITEA__database__DB_TYPE=postgres - GITEA__database__HOST=db:5432 - - GITEA__database__USER=${GITEA_POSTGRES_USER:-gitea} - - GITEA__database__PASSWD=${GITEA_POSTGRES_PASSWORD:-gitea} - - GITEA__database__NAME=${GITEA_POSTGRES_DB:-gitea} + - GITEA__database__USER=gitea + - GITEA__database__PASSWD=gitea + - GITEA__database__NAME=gitea #Server - GITEA__server__ROOT_URL=https://gitea.forust.xyz - GITEA__server__SSH_PORT=2221 @@ -34,13 +34,13 @@ services: image: docker.io/library/postgres:14 restart: always environment: - - POSTGRES_USER=${GITEA_POSTGRES_USER:-gitea} - - POSTGRES_PASSWORD=${GITEA_POSTGRES_PASSWORD:-gitea} - - POSTGRES_DB=${GITEA_POSTGRES_DB:-gitea} + - POSTGRES_USER=gitea + - POSTGRES_PASSWORD=gitea + - POSTGRES_DB=gitea networks: - gitea-db volumes: - - ./gitea-db:/var/lib/postgresql/data + - ./gitea-db/:/var/lib/postgresql/data networks: gitea-db: diff --git a/traefik/compose.yaml b/traefik/compose.yaml index f30ff82..3dcb7a9 100644 --- a/traefik/compose.yaml +++ b/traefik/compose.yaml @@ -21,7 +21,7 @@ services: - "--entryPoints.websecure.http.tls=true" - "--entryPoints.web.http.redirections.entryPoint.to=websecure" - "--entryPoints.web.http.redirections.entryPoint.scheme=https" - - "--entryPoints.ssh.address=:222" + - "--entryPoints.ssh.address=:2221" # Let's Encrypt STAGING. CURRENTLY USING CF ORIGIN CA INSTEAD # - "--certificatesresolvers.letsencrypt.acme.email=${EMAIL}" diff --git a/traefik/dynamic/dynamic.yml b/traefik/dynamic/dynamic.yml index e7c638a..a7b0efc 100644 --- a/traefik/dynamic/dynamic.yml +++ b/traefik/dynamic/dynamic.yml @@ -68,6 +68,7 @@ http: rule: "Host(`gitea.forust.xyz`)" entryPoints: - websecure + - ssh service: gitea middlewares: - security-headers @@ -78,7 +79,7 @@ http: rule: "HostSNI(`*`)" entryPoints: - ssh - service: gitea-ssh + service: gitea tls: {} # Glance (local only) @@ -163,7 +164,7 @@ http: loadBalancer: servers: - url: "http://n8n:5678" - + # Gitea gitea: loadBalancer: