feat: add mailer support and credentials for gitea

.gitignore

@@ -12,6 +12,7 @@ sync.ffs_lock
 # Volumes and data directories
 gitea/gitea-db/
 gitea/gitea-data/*
+gitea/*runner/*
 n8n/n8n-data/*
 n8n/n8n-node-data/*
 adguardhome/data/*
@@ -22,6 +23,7 @@ uptime-kuma/data/
 termix/termix-data/*
 cfddns/config.json
 checkmk/checkmk/*
+downtify/Downtify_downloads
 
 # Steaming services files
 streaming/jellyfin/*

downtify/compose.yaml

@@ -0,0 +1,39 @@
+services:
+  downtify:
+    container_name: downtify
+    image: ghcr.io/henriquesebastiao/downtify:latest
+    # ports:
+    #   - '7077:8000'
+    labels:
+      - traefik.enable=true
+      - traefik.http.services.downtify.loadbalancer.server.port=8000
+
+      # Prod Router 
+      - traefik.http.routers.downtify.rule=Host(`downtify.forust.xyz`)
+      - traefik.http.routers.downtify.entrypoints=websecure
+      - traefik.http.routers.downtify.middlewares=security-chain@file
+      - traefik.http.routers.downtify.service=downtify
+      - traefik.http.routers.downtify.tls=true
+
+      # Local Router
+      - traefik.http.routers.downtify-local.rule=Host(`downtify.workstation.internal`) || Host(`downtify.internal`)
+      - traefik.http.routers.downtify-local.entrypoints=websecure
+      - traefik.http.routers.downtify-local.middlewares=security-headers@file
+      - traefik.http.routers.downtify-local.service=downtify
+      - traefik.http.routers.downtify-local.tls=true
+
+      # Dev Router
+      - traefik.http.routers.downtify-dev.rule=Host(`downtify.gigaforust.internal`)
+      - traefik.http.routers.downtify-dev.entrypoints=websecure
+      - traefik.http.routers.downtify-dev.middlewares=security-chain@file
+      - traefik.http.routers.downtify-dev.service=downtify
+      - traefik.http.routers.downtify-dev.tls=true
+    networks:
+      - traefik-proxy
+
+    volumes:
+      - ./Downtify_downloads:/downloads
+
+networks:
+  traefik-proxy:
+    external: true

gitea/.env.example

@@ -1,3 +1,7 @@
 GITEA_POSTGRES_USER=
 GITEA_POSTGRES_PASSWORD=
-GITEA_POSTGRES_DB=gitea
+GITEA_POSTGRES_DB=gitea
+BASIC-RUNNER_TOKEN=
+GITEA_SMTP_PASS=
+MAILER_ADDR=
+SERVICE_EMAIL=email.used.by.services@domain.tld

gitea/compose.yaml

@@ -13,7 +13,17 @@ services:
       - GITEA__database__NAME=gitea
       #Server
       - GITEA__server__ROOT_URL=https://gitea.forust.xyz
+      - GITEA__server__SSH_DOMAIN=gitssh.forust.xyz
       - GITEA__server__SSH_PORT=2221
+      # Mailer
+      - GITEA__mailer__ENABLED=true
+      - GITEA__mailer__FROM=${SERVICE_EMAIL}
+      - GITEA__mailer__SMTP_ADDR=${MAILER_ADDR}:465
+      - GITEA__mailer__USER=${SERVICE_EMAIL}
+      - GITEA__mailer__PASSWD=${GITEA_SMTP_PASS}
+      - GITEA__mailer__PROTOCOL=SMTP
+      - GITEA__service__REGISTER_EMAIL_CONFIRM=true
+      - GITEA__service__ENABLE_NOTIFY_MAIL=true
     restart: always
     networks:
       - gitea-db
@@ -47,11 +57,33 @@ services:
       - "traefik.http.routers.gitea-dev.middlewares=security-headers@file"
       - "traefik.http.routers.gitea-dev.service=gitea"
       - "traefik.http.routers.gitea-dev.tls=true"
+      - "traefik.tcp.routers.gitea.entrypoints=ssh"
+      - "traefik.tcp.routers.gitea.rule=HostSNI(`*`)"
+      - "traefik.tcp.services.gitea.loadbalancer.server.port=22"
     ports:
       - "2221:22"
     depends_on:
       - db
 
+  runner:
+    image: gitea/act_runner:0.2.11
+    container_name: gitea-runner
+    restart: always
+    depends_on:
+      - server
+    env_file:
+      - .env
+    networks:
+      - gitea-db
+    environment:
+      - GITEA_INSTANCE_URL=http://server:3000
+      - GITEA_RUNNER_REGISTRATION_TOKEN=${BASIC-RUNNER_TOKEN}
+      - GITEA_RUNNER_NAME=basic-runner
+      - GITEA_RUNNER_LABELS=docker:docker://node:20-bookworm,ubuntu-latest:docker://node:20-bookworm
+    volumes:
+      - ./gitea-runner:/data
+      - /var/run/docker.sock:/var/run/docker.sock
+
   db:
     image: docker.io/library/postgres:14
     restart: always

traefik/compose.yaml

@@ -33,12 +33,11 @@ services:
       # Cloudflare 
       - "--entryPoints.web.forwardedHeaders.trustedIPs=173.245.48.0/20,103.21.244.0/22,103.22.200.0/22,103.31.4.0/22,141.101.64.0/18,108.162.192.0/18,190.93.240.0/20,188.114.96.0/20,197.234.240.0/22,198.41.128.0/17,162.158.0.0/15,104.16.0.0/13,104.24.0.0/14,172.64.0.0/13,131.0.72.0/22"
       - "--entryPoints.websecure.forwardedHeaders.trustedIPs=173.245.48.0/20,103.21.244.0/22,103.22.200.0/22,103.31.4.0/22,141.101.64.0/18,108.162.192.0/18,190.93.240.0/20,188.114.96.0/20,197.234.240.0/22,198.41.128.0/17,162.158.0.0/15,104.16.0.0/13,104.24.0.0/14,172.64.0.0/13,131.0.72.0/22"
-
-      # Logging
-      - "--log.level=INFO"
-      - "--log.filePath=/var/log/traefik/traefik.log"
-      - "--accesslog=true"
-      - "--accesslog.filepath=/var/log/traefik/access.log"
+      # # Logging
+      # - "--log.level=INFO"
+      # - "--log.filePath=/var/log/traefik/traefik.log"
+      # - "--accesslog=true"
+      # - "--accesslog.filepath=/var/log/traefik/access.log"
 
     labels:
       - "traefik.enable=true"

userbot/compose.yaml

@@ -1,9 +1,8 @@
 services:
-  userbot_forust:
+  forust:
     build:
       context: .
       dockerfile: Dockerfile
-    container_name: userbot_forust
     restart: unless-stopped
     env_file:
       - .env
@@ -16,11 +15,10 @@ services:
       - 8.8.8.8
       - 1.1.1.1
 
-  userbot_anna:
+  anna:
     build:
       context: .
       dockerfile: Dockerfile
-    container_name: userbot_anna
     restart: unless-stopped
     env_file:
       - .env
@@ -31,27 +29,4 @@ services:
       - ./volumes/logs_anna:/app/logs
     dns:
       - 8.8.8.8
-      - 1.1.1.1
-    develop:
-      watch:
-        - action: sync
-          path: modules
-          target: /app/modules
-        - action: sync
-          path: utils
-          target: /app/utils
-        - action: sync
-          path: main.py
-          target: /app/main.py
-        - action: rebuild
-          path: .env
-        - action: rebuild
-          path: .env.anna
-
-
-volumes:
-  downloads:
-
-networks:
-  userbot_network:
-    driver: bridge
+      - 1.1.1.1