diff --git a/Repository/Gitea/docker-compose-traefik.yml b/Repository/Gitea/docker-compose-traefik.yml index 854a8214..e0e65037 100644 --- a/Repository/Gitea/docker-compose-traefik.yml +++ b/Repository/Gitea/docker-compose-traefik.yml @@ -27,7 +27,7 @@ services: - GITEA__mailer__ENABLED=true - GITEA__mailer__FROM=gitea@tips-of-mine.fr - GITEA__mailer__PROTOCOL=smtps - - GITEA__mailer__SMTP_ADDR=relaissmtp.tips-of-mine.fr + - GITEA__mailer__SMTP_ADDR=msmtpd - GITEA__mailer__SMTP_PORT=25 - GITEA__mailer__USER= - GITEA__mailer__PASSWD= @@ -96,15 +96,15 @@ services: - "traefik.http.routers.gitea-https.service=gitea-service" - "traefik.http.routers.gitea-https.priority=40" # TCP - - "traefik.tcp.routers.gitea-ssh.entrypoints=ssh" - - "traefik.tcp.routers.gitea-ssh.rule=HostSNI(`gitea.traefik.me`)" - - "traefik.tcp.routers.gitea-ssh.service=gitea-ssh-service" - - "traefik.tcp.routers.gitea-ssh.tls=true" +# - "traefik.tcp.routers.gitea-ssh.entrypoints=ssh" +# - "traefik.tcp.routers.gitea-ssh.rule=HostSNI(`gitea.traefik.me`)" +# - "traefik.tcp.routers.gitea-ssh.service=gitea-ssh-service" +# - "traefik.tcp.routers.gitea-ssh.tls=true" # - "traefik.tcp.routers.gitea-ssh.tls.certresolver=myresolver" # Middleware # Service - "traefik.http.services.gitea-service.loadbalancer.server.port=3000" - - "traefik.http.services.gitea-https-service.loadbalancer.server.scheme=https" +# - "traefik.http.services.gitea-https-service.loadbalancer.server.scheme=https" # - "traefik.http.services.gitea-https.loadbalancer.passhostheader=true" # - "traefik.http.services.gitea-https.loadbalancer.healthcheck.path=/foo" - "traefik.http.services.gitea-https-service.loadbalancer.healthcheck.hostname=gitea.traefik.me" @@ -114,7 +114,7 @@ services: # - "traefik.http.services.gitea-https.loadbalancer.healthcheck.port=42" # - "traefik.http.services.gitea-https.loadbalancer.healthcheck.scheme=http" - "traefik.http.services.gitea-https-service.loadbalancer.healthcheck.timeout=10" - - "traefik.tcp.services.gitea-ssh-service.loadbalancer.server.port=22" +# - "traefik.tcp.services.gitea-ssh-service.loadbalancer.server.port=22" # - "traefik.tcp.services.gitea-ssh.loadbalancer.server.tls=true" # - "traefik.tcp.services.gitea-ssh.loadbalancer.proxyprotocol.version=1" @@ -171,8 +171,8 @@ services: # TCP # Middleware # Service - - "traefik.http.services.adminer-service.loadbalancer.server.port=80800" - - "traefik.http.services.adminer-https-service.loadbalancer.server.scheme=https" + - "traefik.http.services.adminer-service.loadbalancer.server.port=8080" +# - "traefik.http.services.adminer-https-service.loadbalancer.server.scheme=https" # - "traefik.http.services.adminer-https.loadbalancer.passhostheader=true" # - "traefik.http.services.adminer-https.loadbalancer.healthcheck.path=/foo" - "traefik.http.services.adminer-https-service.loadbalancer.healthcheck.hostname=gitea-adminer.traefik.me" @@ -231,11 +231,12 @@ services: - GITEA_INSTANCE_URL=${GITEA_URL} - CONFIG_FILE=/config.yaml - GITEA_RUNNER_REGISTRATION_TOKEN=8CZ3Sd2VHITGIA1Xr2bo5j8l5Pj1EvTblTCeDmJU + - GITEA_RUNNER_NAME="gitea-runner" restart: unless-stopped networks: - back_network volumes: - - ./data-runner/act_runner:/data + - ./data-runner:/data - ./config.yaml:/config.yaml - ./data-runner/cache:/root/.cache - /etc/ssl/certs/:/etc/ssl/certs/ @@ -245,3 +246,31 @@ services: gitea: condition: service_healthy restart: true + +### msmtpd + msmtpd: + container_name: gitea-msmtpd + hostname: gitea-msmtpd + image: crazymax/msmtpd:latest + networks: + - back_network +# ports: +# - 2500:2500 + environment: + - "TZ=Europe/Paris" + - "PUID=1500" + - "PGID=1500" + - "SMTP_HOST=10.0.4.52" + - "SMTP_PORT=587" + - "SMTP_TLS=on" + - "SMTP_STARTTLS=on" + - "SMTP_TLS_CHECKCERT=off" + - "SMTP_AUTH=on" + - "SMTP_USER=hostinfo@tips-of-mine.fr" + - "SMTP_PASSWORD=Whf2VtLEd2QR4er" + - "SMTP_DOMAIN=localhost" + - "SMTP_FROM=hostinfo@tips-of-mine.fr" + restart: always + healthcheck: + test: ["CMD-SHELL", "echo EHLO localhost"] + interval: 5s