nya~

.gitea/workflows/prod_deploy.yaml

@@ -1,39 +0,0 @@
-name: Deploy to Server
-run-name: Deploying to ${{ runner.os}} server on ${{ gitea.ref }}
-on:
-  push:
-    branches:
-      - main
-      - ci/gitea-actions
-jobs:
-  deploy:
-    runs-on: prod
-    steps:
-      - name: Fetch and Diff Analysis
-        id: diff
-        run: |
-          cd ${{ secrets.PROD_DIR }}
-          git fetch origin main
-          CHANGES=$(git diff --name-only HEAD origin/main | cut -d/ -f1 | sort -u | tr '\n' ' ')
-          echo "dirs=$CHANGES" >> $GITHUB_OUTPUT
-          echo "Changed dirs: $CHANGES"
-
-      - name: Sync Server Files
-        run: |
-          cd ${{ secrets.PROD_DIR }}
-          git reset --hard origin/main
-          echo "Server files synced with origin/main"
-
-      - name: Deploy Services
-        run: |
-          cd ${{ secrets.PROD_DIR }}
-          for dir in ${{ steps.diff.outputs.dirs }}; do
-            if [ -d "$dir" ] && ([ -f "$dir/compose.yaml" ] || [ -f "$dir/docker-compose.yaml" ]); then
-              echo ">>> Deploying $dir"
-              cd "$dir"
-              DOCKER_BUILDKIT=1 BUILDKIT_PROGRESS=plain docker compose up -d --build --no-color
-              cd ..
-            else
-              echo ">>> Skipping $dir: no compose file found"
-            fi
-          done

.github/workflows/prod_deploy.yaml

@@ -1,41 +0,0 @@
-## BINARY MODE, USE WITH THE GITHUB RUNNER BINARY INSTALLED ON THE SERVER
-
-name: Deploy to Server
-run-name: Deploying onto server on ${{ github.ref }}
-on:
-  push:
-    branches:
-      - main
-      - ci/actions
-jobs:
-  deploy:
-    runs-on: [prod, self-hosted]
-    steps:
-      - name: Fetch and Diff Analysis
-        id: diff
-        run: |
-          cd ${{ secrets.PROD_DIR }}
-          git fetch origin main
-          CHANGES=$(git diff --name-only HEAD origin/main | cut -d/ -f1 | sort -u | tr '\n' ' ')
-          echo "dirs=$CHANGES" >> $GITHUB_OUTPUT
-          echo "Changed dirs: $CHANGES"
-
-      - name: Sync Server Files
-        run: |
-          cd ${{ secrets.PROD_DIR }}
-          git reset --hard origin/main
-          echo "Server files synced with origin/main"
-
-      - name: Deploy Services
-        run: |
-          cd ${{ secrets.PROD_DIR }}
-          for dir in ${{ steps.diff.outputs.dirs }}; do
-            if [ -d "$dir" ] && ([ -f "$dir/compose.yaml" ] || [ -f "$dir/docker-compose.yaml" ]); then
-              echo ">>> Deploying $dir"
-              cd "$dir"
-              DOCKER_BUILDKIT=1 BUILDKIT_PROGRESS=plain docker compose up -d --build --no-color
-              cd ..
-            else
-              echo ">>> Skipping $dir: no compose file found"
-            fi
-          done

.gitignore

@@ -2,15 +2,19 @@
 sync.ffs_lock
 .sync.ffs_db
 
-# Copyparty
+# Environment 
-*.hist/
+.env
+.env.anna
+.env.forust
+.env.*
+!.env.*example
 
-# Volumes, configs and data directories
+# Volumes and data directories
 gitea/gitea-db/
 gitea/gitea-data/*
 n8n/n8n-data/*
 n8n/n8n-node-data/*
-adguardhome/conf/*
+adguardhome/data/*
 dockmon/data/*
 portainer/portainer_data/*
 metube/MeTube_downloads
@@ -18,10 +22,6 @@ uptime-kuma/data/
 termix/termix-data/*
 cfddns/config.json
 checkmk/checkmk/*
-downtify/Downtify_downloads
-headscale/config/*
-headscale/data/*
-searxng/core-config/settings.yml
 
 # Steaming services files
 streaming/jellyfin/*
@@ -33,19 +33,12 @@ streaming/qbittorrent/*
 streaming/prowlarr/*
 
 # Homepage 
-homepages/forust_files/.well-known/*
+homepages/forust_files/assets/images/team/*
+
 
 # Traefik files
 traefik/letsencrypt/acme.json
-traefik/dynamic/fileservers.yml
-traefik/dynamic/*.local.y*ml.*
-traefik/dynamic/*.external.y*ml
-
-
 traefik/logs/*
-
-# SSL Certificates
-adguardhome/certs/*
 traefik/certs/*
 
 # Monitoring
@@ -81,8 +74,6 @@ replacements.txt
 
 # Git
 .gitattributes
-# Gitea/github Runners
-.runner
 
 # Misc
 .DS_Store
@@ -90,11 +81,3 @@ replacements.txt
 
 # Temp files
 edu_master/temp/
-temp/*
-
-# Environment 
-.env
-.env.anna
-.env.forust
-.env.*
-!*example

adguardhome/compose.yaml

@@ -3,46 +3,48 @@ services:
     image: adguard/adguardhome:latest
     container_name: adguardhome
     restart: unless-stopped
+    environment:
+      - TZ=${TZ}
     ports:
       - "53:53/tcp"
       - "53:53/udp"
-      - "853:853/tcp" # DNS over TLS
       # - "67:67/udp" # DHCP
       # - "68:68/tcp" # DHCP
-      # - "3000:3000/tcp"
+      - "3000:3000/tcp"
     volumes:
-      - data:/opt/adguardhome/work
+      - ./data/work:/opt/adguardhome/work
-      - ./conf:/opt/adguardhome/conf
+      - ./data/conf:/opt/adguardhome/conf
-      - ./certs:/certs:ro
+    networks:
+      - traefik-proxy
     labels:
       - "traefik.enable=true"
-      - "traefik.http.services.adguard.loadbalancer.server.port=3000"
+      - "traefik.docker.network=traefik-proxy"
-      
+
       # Prod Router
-      - "traefik.http.routers.adguard.rule=Host(`dns.forust.xyz`) || Host(`adguard.forust.xyz`)"
+      - "traefik.http.routers.adguard.rule=Host(`adguard.forust.xyz`)"
       - "traefik.http.routers.adguard.entrypoints=websecure"
+      - "traefik.http.routers.adguard.middlewares=security-headers@file"
+      - "traefik.http.routers.adguard.service=adguard"
       - "traefik.http.routers.adguard.tls=true"
+      - "traefik.http.services.adguard.loadbalancer.server.port=3000"
+
       # Local Router
-      - "traefik.http.routers.adguard-local.rule=Host(`adguard.workstation.internal`) || Host(`dns.workstation.internal`)"
+      - "traefik.http.routers.adguard-local.rule=Host(`adguard.workstation.internal`) || Host(`adguard.internal`)"
       - "traefik.http.routers.adguard-local.entrypoints=websecure"
+      - "traefik.http.routers.adguard-local.middlewares=security-headers@file"
+      - "traefik.http.routers.adguard-local.service=adguard"
       - "traefik.http.routers.adguard-local.tls=true"
+
       # Dev Router
-      - "traefik.http.routers.adguard-dev.rule=Host(`adguard.gigaforust.internal`) || Host(`dns.gigaforust.internal`)"
+      - "traefik.http.routers.adguard-dev.rule=Host(`adguard.gigaforust.internal`)"
       - "traefik.http.routers.adguard-dev.entrypoints=websecure"
+      - "traefik.http.routers.adguard-dev.middlewares=security-headers@file"
+      - "traefik.http.routers.adguard-dev.service=adguard"
       - "traefik.http.routers.adguard-dev.tls=true"
-      # DoH Router
+
-      - "traefik.http.routers.dns.rule=(Host(`dns.forust.xyz`) && PathPrefix(`/dns-query`))"
-      - "traefik.http.routers.dns.entrypoints=websecure"
-      - "traefik.http.routers.dns.tls.certresolver=letsencrypt"
-      
-      # Glance Metadata
       - glance.name=adguard
       - glance.url=https://adguard.forust.xyz/
       - glance.description=AdGuard Home is a network-wide software for blocking ads.
-    networks:
-      - proxy
-volumes:
-  data:
 networks:
-  proxy:
+  traefik-proxy:
     external: true

authentik/compose.yaml

@@ -26,9 +26,9 @@ services:
     command: server
     container_name: authentik-server
     restart: unless-stopped
-    # ports:
+    ports:
-    #   - ${PORT_HTTP:-9000}:9000
+      - ${PORT_HTTP:-9000}:9000
-    #   - ${PORT_HTTPS:-9443}:9443
+      - ${PORT_HTTPS:-9443}:9443
     env_file:
       - .env
     environment:
@@ -37,28 +37,39 @@ services:
       AUTHENTIK_POSTGRESQL__PASSWORD: ${PG_PASS}
       AUTHENTIK_POSTGRESQL__USER: ${PG_USER:-authentik}
       AUTHENTIK_SECRET_KEY: ${AUTHENTIK_SECRET_KEY:?secret key required}
-    volumes:
+
-      - ./media:/media
-      - ./custom-templates:/templates
     labels:
       - "traefik.enable=true"
+      - "traefik.docker.network=traefik-proxy"
+      # Services
+      # - "traefik.http.services.authentik-server.loadbalancer.server.port=9443"
       - "traefik.http.services.authentik-server.loadbalancer.server.port=9000"
 
       # Prod Router
       - "traefik.http.routers.authentik-server.rule=Host(`auth.forust.xyz`)"
       - "traefik.http.routers.authentik-server.entrypoints=websecure"
+      - "traefik.http.routers.authentik-server.middlewares=security-headers@file"
+      - "traefik.http.routers.authentik-server.service=authentik-server"
       - "traefik.http.routers.authentik-server.tls=true"
+
       # Local Router
-      - "traefik.http.routers.authentik-server-local.rule=Host(`auth.workstation.internal`)"
+      - "traefik.http.routers.authentik-server-local.rule=Host(`auth.workstation.internal`) || Host(`auth-dashboard.internal`)"
       - "traefik.http.routers.authentik-server-local.entrypoints=websecure"
+      - "traefik.http.routers.authentik-server-local.middlewares=security-headers@file"
+      - "traefik.http.routers.authentik-server-local.service=authentik-server"
       - "traefik.http.routers.authentik-server-local.tls=true"
+
       # Dev Router
       - "traefik.http.routers.authentik-server-dev.rule=Host(`auth.gigaforust.internal`)"
       - "traefik.http.routers.authentik-server-dev.entrypoints=websecure"
       - "traefik.http.routers.authentik-server-dev.middlewares=security-headers@file"
+      - "traefik.http.routers.authentik-server-dev.service=authentik-server"
       - "traefik.http.routers.authentik-server-dev.tls=true"
+    volumes:
+      - ./media:/media
+      - ./custom-templates:/templates
     networks:
-      - proxy
+      - traefik-proxy
       - authentik
     depends_on:
       postgresql:
@@ -91,5 +102,5 @@ volumes:
     driver: local
 networks:
   authentik:
-  proxy:
+  traefik-proxy:
     external: true

cfddns/.env.example

@@ -1,15 +0,0 @@
-CLOUDFLARE_API_TOKEN=YOUR_CLOUDFLARE_API_TOKEN
-DOMAINS=example.com,dns.example.com,mc.example.com,auth.example.com,ssh.example.com
-IP4_DOMAINS=
-IP6_DOMAINS=
-IP4_PROVIDER=cloudflare.trace
-IP6_PROVIDER=none # change if you want to update AAAA
-UPDATE_CRON=@every 5m
-UPDATE_ON_START=true
-DELETE_ON_STOP=false
-DELETE_ON_FAILURE=true
-TTL=1
-PROXIED=!is(dns.example.com) && !is(mc.example.com) && !is(ssh.example.com)
-EMOJI=true
-UPTIMEKUMA=https://uptime-kuma.example.com/api/push/AsaSDFGFkfklaFALSKffkfFKfkfkfkFK?status=up&msg=OK&ping=
-REJECT_CLOUDFLARE_IPS=true

cfddns/compose.yaml

@@ -2,29 +2,12 @@ services:
   cloudflare-ddns:
     image: timothyjmiller/cloudflare-ddns:latest
     container_name: cloudflare-ddns
-    restart: unless-stopped
     security_opt:
       - no-new-privileges:true
     network_mode: 'host'
-    # https://github.com/timothymiller/cloudflare-ddns#-quick-start
     environment:
-      - CLOUDFLARE_API_TOKEN=${CLOUDFLARE_API_TOKEN:?Cloudflare API token is required}
+      - PUID=1000
-      - DOMAINS=${DOMAINS:-}
+      - PGID=1000
-      - IP4_DOMAINS=${IP4_DOMAINS:-}
+    volumes:
-      - IP6_DOMAINS=${IP6_DOMAINS:-}
+      - ./config.json:/config.json
-      - IP4_PROVIDER=${IP4_PROVIDER:-cloudflare.trace}
+    restart: unless-stopped
-      - IP6_PROVIDER=${IP6_PROVIDER:-none}
-      - UPDATE_CRON=${UPDATE_CRON:-@every 5m}
-      - UPDATE_ON_START=${UPDATE_ON_START:-true}
-      - DELETE_ON_STOP=${DELETE_ON_STOP:-false}
-      - DELETE_ON_FAILURE=${DELETE_ON_FAILURE:-true}
-      - TTL=${TTL:-1} # 1=auto
-      # to proxy only "dns.example.com" and "wfs.example.com" use "!is(dns.domain.com) && !is (wfs.domain.com)"
-      - PROXIED=${PROXIED:-true}
-      - EMOJI=${EMOJI:-true}
-      - UPTIMEKUMA=${UPTIMEKUMA:-}
-      - HEALTHCHECKS=${HEALTHCHECKS:-}
-      - REJECT_CLOUDFLARE_IPS=${REJECT_CLOUDFLARE_IPS:-true}
-      # volumes:
-      # Prefer using environment variables for configuration, config.json legacy support
-      # - ./config.json:/config.json

checkmk/.env.example

@@ -1,2 +0,0 @@
-CMK_PASSWORD=password
-TZ=Europe/Berlin

checkmk/compose.yaml

@@ -1,39 +0,0 @@
-services:
-  checkmk:
-    image: "checkmk/check-mk-raw:2.4.0-latest"
-    container_name: "checkmk"
-    restart: unless-stopped
-    # ports:
-    #   - 5000:5000
-    #   - 6776:8000
-    volumes:
-      - sites:/omd/sites
-    tmpfs:
-      - /opt/omd/sites/cmk/tmp:uid=1000,gid=1000
-    environment:
-      - CMK_PASSWORD=${CMK_PASSWORD:-password}
-      - CMK_SITE_ID=cmk
-      - TZ=${TZ:-Etc/UTC}
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.services.checkmk.loadbalancer.server.port=5000"
-
-      # Prod Router
-      - "traefik.http.routers.checkmk.rule=Host(`cmk.forust.xyz`)"
-      - "traefik.http.routers.checkmk.entrypoints=websecure"
-      - "traefik.http.routers.checkmk.tls=true"
-      # Local Router
-      - "traefik.http.routers.checkmk-local.rule=Host(`cmk.workstation.internal`)"
-      - "traefik.http.routers.checkmk-local.entrypoints=websecure"
-      - "traefik.http.routers.checkmk-local.tls=true"
-      # Dev Router
-      - "traefik.http.routers.checkmk-dev.rule=Host(`cmk.gigaforust.internal`)"
-      - "traefik.http.routers.checkmk-dev.entrypoints=websecure"
-      - "traefik.http.routers.checkmk-dev.tls=true"
-    networks:
-      - proxy
-networks:
-  proxy:
-    external: true
-volumes:
-  sites:

dockmon/compose.yaml

@@ -3,44 +3,52 @@ services:
       image: darthnorse/dockmon:latest
       container_name: dockmon
       restart: unless-stopped
-      # ports:
+      ports:
-      #    - 8000:443
+         - 8000:443
+      environment:
+         - TZ=Europe/Bratislava
       volumes:
-         - data:/app/data
+         - ./data:/app/data
          - /var/run/docker.sock:/var/run/docker.sock
       healthcheck:
          test: [ "CMD", "curl", "-k", "-f", "https://localhost:443/health" ]
          interval: 30s
          timeout: 10s
          retries: 3
+      networks:
+         - traefik-proxy
       labels:
          - "traefik.enable=true"
-         - "traefik.http.services.dockmon.loadbalancer.server.port=443"
+         - "traefik.docker.network=traefik-proxy"
-         - "traefik.http.services.dockmon.loadbalancer.server.scheme=https"
-         - "traefik.http.services.dockmon.loadbalancer.serverstransport=insecureTransport@file"
 
          # Prod Router
          - "traefik.http.routers.dockmon.rule=Host(`dockmon.forust.xyz`)"
          - "traefik.http.routers.dockmon.entrypoints=websecure"
          - "traefik.http.routers.dockmon.middlewares=security-chain@file"
+         - "traefik.http.routers.dockmon.service=dockmon"
          - "traefik.http.routers.dockmon.tls=true"
+         - "traefik.http.services.dockmon.loadbalancer.server.port=443"
+         - "traefik.http.services.dockmon.loadbalancer.server.scheme=https"
+         - "traefik.http.services.dockmon.loadbalancer.serverstransport=insecureTransport@file"
+
          # Local Router
-         - "traefik.http.routers.dockmon-local.rule=Host(`dockmon.workstation.internal`)"
+         - "traefik.http.routers.dockmon-local.rule=Host(`dockmon.workstation.internal`) || Host(`dockmon.internal`)"
          - "traefik.http.routers.dockmon-local.entrypoints=websecure"
+         - "traefik.http.routers.dockmon-local.middlewares=security-headers@file"
+         - "traefik.http.routers.dockmon-local.service=dockmon"
          - "traefik.http.routers.dockmon-local.tls=true"
+
          # Dev Router
          - "traefik.http.routers.dockmon-dev.rule=Host(`dockmon.gigaforust.internal`)"
          - "traefik.http.routers.dockmon-dev.entrypoints=websecure"
+         - "traefik.http.routers.dockmon-dev.middlewares=security-chain@file"
+         - "traefik.http.routers.dockmon-dev.service=dockmon"
          - "traefik.http.routers.dockmon-dev.tls=true"
 
-         # Glance Metadata
          - glance.name=dockmon
          - glance.url=https://dockmon.forust.xyz/
          - glance.description=Dockmon is a lightweight Docker container monitoring and management tool with a user-friendly web interface.
-      networks:
+
-         - proxy
-volumes:
-   data:
 networks:
-   proxy:
+   traefik-proxy:
       external: true

downtify/compose.yaml

@@ -1,31 +0,0 @@
-services:
-  downtify:
-    container_name: downtify
-    image: ghcr.io/henriquesebastiao/downtify:latest
-    restart: unless-stopped
-    # ports:
-    #   - '7077:8000'
-    volumes:
-      - ./Downtify_downloads:/downloads
-    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.tls=true"
-      # Local Router
-      - "traefik.http.routers.downtify-local.rule=Host(`downtify.workstation.internal`)"
-      - "traefik.http.routers.downtify-local.entrypoints=websecure"
-      - "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.tls=true"
-    networks:
-      - proxy
-networks:
-  proxy:
-    external: true

edu_master/phpsessid-bot/bot.py

@@ -12,26 +12,15 @@ logging.basicConfig(
 )
 logger = logging.getLogger(__name__)
 
-# Load configuration (adapted to .env keys)
+# Load configuration
-def _env(key, default=None):
+LOGIN = os.getenv('EDU_LOGIN')
-    v = os.getenv(key, default)
+PASSWORD = os.getenv('EDU_PASSWORD')
-    if isinstance(v, str) and len(v) >= 2 and ((v[0] == '"' and v[-1] == '"') or (v[0] == "'" and v[-1] == "'")):
+URL_LOGIN = os.getenv('EDU_URL_LOGIN', 'https://edu.edu.vn.ua/user/login')
-        return v[1:-1]
+URL_VERIFY = os.getenv('EDU_URL_VERIFY', 'https://edu.edu.vn.ua/course/userlist')
-    return v
+INTERVAL = int(os.getenv('PHPSESSID_INTERVAL', 10))
-
+USER_AGENT = os.getenv('USER_AGENT', 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/142.0.0.0 Safari/537.36')
-LOGIN = _env('KEEPER_LOGIN')
+REDIS_HOST = os.getenv('REDIS_HOST', 'redis')
-PASSWORD = _env('KEEPER_PASSWORD')
+REDIS_PORT = int(os.getenv('REDIS_PORT', 6379))
-
-EDU_BASE = _env('EDU_URL_BASE', 'https://edu.edu.vn.ua')
-EDU_LOGIN_PATH = _env('EDU_URL_LOGIN', '/user/login')
-EDU_COURSES_PATH = _env('EDU_URL_COURSES', '/course/userlist')
-URL_LOGIN = f"{EDU_BASE.rstrip('/')}/{EDU_LOGIN_PATH.lstrip('/')}"
-URL_VERIFY = f"{EDU_BASE.rstrip('/')}/{EDU_COURSES_PATH.lstrip('/')}"
-
-INTERVAL = int(_env('KEEPER_INTERVAL', 10))
-USER_AGENT = _env('USER_AGENT', 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/142.0.0.0 Safari/537.36')
-REDIS_HOST = _env('REDIS_HOST', 'redis')
-REDIS_PORT = int(_env('REDIS_PORT', 6379))
 
 SUCCESS_FILE = '/tmp/last_success'
 

edu_master/webinar-checker/checker.py

@@ -3,8 +3,7 @@ import logging
 import redis
 import json
 
-from telegram import Update, InlineKeyboardButton, InlineKeyboardMarkup, ChatMember
+from telegram import Update, InlineKeyboardButton, InlineKeyboardMarkup
-from telegram.constants import ChatType
 from telegram.ext import Application, CommandHandler, CallbackQueryHandler, ContextTypes
 from playwright.async_api import async_playwright
 
@@ -15,36 +14,22 @@ logging.basicConfig(
 )
 logger = logging.getLogger(__name__)
 
-# Suppress HTTP request logs
-logging.getLogger('urllib3').setLevel(logging.WARNING)
-logging.getLogger('httpx').setLevel(logging.WARNING)
-logging.getLogger('telegram.ext._application').setLevel(logging.WARNING)
-
 # Load environment variables
-def _env(key, default=None):
+WEBINAR_URL = os.getenv('WEBINAR_URL', 'https://edu.edu.vn.ua/webinar/useractive')
-    v = os.getenv(key, default)
+WEBINAR_CHECK_INTERVAL = int(os.getenv('WEBINAR_CHECK_INTERVAL', 60))
-    if isinstance(v, str) and len(v) >= 2 and ((v[0] == '"' and v[-1] == '"') or (v[0] == "'" and v[-1] == "'")):
+REDIS_HOST = os.getenv('REDIS_HOST', 'redis')
-        return v[1:-1]
+REDIS_PORT = int(os.getenv('REDIS_PORT', 6379))
-    return v
+PLAYWRIGHT_WS = os.getenv('PLAYWRIGHT_WS', 'ws://playwright-service:3000/ws')
-
+USER_AGENT = os.getenv('USER_AGENT', 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/142.0.0.0 Safari/537.36')
-EDU_BASE = _env('EDU_URL_BASE', 'https://edu.edu.vn.ua')
+WEBINAR_TELEGRAM_TOKEN = os.getenv('WEBINAR_TELEGRAM_TOKEN')
-EDU_WEBINAR_PATH = _env('EDU_URL_WEBINAR', '/webinar/useractive')
+ADMIN_ID = int(os.getenv('WEBINAR_ADMIN_ID', '0'))
-WEBINAR_URL = f"{EDU_BASE.rstrip('/')}/{EDU_WEBINAR_PATH.lstrip('/')}"
-
-WEBINAR_CHECK_INTERVAL = int(_env('WEBINAR_CHECK_INTERVAL', 60))
-REDIS_HOST = _env('REDIS_HOST', 'redis')
-REDIS_PORT = int(_env('REDIS_PORT', 6379))
-PLAYWRIGHT_WS = _env('PLAYWRIGHT_WS', 'ws://playwright-service:3000/ws')
-USER_AGENT = _env('USER_AGENT', 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/142.0.0.0 Safari/537.36')
-WEBINAR_TELEGRAM_TOKEN = _env('WEBINAR_TELEGRAM_TOKEN')
-ADMIN_ID = int(_env('WEBINAR_ADMIN_ID', '0'))
 
 # Redis Keys
 KEY_WHITELIST = "bot:whitelist"
 KEY_WHITELIST_ENABLED = "bot:whitelist_enabled"
 KEY_SUBSCRIBERS = "bot:subscribers"
 KEY_PHPSESSID = "EDU_PHPSESSID"
-KEY_WEBINAR_HISTORY = "bot:webinar_history"  # Stores last 3 webinars
+KEY_WEBINAR_HISTORY = "bot:webinar_history"  # Stores last 5 webinars
 
 # Initialize Redis
 try:
@@ -63,7 +48,7 @@ TRANSLATIONS = {
         'welcome_admin': "\n\n👑 <b>Режим администратора активен</b>",
         'access_denied': "⛔ Доступ запрещен. Вас нет в белом списке.",
         'help_title': "🤖 <b>Помощь по боту</b>\n\n",
-        'help_commands': "/start - Подписаться на уведомления\n/stop - Отписаться от уведомлений\n/help - Показать это сообщение\n/language - Сменить язык",
+        'help_commands': "/start - Подписаться на уведомления\n/help - Показать это сообщение\n/language - Сменить язык",
         'help_admin': "\n<b>Команды администратора:</b>\n/adduser [user_id] - Добавить пользователя в белый список\n/removeuser [user_id] - Удалить пользователя из белого списка\nИли используйте панель ниже для управления настройками.",
         'admin_only': "⛔ Только для администратора!",
         'user_added': "✅ Пользователь {user_id} добавлен в белый список",
@@ -94,15 +79,13 @@ TRANSLATIONS = {
         'flag_ru': "🇷🇺 Русский",
         'flag_uk': "🇺🇦 Українська",
         'flag_en': "🇬🇧 English",
-        'history_cleared': "✅ История вебинаров очищена",
-        'history_clear_failed': "❌ Ошибка при очистке истории",
     },
     'uk': {
         'welcome': "👋 Привіт, {name}!\n\nЯ бот-сповіщувач про вебінари. Я повідомлятиму вас, коли з'явиться новий вебінар.\nВи підписані на сповіщення.",
         'welcome_admin': "\n\n👑 <b>Режим адміністратора активний</b>",
         'access_denied': "⛔ Доступ заборонено. Вас немає в білому списку.",
         'help_title': "🤖 <b>Довідка по боту</b>\n\n",
-        'help_commands': "/start - Підписатися на сповіщення\n/stop - Відписатися від сповіщень\n/help - Показати це повідомлення\n/language - Змінити мову",
+        'help_commands': "/start - Підписатися на сповіщення\n/help - Показати це повідомлення\n/language - Змінити мову",
         'help_admin': "\n<b>Команди адміністратора:</b>\n/adduser [user_id] - Додати користувача до білого списку\n/removeuser [user_id] - Видалити користувача з білого списку\nАбо використовуйте панель нижче для керування налаштуваннями.",
         'admin_only': "⛔ Тільки для адміністратора!",
         'user_added': "✅ Користувач {user_id} доданий до білого списку",
@@ -133,15 +116,13 @@ TRANSLATIONS = {
         'flag_ru': "🇷🇺 Русский",
         'flag_uk': "🇺🇦 Українська",
         'flag_en': "🇬🇧 English",
-        'history_cleared': "✅ Історія вебінарів очищена",
-        'history_clear_failed': "❌ Помилка при очищенні історії",
     },
     'en': {
         'welcome': "👋 Hello, {name}!\n\nI am the Webinar Checker Bot. I will notify you when a new webinar appears.\nYou have been subscribed to notifications.",
         'welcome_admin': "\n\n👑 <b>Admin Mode Active</b>",
         'access_denied': "⛔ Access denied. You are not on the whitelist.",
         'help_title': "🤖 <b>Bot Help</b>\n\n",
-        'help_commands': "/start - Subscribe to notifications\n/stop - Unsubscribe from notifications\n/help - Show this message\n/language - Change language",
+        'help_commands': "/start - Subscribe to notifications\n/help - Show this message\n/language - Change language",
         'help_admin': "\n<b>Admin Commands:</b>\n/adduser [user_id] - Add user to whitelist\n/removeuser [user_id] - Remove user from whitelist\nOr use the panel below to manage settings.",
         'admin_only': "⛔ Admin only!",
         'user_added': "✅ User {user_id} added to whitelist",
@@ -172,8 +153,6 @@ TRANSLATIONS = {
         'flag_ru': "🇷🇺 Русский",
         'flag_uk': "🇺🇦 Українська",
         'flag_en': "🇬🇧 English",
-        'history_cleared': "✅ Webinar history cleared",
-        'history_clear_failed': "❌ Error clearing history",
     }
 }
 
@@ -224,21 +203,6 @@ def is_whitelisted(user_id: int) -> bool:
         
     return redis_client.sismember(KEY_WHITELIST, str(user_id))
 
-async def is_group_admin(update: Update, context: ContextTypes.DEFAULT_TYPE) -> bool:
-    """Check if the user is an administrator in the group."""
-    user = update.effective_user
-    chat = update.effective_chat
-    
-    if chat.type in [ChatType.PRIVATE, "private"]:
-        return True
-        
-    try:
-        member = await context.bot.get_chat_member(chat.id, user.id)
-        return member.status in [ChatMember.OWNER, ChatMember.ADMINISTRATOR]
-    except Exception as e:
-        logger.error(f"Failed to check admin status: {e}")
-        return False
-
 def get_admin_keyboard(user_id: int):
     """Generate admin panel keyboard."""
     whitelist_enabled = redis_client.get(KEY_WHITELIST_ENABLED) != "0"
@@ -257,21 +221,19 @@ def get_admin_keyboard(user_id: int):
 async def start(update: Update, context: ContextTypes.DEFAULT_TYPE):
     """Handle /start command."""
     user = update.effective_user
-    chat = update.effective_chat
+    logger.info(f"User {user.id} ({user.username}) started the bot.")
-    logger.info(f"User {user.id} ({user.username}) started the bot in chat {chat.id} ({chat.type}).")
     
-    # Check whitelist - MUST be the user executing the command
     if not is_whitelisted(user.id):
         await update.message.reply_text(t(user.id, 'access_denied'))
         return
 
-    # Add to subscribers (Chat ID!)
+    # Add to subscribers
-    redis_client.sadd(KEY_SUBSCRIBERS, chat.id)
+    redis_client.sadd(KEY_SUBSCRIBERS, user.id)
     
-    msg = t(chat.id, 'welcome', name=user.first_name)
+    msg = t(user.id, 'welcome', name=user.first_name)
     
-    if user.id == ADMIN_ID and chat.type == "private":
+    if user.id == ADMIN_ID:
-        msg += t(chat.id, 'welcome_admin')
+        msg += t(user.id, 'welcome_admin')
         await update.message.reply_text(msg, parse_mode='HTML', reply_markup=get_admin_keyboard(user.id))
     else:
         await update.message.reply_text(msg, parse_mode='HTML')
@@ -279,39 +241,19 @@ async def start(update: Update, context: ContextTypes.DEFAULT_TYPE):
 async def help_command(update: Update, context: ContextTypes.DEFAULT_TYPE):
     """Handle /help command."""
     user_id = update.effective_user.id
-    chat_id = update.effective_chat.id
+    msg = t(user_id, 'help_title') + t(user_id, 'help_commands')
-    msg = t(chat_id, 'help_title') + t(chat_id, 'help_commands')
     
-    if user_id == ADMIN_ID and update.effective_chat.type == "private":
+    if user_id == ADMIN_ID:
-        msg += t(chat_id, 'help_admin')
+        msg += t(user_id, 'help_admin')
         await update.message.reply_text(msg, parse_mode='HTML', reply_markup=get_admin_keyboard(user_id))
     else:
         await update.message.reply_text(msg, parse_mode='HTML')
 
-async def stop_command(update: Update, context: ContextTypes.DEFAULT_TYPE):
-    """Handle /stop command (unsubscribe)."""
-    user = update.effective_user
-    chat = update.effective_chat
-    
-    # Permission check: Whitelisted user OR Group Admin
-    if not (is_whitelisted(user.id) or await is_group_admin(update, context)):
-        await update.message.reply_text(t(chat.id, 'access_denied')) # Or specific "admin only" message
-        return
-        
-    redis_client.srem(KEY_SUBSCRIBERS, chat.id)
-    await update.message.reply_text(t(chat.id, 'whitelist_disabled').replace(" whitelist", " notifications").replace("Білий список", "Сповіщення").replace("Белый список", "Уведомления") if chat.id else "Unsubscribed")
-
 async def language_command(update: Update, context: ContextTypes.DEFAULT_TYPE):
     """Handle /language command."""
-    user = update.effective_user
+    user_id = update.effective_user.id
-    chat = update.effective_chat
-    
-    # Permission check for groups
-    if not (is_whitelisted(user.id) or await is_group_admin(update, context)):
-        return
-
     await update.message.reply_text(
-        t(chat.id, 'select_language'),
+        t(user_id, 'select_language'),
         parse_mode='HTML',
         reply_markup=get_language_keyboard()
     )
@@ -361,21 +303,6 @@ async def remove_user(update: Update, context: ContextTypes.DEFAULT_TYPE):
     except ValueError:
         await update.message.reply_text(t(admin_id, 'invalid_user_id'))
 
-async def clear_history(update: Update, context: ContextTypes.DEFAULT_TYPE):
-    """Clear webinar history (admin only)."""
-    admin_id = update.effective_user.id
-    if admin_id != ADMIN_ID:
-        await update.message.reply_text(t(admin_id, 'admin_only'))
-        return
-    
-    try:
-        redis_client.delete(KEY_WEBINAR_HISTORY)
-        await update.message.reply_text(t(admin_id, 'history_cleared'))
-        logger.info("Admin cleared webinar history")
-    except Exception as e:
-        logger.error(f"Failed to clear history: {e}")
-        await update.message.reply_text(t(admin_id, 'history_clear_failed'))
-
 # --- Admin Callbacks ---
 
 async def admin_callback(update: Update, context: ContextTypes.DEFAULT_TYPE):
@@ -436,9 +363,9 @@ async def language_callback(update: Update, context: ContextTypes.DEFAULT_TYPE):
 
 # --- Webinar Checking Job ---
 
-def get_webinar_key(url: str) -> str:
+def get_webinar_key(name: str, url: str) -> str:
-    """Generate unique key for a webinar based on URL."""
+    """Generate unique key for a webinar based on name and URL."""
-    return url
+    return f"{name}|{url}"
 
 def get_stored_webinars() -> list:
     """Get list of stored webinar keys from Redis."""
@@ -451,9 +378,9 @@ def get_stored_webinars() -> list:
     return []
 
 def store_webinars(webinar_keys: list):
-    """Store up to 3 most recent webinar keys in Redis."""
+    """Store up to 5 most recent webinar keys in Redis."""
-    # Keep only last 3
+    # Keep only last 5
-    webinar_keys = webinar_keys[-3:]
+    webinar_keys = webinar_keys[-5:]
     try:
         redis_client.set(KEY_WEBINAR_HISTORY, json.dumps(webinar_keys))
         logger.info(f"Stored {len(webinar_keys)} webinar(s) in history")
@@ -588,7 +515,7 @@ async def check_webinars_job(context: ContextTypes.DEFAULT_TYPE):
         current_keys = []
         
         for webinar in current_webinars:
-            key = get_webinar_key(webinar['url'])
+            key = get_webinar_key(webinar['name'], webinar['url'])
             current_keys.append(key)
             
             if key not in stored_keys:
@@ -608,7 +535,6 @@ async def check_webinars_job(context: ContextTypes.DEFAULT_TYPE):
             for sub_id in subscribers:
                 try:
                     # Build message in user's language
-                    # sub_id comes from redis set as string, convert to int for translation lookup
                     webinar_items = "\n\n".join([
                         t(int(sub_id), 'webinar_item', name=w['name'], url=w['url'])
                         for w in new_webinars
@@ -643,12 +569,10 @@ def main():
 
     # Handlers
     app.add_handler(CommandHandler("start", start))
-    app.add_handler(CommandHandler("stop", stop_command))
     app.add_handler(CommandHandler("help", help_command))
     app.add_handler(CommandHandler("language", language_command))
     app.add_handler(CommandHandler("adduser", add_user))
     app.add_handler(CommandHandler("removeuser", remove_user))
-    app.add_handler(CommandHandler("clearhistory", clear_history))
     
     # Callback handlers - language selection first, then admin panel
     app.add_handler(CallbackQueryHandler(language_callback, pattern="^lang_"))

errorpages/Dockerfile

@@ -1,5 +0,0 @@
-FROM nginx:alpine
-RUN rm -rf /usr/share/nginx/html/*
-COPY html /usr/share/nginx/html
-EXPOSE 80
-CMD ["nginx", "-g", "daemon off;"]

errorpages/compose.yaml

@@ -1,19 +0,0 @@
-services:
-  errorpage:
-    build: .
-    container_name: error-pages
-    restart: unless-stopped
-    # ports:
-    #   - 1234:80
-    networks:
-      - proxy
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.services.error-pages.loadbalancer.server.port=80"
-      # Error handler middleware
-      - "traefik.http.middlewares.error-pages.errors.status=400-599"
-      - "traefik.http.middlewares.error-pages.errors.service=error-pages"
-      - "traefik.http.middlewares.error-pages.errors.query=/{status}.html"
-networks:
-  proxy:
-    external: true

errorpages/html/403.html

@@ -1,208 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>403 // Forbidden</title>
-    <script src="https://kit.fontawesome.com/a076d05399.js" crossorigin="anonymous"></script>
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css">
-    <style>
-/* hidden in a plain sight? */
-:root {
-    --bg-color: #050505;
-    --text-color: #e0e0e0;
-    --accent: #ffffff;
-    --dim: #666666;
-    --font-mono: 'Courier New', Courier, monospace;
-}
-
-* {
-    box-sizing: border-box;
-    margin: 0;
-    padding: 0;
-}
-
-body {
-    background-color: var(--bg-color);
-    color: var(--text-color);
-    font-family: var(--font-mono);
-    line-height: 1.6;
-    font-size: 16px;
-    padding: 2rem;
-}
-
-a {
-    color: var(--text-color);
-    text-decoration: none;
-    border-bottom: 1px solid var(--dim);
-    transition: all 0.2s;
-}
-
-a:hover {
-    background-color: var(--text-color);
-    color: var(--bg-color);
-    border-color: var(--text-color);
-}
-
-.container {
-    max-width: 800px;
-    margin: 0 auto;
-}
-
-/* TEXT */
-h1 {
-    font-size: 2.5rem;
-    text-transform: uppercase;
-    letter-spacing: -2px;
-    margin-bottom: 0.5rem;
-}
-
-h2 {
-    font-size: 1.2rem;
-    margin-bottom: 1.5rem;
-    border-bottom: 1px solid var(--dim);
-    display: inline-block;
-    padding-right: 20px;
-}
-
-.subtitle {
-    color: var(--dim);
-    margin-bottom: 2rem;
-}
-
-hr {
-    border: 0;
-    border-top: 1px dashed var(--dim);
-    margin: 2rem 0;
-}
-
-.comment {
-    color: var(--dim);
-    font-size: 0.9rem;
-    margin-left: 10px;
-}
-
-/* SECTIONS */
-section {
-    margin-bottom: 3rem;
-}
-
-/* LISTS */
-ul {
-    list-style: none;
-}
-
-.link-list li {
-    margin-bottom: 0.8rem;
-    display: flex;
-    align-items: center;
-    gap: 15px;
-}
-
-/* STACK GRID */
-.grid-2 {
-    display: grid;
-    grid-template-columns: 1fr 1fr;
-    gap: 2rem;
-}
-
-.skill-item {
-    display: flex;
-    justify-content: space-between;
-    margin-bottom: 0.5rem;
-}
-
-.level {
-    font-weight: bold;
-}
-
-.special .level {
-    color: var(--text-color);
-    text-shadow: 1px 0 0 red, -1px 0 0 blue; 
-}
-
-/* my dudes */
-.team-grid {
-    display: flex;
-    gap: 2rem;
-    flex-wrap: wrap;
-    margin-top: 1rem;
-}
-
-.member {
-    text-align: center;
-    width: 100px;
-}
-
-.avatar {
-    width: 80px;
-    height: 80px;
-    background-color: #222;
-    border: 2px solid var(--text-color);
-    margin: 0 auto 10px auto;
-    background-size: cover;
-}
-
-/* if no avatar added: */
-.placeholder::before {
-    content: "?";
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    height: 100%;
-    font-size: 2rem;
-    color: var(--dim);
-}
-
-/* REPOS */
-.repo-list li {
-    margin-bottom: 1rem;
-}
-
-/* FOOTER */
-footer {
-    text-align: center;
-    color: var(--dim);
-    font-size: 0.8rem;
-/* flag{why-are-you-here?} */
-    margin-top: 4rem;
-}
-/* SMTH RESPONSIVE */
-@media (max-width: 600px) {
-    .grid-2 {
-        grid-template-columns: 1fr;
-        gap: 0;
-    }
-}
-    </style>
-</head>
-
-<body>
-
-    <div class="container">
-        <header>
-            <h1 class="glitch" data-text="403">403</h1>
-            <p class="subtitle">> Forbidden / Access Denied.</p>
-        </header>
-
-        <hr>
-
-        <section id="message">
-            <h2>./error_message</h2>
-            <p>You do not have permission to access this resource.</p>
-            <br>
-            <p>Check the <a href="https://status.forust.xyz">System Status</a> if you believe this is an
-                error.</p>
-        </section>
-
-        <footer>
-            <p>root@error:~$ sudo access_resource</p>
-            <p>User is not in the sudoers file. This incident will be reported.</p>
-            <p>&copy; XRock - Just Signal.</p>
-        </footer>
-    </div>
-
-</body>
-
-</html>

errorpages/html/404.html

@@ -1,207 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>404 // Not Found</title>
-    <script src="https://kit.fontawesome.com/a076d05399.js" crossorigin="anonymous"></script>
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css">
-    <style>
-/* hidden in a plain sight? */
-:root {
-    --bg-color: #050505;
-    --text-color: #e0e0e0;
-    --accent: #ffffff;
-    --dim: #666666;
-    --font-mono: 'Courier New', Courier, monospace;
-}
-
-* {
-    box-sizing: border-box;
-    margin: 0;
-    padding: 0;
-}
-
-body {
-    background-color: var(--bg-color);
-    color: var(--text-color);
-    font-family: var(--font-mono);
-    line-height: 1.6;
-    font-size: 16px;
-    padding: 2rem;
-}
-
-a {
-    color: var(--text-color);
-    text-decoration: none;
-    border-bottom: 1px solid var(--dim);
-    transition: all 0.2s;
-}
-
-a:hover {
-    background-color: var(--text-color);
-    color: var(--bg-color);
-    border-color: var(--text-color);
-}
-
-.container {
-    max-width: 800px;
-    margin: 0 auto;
-}
-
-/* TEXT */
-h1 {
-    font-size: 2.5rem;
-    text-transform: uppercase;
-    letter-spacing: -2px;
-    margin-bottom: 0.5rem;
-}
-
-h2 {
-    font-size: 1.2rem;
-    margin-bottom: 1.5rem;
-    border-bottom: 1px solid var(--dim);
-    display: inline-block;
-    padding-right: 20px;
-}
-
-.subtitle {
-    color: var(--dim);
-    margin-bottom: 2rem;
-}
-
-hr {
-    border: 0;
-    border-top: 1px dashed var(--dim);
-    margin: 2rem 0;
-}
-
-.comment {
-    color: var(--dim);
-    font-size: 0.9rem;
-    margin-left: 10px;
-}
-
-/* SECTIONS */
-section {
-    margin-bottom: 3rem;
-}
-
-/* LISTS */
-ul {
-    list-style: none;
-}
-
-.link-list li {
-    margin-bottom: 0.8rem;
-    display: flex;
-    align-items: center;
-    gap: 15px;
-}
-
-/* STACK GRID */
-.grid-2 {
-    display: grid;
-    grid-template-columns: 1fr 1fr;
-    gap: 2rem;
-}
-
-.skill-item {
-    display: flex;
-    justify-content: space-between;
-    margin-bottom: 0.5rem;
-}
-
-.level {
-    font-weight: bold;
-}
-
-.special .level {
-    color: var(--text-color);
-    text-shadow: 1px 0 0 red, -1px 0 0 blue; 
-}
-
-/* my dudes */
-.team-grid {
-    display: flex;
-    gap: 2rem;
-    flex-wrap: wrap;
-    margin-top: 1rem;
-}
-
-.member {
-    text-align: center;
-    width: 100px;
-}
-
-.avatar {
-    width: 80px;
-    height: 80px;
-    background-color: #222;
-    border: 2px solid var(--text-color);
-    margin: 0 auto 10px auto;
-    background-size: cover;
-}
-
-/* if no avatar added: */
-.placeholder::before {
-    content: "?";
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    height: 100%;
-    font-size: 2rem;
-    color: var(--dim);
-}
-
-/* REPOS */
-.repo-list li {
-    margin-bottom: 1rem;
-}
-
-/* FOOTER */
-footer {
-    text-align: center;
-    color: var(--dim);
-    font-size: 0.8rem;
-/* flag{why-are-you-here?} */
-    margin-top: 4rem;
-}
-/* SMTH RESPONSIVE */
-@media (max-width: 600px) {
-    .grid-2 {
-        grid-template-columns: 1fr;
-        gap: 0;
-    }
-}
-    </style>
-</head>
-
-<body>
-
-    <div class="container">
-        <header>
-            <h1 class="glitch" data-text="404">404</h1>
-            <p class="subtitle">> Page Not Found / Lost in the Void.</p>
-        </header>
-
-        <hr>
-
-        <section id="message">
-            <h2>./error_message</h2>
-            <p>The page you are looking for does not exist or has been moved.</p>
-            <br>
-            <p>Check the <a href="https://status.forust.xyz">System Status</a> if you believe this is an error.</p>
-        </section>
-
-        <footer>
-            <p>root@error:~$ ping target</p>
-            <p>Destination Host Unreachable</p>
-            <p>&copy; XRock - Just Signal.</p>
-        </footer>
-    </div>
-
-</body>
-
-</html>

errorpages/html/500.html

@@ -1,207 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>500 // Server Error</title>
-    <script src="https://kit.fontawesome.com/a076d05399.js" crossorigin="anonymous"></script>
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css">
-    <style>
-/* hidden in a plain sight? */
-:root {
-    --bg-color: #050505;
-    --text-color: #e0e0e0;
-    --accent: #ffffff;
-    --dim: #666666;
-    --font-mono: 'Courier New', Courier, monospace;
-}
-
-* {
-    box-sizing: border-box;
-    margin: 0;
-    padding: 0;
-}
-
-body {
-    background-color: var(--bg-color);
-    color: var(--text-color);
-    font-family: var(--font-mono);
-    line-height: 1.6;
-    font-size: 16px;
-    padding: 2rem;
-}
-
-a {
-    color: var(--text-color);
-    text-decoration: none;
-    border-bottom: 1px solid var(--dim);
-    transition: all 0.2s;
-}
-
-a:hover {
-    background-color: var(--text-color);
-    color: var(--bg-color);
-    border-color: var(--text-color);
-}
-
-.container {
-    max-width: 800px;
-    margin: 0 auto;
-}
-
-/* TEXT */
-h1 {
-    font-size: 2.5rem;
-    text-transform: uppercase;
-    letter-spacing: -2px;
-    margin-bottom: 0.5rem;
-}
-
-h2 {
-    font-size: 1.2rem;
-    margin-bottom: 1.5rem;
-    border-bottom: 1px solid var(--dim);
-    display: inline-block;
-    padding-right: 20px;
-}
-
-.subtitle {
-    color: var(--dim);
-    margin-bottom: 2rem;
-}
-
-hr {
-    border: 0;
-    border-top: 1px dashed var(--dim);
-    margin: 2rem 0;
-}
-
-.comment {
-    color: var(--dim);
-    font-size: 0.9rem;
-    margin-left: 10px;
-}
-
-/* SECTIONS */
-section {
-    margin-bottom: 3rem;
-}
-
-/* LISTS */
-ul {
-    list-style: none;
-}
-
-.link-list li {
-    margin-bottom: 0.8rem;
-    display: flex;
-    align-items: center;
-    gap: 15px;
-}
-
-/* STACK GRID */
-.grid-2 {
-    display: grid;
-    grid-template-columns: 1fr 1fr;
-    gap: 2rem;
-}
-
-.skill-item {
-    display: flex;
-    justify-content: space-between;
-    margin-bottom: 0.5rem;
-}
-
-.level {
-    font-weight: bold;
-}
-
-.special .level {
-    color: var(--text-color);
-    text-shadow: 1px 0 0 red, -1px 0 0 blue; 
-}
-
-/* my dudes */
-.team-grid {
-    display: flex;
-    gap: 2rem;
-    flex-wrap: wrap;
-    margin-top: 1rem;
-}
-
-.member {
-    text-align: center;
-    width: 100px;
-}
-
-.avatar {
-    width: 80px;
-    height: 80px;
-    background-color: #222;
-    border: 2px solid var(--text-color);
-    margin: 0 auto 10px auto;
-    background-size: cover;
-}
-
-/* if no avatar added: */
-.placeholder::before {
-    content: "?";
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    height: 100%;
-    font-size: 2rem;
-    color: var(--dim);
-}
-
-/* REPOS */
-.repo-list li {
-    margin-bottom: 1rem;
-}
-
-/* FOOTER */
-footer {
-    text-align: center;
-    color: var(--dim);
-    font-size: 0.8rem;
-/* flag{why-are-you-here?} */
-    margin-top: 4rem;
-}
-/* SMTH RESPONSIVE */
-@media (max-width: 600px) {
-    .grid-2 {
-        grid-template-columns: 1fr;
-        gap: 0;
-    }
-}
-    </style>
-</head>
-
-<body>
-
-    <div class="container">
-        <header>
-            <h1 class="glitch" data-text="500">500</h1>
-            <p class="subtitle">> Internal Server Error / System Failure.</p>
-        </header>
-
-        <hr>
-
-        <section id="message">
-            <h2>./error_message</h2>
-            <p>Something went wrong on our end. We are working to fix it.</p>
-            <br>
-            <p>Check the <a href="https://status.forust.xyz">System Status</a> for more information.</p>
-        </section>
-
-        <footer>
-            <p>root@error:~$ systemctl status service</p>
-            <p>Active: failed (Result: core-dump)</p>
-            <p>&copy; XRock - Just Signal.</p>
-        </footer>
-    </div>
-
-</body>
-
-</html>

errorpages/html/502.html

@@ -1,207 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>502 // Bad Gateway</title>
-    <script src="https://kit.fontawesome.com/a076d05399.js" crossorigin="anonymous"></script>
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css">
-    <style>
-/* hidden in a plain sight? */
-:root {
-    --bg-color: #050505;
-    --text-color: #e0e0e0;
-    --accent: #ffffff;
-    --dim: #666666;
-    --font-mono: 'Courier New', Courier, monospace;
-}
-
-* {
-    box-sizing: border-box;
-    margin: 0;
-    padding: 0;
-}
-
-body {
-    background-color: var(--bg-color);
-    color: var(--text-color);
-    font-family: var(--font-mono);
-    line-height: 1.6;
-    font-size: 16px;
-    padding: 2rem;
-}
-
-a {
-    color: var(--text-color);
-    text-decoration: none;
-    border-bottom: 1px solid var(--dim);
-    transition: all 0.2s;
-}
-
-a:hover {
-    background-color: var(--text-color);
-    color: var(--bg-color);
-    border-color: var(--text-color);
-}
-
-.container {
-    max-width: 800px;
-    margin: 0 auto;
-}
-
-/* TEXT */
-h1 {
-    font-size: 2.5rem;
-    text-transform: uppercase;
-    letter-spacing: -2px;
-    margin-bottom: 0.5rem;
-}
-
-h2 {
-    font-size: 1.2rem;
-    margin-bottom: 1.5rem;
-    border-bottom: 1px solid var(--dim);
-    display: inline-block;
-    padding-right: 20px;
-}
-
-.subtitle {
-    color: var(--dim);
-    margin-bottom: 2rem;
-}
-
-hr {
-    border: 0;
-    border-top: 1px dashed var(--dim);
-    margin: 2rem 0;
-}
-
-.comment {
-    color: var(--dim);
-    font-size: 0.9rem;
-    margin-left: 10px;
-}
-
-/* SECTIONS */
-section {
-    margin-bottom: 3rem;
-}
-
-/* LISTS */
-ul {
-    list-style: none;
-}
-
-.link-list li {
-    margin-bottom: 0.8rem;
-    display: flex;
-    align-items: center;
-    gap: 15px;
-}
-
-/* STACK GRID */
-.grid-2 {
-    display: grid;
-    grid-template-columns: 1fr 1fr;
-    gap: 2rem;
-}
-
-.skill-item {
-    display: flex;
-    justify-content: space-between;
-    margin-bottom: 0.5rem;
-}
-
-.level {
-    font-weight: bold;
-}
-
-.special .level {
-    color: var(--text-color);
-    text-shadow: 1px 0 0 red, -1px 0 0 blue; 
-}
-
-/* my dudes */
-.team-grid {
-    display: flex;
-    gap: 2rem;
-    flex-wrap: wrap;
-    margin-top: 1rem;
-}
-
-.member {
-    text-align: center;
-    width: 100px;
-}
-
-.avatar {
-    width: 80px;
-    height: 80px;
-    background-color: #222;
-    border: 2px solid var(--text-color);
-    margin: 0 auto 10px auto;
-    background-size: cover;
-}
-
-/* if no avatar added: */
-.placeholder::before {
-    content: "?";
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    height: 100%;
-    font-size: 2rem;
-    color: var(--dim);
-}
-
-/* REPOS */
-.repo-list li {
-    margin-bottom: 1rem;
-}
-
-/* FOOTER */
-footer {
-    text-align: center;
-    color: var(--dim);
-    font-size: 0.8rem;
-/* flag{why-are-you-here?} */
-    margin-top: 4rem;
-}
-/* SMTH RESPONSIVE */
-@media (max-width: 600px) {
-    .grid-2 {
-        grid-template-columns: 1fr;
-        gap: 0;
-    }
-}
-    </style>
-</head>
-
-<body>
-
-    <div class="container">
-        <header>
-            <h1 class="glitch" data-text="502">502</h1>
-            <p class="subtitle">> Bad Gateway / System Failure.</p>
-        </header>
-
-        <hr>
-
-        <section id="message">
-            <h2>./error_message</h2>
-            <p>The server received an invalid response from the upstream server.</p>
-            <br>
-            <p>Check the <a href="https://status.forust.xyz">System Status</a> for more information.</p>
-        </section>
-
-        <footer>
-            <p>root@error:~$ curl -I upstream_host</p>
-            <p>HTTP/1.1 502 Bad Gateway</p>
-            <p>&copy; XRock - Just Signal.</p>
-        </footer>
-    </div>
-
-</body>
-
-</html>

errorpages/html/503.html

@@ -1,207 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>503 // Service Unavailable</title>
-    <script src="https://kit.fontawesome.com/a076d05399.js" crossorigin="anonymous"></script>
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css">
-    <style>
-/* hidden in a plain sight? */
-:root {
-    --bg-color: #050505;
-    --text-color: #e0e0e0;
-    --accent: #ffffff;
-    --dim: #666666;
-    --font-mono: 'Courier New', Courier, monospace;
-}
-
-* {
-    box-sizing: border-box;
-    margin: 0;
-    padding: 0;
-}
-
-body {
-    background-color: var(--bg-color);
-    color: var(--text-color);
-    font-family: var(--font-mono);
-    line-height: 1.6;
-    font-size: 16px;
-    padding: 2rem;
-}
-
-a {
-    color: var(--text-color);
-    text-decoration: none;
-    border-bottom: 1px solid var(--dim);
-    transition: all 0.2s;
-}
-
-a:hover {
-    background-color: var(--text-color);
-    color: var(--bg-color);
-    border-color: var(--text-color);
-}
-
-.container {
-    max-width: 800px;
-    margin: 0 auto;
-}
-
-/* TEXT */
-h1 {
-    font-size: 2.5rem;
-    text-transform: uppercase;
-    letter-spacing: -2px;
-    margin-bottom: 0.5rem;
-}
-
-h2 {
-    font-size: 1.2rem;
-    margin-bottom: 1.5rem;
-    border-bottom: 1px solid var(--dim);
-    display: inline-block;
-    padding-right: 20px;
-}
-
-.subtitle {
-    color: var(--dim);
-    margin-bottom: 2rem;
-}
-
-hr {
-    border: 0;
-    border-top: 1px dashed var(--dim);
-    margin: 2rem 0;
-}
-
-.comment {
-    color: var(--dim);
-    font-size: 0.9rem;
-    margin-left: 10px;
-}
-
-/* SECTIONS */
-section {
-    margin-bottom: 3rem;
-}
-
-/* LISTS */
-ul {
-    list-style: none;
-}
-
-.link-list li {
-    margin-bottom: 0.8rem;
-    display: flex;
-    align-items: center;
-    gap: 15px;
-}
-
-/* STACK GRID */
-.grid-2 {
-    display: grid;
-    grid-template-columns: 1fr 1fr;
-    gap: 2rem;
-}
-
-.skill-item {
-    display: flex;
-    justify-content: space-between;
-    margin-bottom: 0.5rem;
-}
-
-.level {
-    font-weight: bold;
-}
-
-.special .level {
-    color: var(--text-color);
-    text-shadow: 1px 0 0 red, -1px 0 0 blue; 
-}
-
-/* my dudes */
-.team-grid {
-    display: flex;
-    gap: 2rem;
-    flex-wrap: wrap;
-    margin-top: 1rem;
-}
-
-.member {
-    text-align: center;
-    width: 100px;
-}
-
-.avatar {
-    width: 80px;
-    height: 80px;
-    background-color: #222;
-    border: 2px solid var(--text-color);
-    margin: 0 auto 10px auto;
-    background-size: cover;
-}
-
-/* if no avatar added: */
-.placeholder::before {
-    content: "?";
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    height: 100%;
-    font-size: 2rem;
-    color: var(--dim);
-}
-
-/* REPOS */
-.repo-list li {
-    margin-bottom: 1rem;
-}
-
-/* FOOTER */
-footer {
-    text-align: center;
-    color: var(--dim);
-    font-size: 0.8rem;
-/* flag{why-are-you-here?} */
-    margin-top: 4rem;
-}
-/* SMTH RESPONSIVE */
-@media (max-width: 600px) {
-    .grid-2 {
-        grid-template-columns: 1fr;
-        gap: 0;
-    }
-}
-    </style>
-</head>
-
-<body>
-
-    <div class="container">
-        <header>
-            <h1 class="glitch" data-text="503">503</h1>
-            <p class="subtitle">> Service Unavailable / System Failure.</p>
-        </header>
-
-        <hr>
-
-        <section id="message">
-            <h2>./error_message</h2>
-            <p>The server is currently unable to handle the request due to maintenance or overload.</p>
-            <br>
-            <p>Check the <a href="https://status.forust.xyz">System Status</a> for more information.</p>
-        </section>
-
-        <footer>
-            <p>root@error:~$ systemctl start service</p>
-            <p>Job for service failed because the control process exited with error code.</p>
-            <p>&copy; XRock - Just Signal.</p>
-        </footer>
-    </div>
-
-</body>
-
-</html>

errorpages/html/504.html

@@ -1,207 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>504 // Gateway Timeout</title>
-    <script src="https://kit.fontawesome.com/a076d05399.js" crossorigin="anonymous"></script>
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css">
-    <style>
-/* hidden in a plain sight? */
-:root {
-    --bg-color: #050505;
-    --text-color: #e0e0e0;
-    --accent: #ffffff;
-    --dim: #666666;
-    --font-mono: 'Courier New', Courier, monospace;
-}
-
-* {
-    box-sizing: border-box;
-    margin: 0;
-    padding: 0;
-}
-
-body {
-    background-color: var(--bg-color);
-    color: var(--text-color);
-    font-family: var(--font-mono);
-    line-height: 1.6;
-    font-size: 16px;
-    padding: 2rem;
-}
-
-a {
-    color: var(--text-color);
-    text-decoration: none;
-    border-bottom: 1px solid var(--dim);
-    transition: all 0.2s;
-}
-
-a:hover {
-    background-color: var(--text-color);
-    color: var(--bg-color);
-    border-color: var(--text-color);
-}
-
-.container {
-    max-width: 800px;
-    margin: 0 auto;
-}
-
-/* TEXT */
-h1 {
-    font-size: 2.5rem;
-    text-transform: uppercase;
-    letter-spacing: -2px;
-    margin-bottom: 0.5rem;
-}
-
-h2 {
-    font-size: 1.2rem;
-    margin-bottom: 1.5rem;
-    border-bottom: 1px solid var(--dim);
-    display: inline-block;
-    padding-right: 20px;
-}
-
-.subtitle {
-    color: var(--dim);
-    margin-bottom: 2rem;
-}
-
-hr {
-    border: 0;
-    border-top: 1px dashed var(--dim);
-    margin: 2rem 0;
-}
-
-.comment {
-    color: var(--dim);
-    font-size: 0.9rem;
-    margin-left: 10px;
-}
-
-/* SECTIONS */
-section {
-    margin-bottom: 3rem;
-}
-
-/* LISTS */
-ul {
-    list-style: none;
-}
-
-.link-list li {
-    margin-bottom: 0.8rem;
-    display: flex;
-    align-items: center;
-    gap: 15px;
-}
-
-/* STACK GRID */
-.grid-2 {
-    display: grid;
-    grid-template-columns: 1fr 1fr;
-    gap: 2rem;
-}
-
-.skill-item {
-    display: flex;
-    justify-content: space-between;
-    margin-bottom: 0.5rem;
-}
-
-.level {
-    font-weight: bold;
-}
-
-.special .level {
-    color: var(--text-color);
-    text-shadow: 1px 0 0 red, -1px 0 0 blue; 
-}
-
-/* my dudes */
-.team-grid {
-    display: flex;
-    gap: 2rem;
-    flex-wrap: wrap;
-    margin-top: 1rem;
-}
-
-.member {
-    text-align: center;
-    width: 100px;
-}
-
-.avatar {
-    width: 80px;
-    height: 80px;
-    background-color: #222;
-    border: 2px solid var(--text-color);
-    margin: 0 auto 10px auto;
-    background-size: cover;
-}
-
-/* if no avatar added: */
-.placeholder::before {
-    content: "?";
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    height: 100%;
-    font-size: 2rem;
-    color: var(--dim);
-}
-
-/* REPOS */
-.repo-list li {
-    margin-bottom: 1rem;
-}
-
-/* FOOTER */
-footer {
-    text-align: center;
-    color: var(--dim);
-    font-size: 0.8rem;
-/* flag{why-are-you-here?} */
-    margin-top: 4rem;
-}
-/* SMTH RESPONSIVE */
-@media (max-width: 600px) {
-    .grid-2 {
-        grid-template-columns: 1fr;
-        gap: 0;
-    }
-}
-    </style>
-</head>
-
-<body>
-
-    <div class="container">
-        <header>
-            <h1 class="glitch" data-text="504">504</h1>
-            <p class="subtitle">> Gateway Timeout / System Failure.</p>
-        </header>
-
-        <hr>
-
-        <section id="message">
-            <h2>./error_message</h2>
-            <p>The server did not receive a timely response from the upstream server.</p>
-            <br>
-            <p>Check the <a href="https://status.forust.xyz">System Status</a> for more information.</p>
-        </section>
-
-        <footer>
-            <p>root@error:~$ timeout 30s curl upstream</p>
-            <p>curl: (28) Operation timed out after 30001 milliseconds with 0 bytes received</p>
-            <p>&copy; XRock - Just Signal.</p>
-        </footer>
-    </div>
-
-</body>
-
-</html>

gitea/.env.example

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

gitea/compose.yaml

@@ -1,8 +1,7 @@
 services:
   server:
-    image: docker.gitea.com/gitea:1.26
+    image: docker.gitea.com/gitea:1.25.1
     container_name: gitea
-    restart: always
     environment:
       - USER_UID=1000
       - USER_GID=1000
@@ -14,48 +13,45 @@ 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
+    restart: always
-      - GITEA__mailer__ENABLED=true
+    networks:
-      - GITEA__mailer__FROM=${SERVICE_EMAIL}
+      - gitea-db
-      - GITEA__mailer__SMTP_ADDR=${MAILER_ADDR}:465
+      - traefik-proxy
-      - 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
     volumes:
       - ./gitea-data:/data
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
     labels:
       - "traefik.enable=true"
-      - "traefik.http.services.gitea.loadbalancer.server.port=3000"
+      - "traefik.docker.network=traefik-proxy"
 
       # Prod Router
       - "traefik.http.routers.gitea.rule=Host(`gitea.forust.xyz`)"
       - "traefik.http.routers.gitea.entrypoints=websecure"
+      - "traefik.http.routers.gitea.middlewares=security-headers@file"
+      - "traefik.http.routers.gitea.service=gitea"
       - "traefik.http.routers.gitea.tls=true"
+      - "traefik.http.services.gitea.loadbalancer.server.port=3000"
+
       # Local Router
-      - "traefik.http.routers.gitea-local.rule=Host(`gitea.workstation.internal`)"
+      - "traefik.http.routers.gitea-local.rule=Host(`gitea.workstation.internal`) || Host(`gitea.internal`)"
       - "traefik.http.routers.gitea-local.entrypoints=websecure"
+      - "traefik.http.routers.gitea-local.middlewares=security-headers@file"
+      - "traefik.http.routers.gitea-local.service=gitea"
       - "traefik.http.routers.gitea-local.tls=true"
+
       # Dev Router
       - "traefik.http.routers.gitea-dev.rule=Host(`gitea.gigaforust.internal`)"
       - "traefik.http.routers.gitea-dev.entrypoints=websecure"
+      - "traefik.http.routers.gitea-dev.middlewares=security-headers@file"
+      - "traefik.http.routers.gitea-dev.service=gitea"
       - "traefik.http.routers.gitea-dev.tls=true"
-      # SSH Router
-      - "traefik.tcp.services.gitea.loadbalancer.server.port=22"
-      - "traefik.tcp.routers.gitea.entrypoints=ssh"
-      - "traefik.tcp.routers.gitea.rule=HostSNI(`*`)"
     ports:
       - "2221:22"
-    networks:
-      - gitea-db
-      - proxy
     depends_on:
       - db
+
   db:
     image: docker.io/library/postgres:14
     restart: always
@@ -63,12 +59,13 @@ services:
       - POSTGRES_USER=gitea
       - POSTGRES_PASSWORD=gitea
       - POSTGRES_DB=gitea
-    volumes:
-      - ./gitea-db/:/var/lib/postgresql/data
     networks:
       - gitea-db
+    volumes:
+      - ./gitea-db/:/var/lib/postgresql/data
+
 networks:
   gitea-db:
     external: false
-  proxy:
+  traefik-proxy:
     external: true

glance/compose.yaml

@@ -11,23 +11,30 @@ services:
     env_file: .env
     labels:
       - "traefik.enable=true"
-      - "traefik.docker.network=proxy"
+      - "traefik.docker.network=traefik-proxy"
-      - "traefik.services.glance.loadbalancer.server.port=8080"
 
       # Prod Router
       - "traefik.http.routers.glance.rule=Host(`glance.forust.xyz`)"
       - "traefik.http.routers.glance.entrypoints=websecure"
+      - "traefik.http.routers.glance.middlewares=security-chain@file"
       - "traefik.http.routers.glance.tls=true"
+
       # Local Router
-      - "traefik.http.routers.glance-local.rule=Host(`glance.workstation.internal`)"
+      - "traefik.http.routers.glance-local.rule=Host(`glance.workstation.internal`) || Host(`glance.internal`)"
       - "traefik.http.routers.glance-local.entrypoints=websecure"
+      - "traefik.http.routers.glance-local.middlewares=security-headers@file"
       - "traefik.http.routers.glance-local.tls=true"
+
       # Dev Router
       - "traefik.http.routers.glance-dev.rule=Host(`glance.gigaforust.internal`)"
       - "traefik.http.routers.glance-dev.entrypoints=websecure"
+      - "traefik.http.routers.glance-dev.middlewares=security-chain@file"
       - "traefik.http.routers.glance-dev.tls=true"
     networks:
-      - proxy
+      - traefik-proxy
+    dns:
+      - 1.1.1.1
+      - 8.8.8.8
 networks:
-  proxy:
+  traefik-proxy:
     external: true

headscale/compose.yaml

@@ -1,93 +0,0 @@
-services:
-  headscale:
-    image: headscale/headscale:latest
-    restart: unless-stopped
-    container_name: headscale-server
-    command: serve
-    networks:
-      - proxy
-    volumes:
-      - ./config/headscale.yaml:/etc/headscale/config.yaml
-      - data:/var/lib/headscale
-      - ./config/policy.json:/var/lib/headscale/policy.json
-    labels:
-      - "me.tale.headplane.target: headscale"
-      - "traefik.enable=true"
-      - "traefik.http.services.headscale.loadbalancer.server.port=8080"
-      - "traefik.http.services.headscale-metrics.loadbalancer.server.port=9090"
-
-      ## SERVICE
-      # Prod Router
-      - "traefik.http.routers.headscale.rule=Host(`hs.forust.xyz`)"
-      - "traefik.http.routers.headscale.entrypoints=websecure"
-      - "traefik.http.routers.headscale.service=headscale"
-      - "traefik.http.routers.headscale.tls=true"
-      # Local Router
-      - "traefik.http.routers.headscale-local.rule=Host(`hs.workstation.internal`)"
-      - "traefik.http.routers.headscale-local.entrypoints=websecure"
-      - "traefik.http.routers.headscale-local.service=headscale"
-      - "traefik.http.routers.headscale-local.tls=true"
-      # Dev Router
-      - "traefik.http.routers.headscale-dev.rule=Host(`hs.gigaforust.internal`)"
-      - "traefik.http.routers.headscale-dev.entrypoints=websecure"
-      - "traefik.http.routers.headscale-dev.service=headscale"
-      - "traefik.http.routers.headscale-dev.tls=true"
-
-      ## METRICS
-      # Prod Router
-      - "traefik.http.routers.headscale-metrics.rule=Host(`hs.forust.xyz`) && PathPrefix(`/metrics`)"
-      - "traefik.http.routers.headscale-metrics.entrypoints=websecure"
-      - "traefik.http.routers.headscale-metrics.service=headscale-metrics"
-      - "traefik.http.routers.headscale-metrics.tls=true"
-      # Local Router
-      - "traefik.http.routers.headscale-metrics-local.rule=Host(`hs.workstation.internal`) && PathPrefix(`/metrics`)"
-      - "traefik.http.routers.headscale-metrics-local.entrypoints=websecure"
-      - "traefik.http.routers.headscale-metrics-local.service=headscale-metrics"
-      - "traefik.http.routers.headscale-metrics-local.tls=true"
-      # Dev Router
-      - "traefik.http.routers.headscale-metrics-dev.rule=Host(`hs.gigaforust.internal`) && PathPrefix(`/metrics`)"
-      - "traefik.http.routers.headscale-metrics-dev.entrypoints=websecure"
-      - "traefik.http.routers.headscale-metrics-dev.service=headscale-metrics"
-      - "traefik.http.routers.headscale-metrics-dev.tls=true"
-  headplane:
-    image: ghcr.io/tale/headplane:latest
-    container_name: headplane
-    restart: unless-stopped
-    ports:
-      - '3000:3000'
-    volumes:
-      - ./config/headplane.yaml:/etc/headplane/config.yaml
-      - ./config/headscale.yaml:/etc/headscale/config.yaml
-      - headplane-data:/var/lib/headplane
-      - /var/run/docker.sock:/var/run/docker.sock:ro
-    networks:
-      - proxy
-  web:
-    image: goodieshq/headscale-admin:latest
-    restart: unless-stopped
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.services.headscale-ui.loadbalancer.server.port=80"
-
-      # Prod Router
-      - "traefik.http.routers.headscale-ui.rule=Host(`hs.forust.xyz`) && PathPrefix(`/admin`)"
-      - "traefik.http.routers.headscale-ui.entrypoints=websecure"
-      - "traefik.http.routers.headscale-ui.middlewares=security-chain@file"
-      - "traefik.http.routers.headscale-ui.tls=true"
-      # Local Router
-      - "traefik.http.routers.headscale-ui-local.rule=Host(`hs.workstation.internal`) && PathPrefix(`/admin`)"
-      - "traefik.http.routers.headscale-ui-local.entrypoints=websecure"
-      - "traefik.http.routers.headscale-ui-local.tls=true"
-      # Dev Router
-      - "traefik.http.routers.headscale-ui-dev.rule=Host(`hs.gigaforust.internal`) && PathPrefix(`/admin`)"
-      - "traefik.http.routers.headscale-ui-dev.entrypoints=websecure"
-      - "traefik.http.routers.headscale-ui-dev.tls=true"
-    networks:
-      - proxy
-volumes:
-  data:
-  headplane-data:
-    name: headplane_data
-networks:
-  proxy:
-    external: true

headscale/config/headplane.yaml.example

@@ -1,221 +0,0 @@
-# Configuration for the Headplane server and web application
-server:
-  # These are the default values, change them as needed
-  host: "0.0.0.0"
-  port: 3000
-  # Should not include the dashboard prefix (/admin) portion.
-  # # Prod server_url
-  # base_url: https://hs.forust.xyz
-  # # Local base_url
-  # base_url: https://hs.workstation.internal
-  # # Dev base_url
-  # base_url: https://hs.gigaforust.internal
-
-  # You may provide `cookie_secret_path` instead to read a value from disk.
-  # See https://headplane.net/configuration/#sensitive-values
-  cookie_secret: "<change_me_to_something_secure!>"
-
-  # Whether cookies should be marked as Secure
-  # * Should be false if running without HTTPs
-  # * Should be true if running behind a reverse proxy with HTTPs
-  cookie_secure: true
-  # The maximum age of the session cookie in seconds
-  cookie_max_age: 86400 # 1 day in seconds
-
-  # This is not required, but if you want to restrict the cookie
-  # to a specific domain, set it here. Otherwise leave it commented out.
-  # This may not work as expected if not using a reverse proxy.
-  # cookie_domain: ""
-
-  # The path to persist Headplane specific data. All data going forward
-  # is stored in this directory, including the internal database and
-  # any cache related files.
-  data_path: "/var/lib/headplane"
-
-  # The info secret is optional and allows access to certain debug endpoints
-  # that may expose sensitive information about your Headplane instance.
-  #
-  # As of now, this protects the /api/info endpoint which exposes details about
-  # the Headplane and Headscale versions in use. In the future, more endpoints
-  # may be protected by this secret.
-  #
-  # If not set, these endpoints will be disabled.
-  # info_secret: "<change_me_to_something_secure!>"
-
-# Headscale specific settings to allow Headplane to talk
-# to Headscale and access deep integration features
-headscale:
-  # The URL to your Headscale instance
-  # (All API requests are routed through this URL)
-  # (THIS IS NOT the gRPC endpoint, but the HTTP endpoint)
-  #
-  # IMPORTANT: If you are using TLS this MUST be set to `https://`
-  url: "http://headscale-server:8080"
-
-  # If you use the TLS configuration in Headscale, and you are not using
-  # Let's Encrypt for your certificate, pass in the path to the certificate.
-  # (This has no effect if `url` does not start with `https://`)
-  # tls_cert_path: "/var/lib/headplane/tls.crt"
-
-  # Optional, public URL if its different from the `headscale.url`
-  # This affects certain parts of the web UI which shows Headscale's URL
-  public_url: "https://headscale.example.com"
-
-  # Path to the Headscale configuration file
-  # This is optional, but HIGHLY recommended for the best experience
-  # If this is read only, Headplane will show your configuration settings
-  # in the Web UI, but they cannot be changed.
-  config_path: "/etc/headscale/config.yaml"
-
-  # Whether the Headscale configuration should be strictly validated
-  # when reading from `config_path`. If true, Headplane will not interact
-  # with Headscale if there are any issues with the configuration file.
-  #
-  # This is recommended to be true for production deployments to, however it
-  # may not work if you are using a version of Headscale that has configuration
-  # options unknown to Headplane.
-  config_strict: true
-
-  # If you are using `dns.extra_records_path` in your Headscale
-  # configuration, you need to set this to the path for Headplane
-  # to be able to read the DNS records.
-  #
-  # Pass it in if using Docker and ensure that the file is both
-  # readable and writable to the Headplane process.
-  # When using this, Headplane will no longer need to automatically
-  # restart Headscale for DNS record changes.
-  # dns_records_path: "/var/lib/headscale/extra_records.json"
-
-# Integration configurations for Headplane to interact with Headscale
-integration:
-  # The Headplane agent allows retrieving information about nodes
-  # This allows the UI to display version, OS, and connectivity data
-  # You will see the Headplane agent in your Tailnet as a node when
-  # it connects.
-  agent:
-    enabled: false
-
-    # To connect to your Tailnet, you need to generate a pre-auth key
-    # This can be done via the web UI or through the `headscale` CLI.
-    pre_authkey: "<your-preauth-key>"
-
-    # Optionally change the name of the agent in the Tailnet.
-    # host_name: "headplane-agent"
-
-    # Configure different caching settings. By default, the agent will store
-    # caches in the path below for a maximum of 1 minute. If you want data
-    # to update faster, reduce the TTL, but this will increase the frequency
-    # of requests to Headscale.
-    # cache_ttl: 60
-    # cache_path: /var/lib/headplane/agent_cache.json
-
-    # The work_dir represents where the agent will store its data to be able
-    # to automatically reauthenticate with your Tailnet. It needs to be
-    # writable by the user running the Headplane process.
-    #
-    # If using Docker, it is best to leave this as the default.
-    # work_dir: "/var/lib/headplane/agent"
-
-  # Only one of these should be enabled at a time or you will get errors
-  # This does not include the agent integration (above), which can be enabled
-  # at the same time as any of these and is recommended for the best experience.
-  docker:
-    enabled: true
-
-    # By default we check for the presence of a container label (see the docs)
-    # to determine the container to signal when changes are made to DNS settings.
-    container_label: "me.tale.headplane.target=headscale"
-
-    # HOWEVER, you can fallback to a container name if you desire, but this is
-    # not recommended as its brittle and doesn't work with orchestrators that
-    # automatically assign container names.
-    #
-    # If `container_name` is set, it will override any label checks.
-    # container_name: "headscale-server"
-
-    # The path to the Docker socket (do not change this if you are unsure)
-    # Docker socket paths must start with unix:// or tcp:// and at the moment
-    # https connections are not supported.
-    socket: "unix:///var/run/docker.sock"
-
-  # Please refer to docs/integration/Kubernetes.md for more information
-  # on how to configure the Kubernetes integration. There are requirements in
-  # order to allow Headscale to be controlled by Headplane in a cluster.
-  kubernetes:
-    enabled: false
-    # Validates the manifest for the Pod to ensure all of the criteria
-    # are set correctly. Turn this off if you are having issues with
-    # shareProcessNamespace not being validated correctly.
-    validate_manifest: true
-    # This should be the name of the Pod running Headscale and Headplane.
-    # If this isn't static you should be using the Kubernetes Downward API
-    # to set this value (refer to docs/Integrated-Mode.md for more info).
-    pod_name: "headscale"
-
-  # Proc is the "Native" integration that only works when Headscale and
-  # Headplane are running outside of a container. There is no configuration,
-  # but you need to ensure that the Headplane process can terminate the
-  # Headscale process.
-  #
-  # (If they are both running under systemd as sudo, this will work).
-  proc:
-    enabled: false
-
-# OIDC Configuration for simpler authentication
-# (This is optional, but recommended for the best experience)
-# oidc:
-# The OIDC issuer URL
-# issuer: "https://accounts.google.com"
-
-# If you are using OIDC, you need to generate an API key
-# that can be used to authenticate other sessions when signing in.
-#
-# This can be done with `headscale apikeys create --expiration 999d`
-# headscale_api_key: "<your-headscale-api-key>"
-
-# If your OIDC provider does not support discovery (does not have the URL at
-# `/.well-known/openid-configuration`), you need to manually set endpoints.
-# This also works to override endpoints if you so desire or if your OIDC
-# discovery is missing certain endpoints (ie GitHub).
-# For some typical providers, see https://headplane.net/features/sso.
-# authorization_endpoint: ""
-# token_endpoint: ""
-# userinfo_endpoint: ""
-
-# The authentication method to use when communicating with the token endpoint.
-# This is fully optional and Headplane will attempt to auto-detect the best
-# method and fall back to `client_secret_basic` if unsure.
-# token_endpoint_auth_method: "client_secret_post"
-
-# The client ID for the OIDC client
-# For the best experience please ensure this is *identical* to the client_id
-# you are using for Headscale. because
-# client_id: "your-client-id"
-
-# The client secret for the OIDC client
-# You may also provide `client_secret_path` instead to read a value from disk.
-# See https://headplane.net/configuration/#sensitive-values
-# client_secret: "<your-client-secret>"
-
-# Whether to use PKCE when authenticating users. This is recommended as it
-# adds an extra layer of security to the authentication process. Enabling this
-# means your OIDC provider must support PKCE and it must be enabled on the
-# client.
-# use_pkce: true
-
-# If you want to disable traditional login via Headscale API keys
-# disable_api_key_login: false
-
-# By default profile pictures are pulled from the OIDC provider when
-# we go to fetch the userinfo endpoint. Optionally, this can be set to
-# "oidc" or "gravatar" as of 0.6.1.
-# profile_picture_source: "gravatar"
-
-# The scopes to request when authenticating users. The default is below.
-# scope: "openid email profile"
-
-# Extra query parameters can be passed to the authorization endpoint
-# by setting them here. This is useful for providers that require any kind
-# of custom hinting.
-# extra_params:
-#   prompt: "select_account" # Example: force account selection on Google

headscale/config/headscale.yaml.example

@@ -1,79 +0,0 @@
-# https://wiki.serversatho.me/en/headscale
-
-# # Prod server_url
-# server_url: https://hs.example.com
-# # Local server_url
-# server_url: https://hs.internal_domain.internal
-# # Dev server_url
-# server_url: https://hs.dev_internal_domain.internal
-listen_addr: 0.0.0.0:8080
-metrics_listen_addr: 127.0.0.1:9090
-grpc_listen_addr: 127.0.0.1:50443
-grpc_allow_insecure: false
-noise:
-  private_key_path: /var/lib/headscale/noise_private.key
-prefixes:
-  v4: 100.64.0.0/10
-  v6: fd7a:115c:a1e0::/48
-  allocation: sequential
-derp:
-  server:
-    enabled: true
-    region_id: 999
-    region_code: "headscale"
-    region_name: "Headscale Embedded DERP"
-    stun_listen_addr: "0.0.0.0:3478"
-    private_key_path: /var/lib/headscale/derp_server_private.key
-    automatically_add_embedded_derp_region: true
-    ipv4: 1.2.3.4
-    ipv6: 2001:db8::1
-  urls:
-    - https://controlplane.tailscale.com/derpmap/default
-  paths: []
-  auto_update_enabled: true
-  update_frequency: 24h
-disable_check_updates: false
-ephemeral_node_inactivity_timeout: 30m
-database:
-  type: sqlite
-  debug: false
-  gorm:
-    prepare_stmt: true
-    parameterized_queries: true
-    skip_err_record_not_found: true
-    slow_threshold: 1000
-  sqlite:
-    path: /var/lib/headscale/db.sqlite
-    write_ahead_log: true
-    wal_autocheckpoint: 1000
-acme_url: https://acme-v02.api.letsencrypt.org/directory
-acme_email: ""
-tls_letsencrypt_hostname: ""
-tls_letsencrypt_cache_dir: /var/lib/headscale/cache
-tls_letsencrypt_challenge_type: HTTP-01
-tls_letsencrypt_listen: ":http"
-tls_cert_path: ""
-tls_key_path: ""
-log:
-  format: text
-  level: info
-policy:
-  mode: database
-  path: ""
-dns:
-  magic_dns: true
-  base_domain: example.com
-  nameservers:
-    global:
-      - 1.1.1.1
-      - 1.0.0.1
-      - 2606:4700:4700::1111
-      - 2606:4700:4700::1001
-    split: {}
-  search_domains: []
-  extra_records: []
-unix_socket: /var/run/headscale/headscale.sock
-unix_socket_permission: "0770"
-logtail:
-  enabled: false
-randomize_client_port: false

headscale/config/policy.json.example

@@ -1,26 +0,0 @@
-{
-    "groups": {
-        "group:admin": [
-            "admin@"
-        ],
-        "group:users": []
-    },
-    "tagOwners": {},
-    "hosts": {},
-    "acls": [
-        {
-            "#ha-meta": {
-                "name": "users",
-                "open": true
-            },
-            "action": "accept",
-            "src": [
-                "autogroup:member"
-            ],
-            "dst": [
-                "autogroup:self:*"
-            ]
-        }
-    ],
-    "ssh": []
-}

homepages/compose.yaml

@@ -3,57 +3,81 @@ services:
     build:
       context: .
       dockerfile: Dockerfile.forust
-    # ports:
+    ports:
-    #   - "8085:80"
+      - "8085:80"
     restart: unless-stopped
     volumes:
       - ./forust_files:/usr/share/nginx/html
     networks:
-      - proxy
+      - traefik-proxy
     labels:
       - "traefik.enable=true"
+      - "traefik.docker.network=traefik-proxy"
+
+      # Services
       - "traefik.http.services.forust-homepage.loadbalancer.server.port=80"
 
       # Prod Router
       - "traefik.http.routers.forust-homepage.rule=Host(`forust.xyz`)"
       - "traefik.http.routers.forust-homepage.entrypoints=websecure"
+      - "traefik.http.routers.forust-homepage.middlewares=security-headers@file"
+      - "traefik.http.routers.forust-homepage.service=forust-homepage"
       - "traefik.http.routers.forust-homepage.tls=true"
+
       # Local Router
-      - "traefik.http.routers.forust-homepage-local.rule=Host(`landing.workstation.internal`)"
+      - "traefik.http.routers.forust-homepage-local.rule=Host(`landing.workstation.internal`) || Host(`landing.internal`)"
       - "traefik.http.routers.forust-homepage-local.entrypoints=websecure"
+      - "traefik.http.routers.forust-homepage-local.middlewares=security-headers@file"
+      - "traefik.http.routers.forust-homepage-local.service=forust-homepage"
       - "traefik.http.routers.forust-homepage-local.tls=true"
+
       # Dev Router
       - "traefik.http.routers.forust-homepage-dev.rule=Host(`landing.gigaforust.internal`)"
       - "traefik.http.routers.forust-homepage-dev.entrypoints=websecure"
+      - "traefik.http.routers.forust-homepage-dev.middlewares=security-headers@file"
+      - "traefik.http.routers.forust-homepage-dev.service=forust-homepage"
       - "traefik.http.routers.forust-homepage-dev.tls=true"
+
   xdfnx:
     build:
       context: .
       dockerfile: Dockerfile.xdfnx
+    ports:
+      - "8086:80"
     restart: unless-stopped
-    # ports:
-    #   - "8086:80"
     volumes:
       - ./xdfnx_files:/usr/share/nginx/html
+    networks:
+      - traefik-proxy
     labels:
       - "traefik.enable=true"
+      - "traefik.docker.network=traefik-proxy"
+      
+      # Services
       - "traefik.http.services.xdfnx-homepage.loadbalancer.server.port=80"
 
       # Prod Router
       - "traefik.http.routers.xdfnx.rule=Host(`xdfnx.cfd`)"
       - "traefik.http.routers.xdfnx.entrypoints=websecure"
-      - "traefik.http.routers.xdfnx.tls.certresolver=letsencrypt" 
+      - "traefik.http.routers.xdfnx.middlewares=security-headers@file"
+      - "traefik.http.routers.xdfnx.service=xdfnx-homepage"
       - "traefik.http.routers.xdfnx.tls=true"
+
       # Local Router
-      - "traefik.http.routers.xdfnx-local.rule=Host(`xdfnx.workstation.internal`)"
+      - "traefik.http.routers.xdfnx-local.rule=Host(`xdfnx.workstation.internal`) || Host(`xdfnx.internal`)"
       - "traefik.http.routers.xdfnx-local.entrypoints=websecure"
+      - "traefik.http.routers.xdfnx-local.middlewares=security-headers@file"
+      - "traefik.http.routers.xdfnx-local.service=xdfnx-homepage"
       - "traefik.http.routers.xdfnx-local.tls=true"
+
       # Dev Router
       - "traefik.http.routers.xdfnx-dev.rule=Host(`xdfnx.gigaforust.internal`)"
       - "traefik.http.routers.xdfnx-dev.entrypoints=websecure"
+      - "traefik.http.routers.xdfnx-dev.middlewares=security-headers@file"
+      - "traefik.http.routers.xdfnx-dev.service=xdfnx-homepage"
       - "traefik.http.routers.xdfnx-dev.tls=true"
-    networks:
+
-      - proxy
+
 networks:
-  proxy:
+  traefik-proxy:
     external: true

homepages/forust_files/assets/css/style.css

@@ -109,7 +109,7 @@ ul {
 
 .special .level {
     color: var(--text-color);
-    text-shadow: 1px 0 0 red, -1px 0 0 blue; 
+    text-shadow: 1px 0 0 red, -1px 0 0 blue;
 }
 
 /* my dudes */
@@ -134,6 +134,7 @@ ul {
     background-size: cover;
 }
 
+
 /* if no avatar added: */
 .placeholder::before {
     content: "?";
@@ -155,13 +156,22 @@ footer {
     text-align: center;
     color: var(--dim);
     font-size: 0.8rem;
-/* flag{why-are-you-here?} */
+    /* flag{why-are-you-here?} */
     margin-top: 4rem;
 }
+
 /* SMTH RESPONSIVE */
 @media (max-width: 600px) {
     .grid-2 {
         grid-template-columns: 1fr;
         gap: 0;
     }
+}
+
+/* nya~ */
+.birthday {
+    color: var(--dim);
+    font-size: 0.75rem;
+    margin-top: 4px;
+    opacity: 0.75;
 }

homepages/forust_files/index.html

@@ -41,14 +41,7 @@
                 </li>
                 <li>
                     <i class="fas fa-envelope"></i>
-                    <a href="mailto:contact@forust.xyz">mail/contact@forust.xyz</a>
+                    <a href="mailto:forust@forust.xyz">forust@forust.xyz</a>
-                </li>
-                <li>
-                    <i class="fa-solid fa-key"></i>
-                    <a href=".well-known/pgp-key.asc">security/PGP Key</a>
-                </li>
-                <li>
-                    <p class="comment"># PGP Key Fingerprint: A777 7CB7 D9C4 0A97 443D CCF0 7A3D A455 F820 5B82</p>
                 </li>
             </ul>
         </section>
@@ -116,7 +109,7 @@
                     <div class="avatar"
                         style="background-image: url('assets/images/team/anna.jpg'); background-size: cover; background-position: center;">
                     </div>
-                    <a href="./assets/images/love.png" target="_blank">Anna~</a>
+                    <a href="" target="_blank">Anna~</a>
                 </div>
 
                 <div class="member">
@@ -126,6 +119,14 @@
                     <a href="https://chernuha.space" target="_blank">Chernuha</a>
                 </div>
 
+                <div class="member">
+                    <div class="avatar"
+                        style="background-image: url('assets/images/team/vv.jpg'); background-size: cover; background-position: center;">
+                    </div>
+                    <a href="./miku.html" target="_blank">vv</a>
+                    <p class="birthday">Happy Birthday, darling ♡</p>
+                </div>
+
                 <div class="member">
                     <div class="avatar"
                         style="background-image: url('assets/images/team/hudan.jpg'); background-size: cover; background-position: center;">

incident-archive/Overlay FS failure.md

@@ -1,54 +0,0 @@
-# Resolved: Overlay FS failure (and so containers)
-
-15-12-2025 03:02 AM EET: Degraded control panels' performances, following by full cascade docker failure
-
-15-12-2025 04:36 AM EET: Identified: Services are terminated due to server software (Overlay FS) + hardware issues (HDD).
-
-15-12-2025 08:45 PM EET: Restored NextCloud service with few tweaks to lower I/O
-
----
-
-16-12-2025 08:34 PM EET: Ordered new HDD, ETA 22nd of December - 2nd of January
-
----
-
-17-12-2025 02:47 AM EET: To avoid additional I/O into kuma's database, disabled uptime monitoring for non-critical services, such as:
-
-- Game servers
-- Gitea (no public projects being hosted yet)
-- Landings
-- Cloud services
-- PenPot
-- Auth provider
-- Secondary management tools
-- Chernuha's non-important infrastructure
-
-These can be identified by seeing ">2m ago" under monitor's heartbeats.
-
----
-
-09-01-2026 02:32 PM EET: NextCloud's frontend files are corrupted due to the unknown issue. All user data is integrity-verified. To prevent user data corruption, NextCloud service will be restored after new hardware will be available.
-
----
-
-14-01-2026 08:42 PM EET: After planned updating and restarting server, critical firmware software were corrupted because of physical degradation of the disk. Server inaccessible in any way
-
----
-
-15-01-2026 11:30 AM EET: A new NAS-Grade HDD (Seagate IronWolf Pro) was ordered. ETA 16-01-2026 EET Before 12:00 PM
-
----
-
-16-01-2026 12:47 AM EET: New server system is installed, data backed up. Experiencing docker memory leak.
-
----
-
-17-01-2026 01:27 PM EET: All services except NextCloud and Satisfactory server are online.
-
-17-01-2026 03:48 PM EET: Nextcloud is online. Satisfactory will be provided on-demand. Monitoring status
-
----
-
-##### Status: All services are online
-
-**Solution: moving all infrastructure onto new NAS-Grade HDD with fresh OS install**

kener/.env.example

@@ -1,3 +0,0 @@
-KENER_SECRET_KEY=your_secret_key_here
-ORIGIN=http://localhost:3000
-TZ=Etc/UTC

kener/compose.yaml

@@ -1,59 +0,0 @@
-services:
-  kener:
-    image: rajnandan1/kener:4.0.23
-    container_name: kener
-    restart: unless-stopped
-    # ports:
-    #   - 3000:3000/tcp
-    environment:
-      - KENER_SECRET_KEY=${KENER_SECRET_KEY?Kener requires a secret key}
-      - ORIGIN=${ORIGIN:-http://localhost:3000}
-      - REDIS_URL=redis://redis:6379
-      - TZ:${TZ:-Etc/UTC}
-    depends_on:
-      redis:
-        condition: service_healthy
-    volumes:
-      - db:/app/database
-      - uploads:/app/uploads
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.services.kener.loadbalancer.server.port=3000"
-
-      # Prod Router
-      - "traefik.http.routers.kener.rule=Host(`status.forust.xyz`)"
-      - "traefik.http.routers.kener.entrypoints=websecure"
-      - "traefik.http.routers.kener.tls=true"
-      # Local Router
-      - "traefik.http.routers.kener-local.rule=Host(`status.workstation.internal`)"
-      - "traefik.http.routers.kener-local.entrypoints=websecure"
-      - "traefik.http.routers.kener-local.tls=true"
-      # Dev Router
-      - "traefik.http.routers.kener-dev.rule=Host(`status.gigaforust.internal`)"
-      - "traefik.http.routers.kener-dev.entrypoints=websecure"
-      - "traefik.http.routers.kener-dev.tls=true"
-    networks:
-      - proxy
-      - kener
-  redis:
-    image: redis:7-alpine
-    container_name: kener-redis
-    restart: unless-stopped
-    volumes:
-      - redis:/data
-    healthcheck:
-      test: [ "CMD", "redis-cli", "ping" ]
-      interval: 6s
-      timeout: 5s
-      retries: 5
-    networks:
-      - kener
-volumes:
-  db:
-  uploads:
-  redis:
-networks:
-  proxy:
-    external: true
-  kener:
-    external: false

metube/compose.yaml

@@ -1,7 +1,7 @@
 services:
   metube:
     image: ghcr.io/alexta69/metube
-    container_name: metube
+    # container_name: metube
     restart: unless-stopped
     # ports:
     # - "8081:8081"
@@ -13,24 +13,33 @@ services:
     volumes:
       - ./MeTube_downloads:/downloads
     labels:
-      - "traefik.enable=true"
+      - traefik.enable=true
-      - "traefik.http.services.metube.loadbalancer.server.port=8081"
+      - "traefik.docker.network=traefik-proxy"
 
       # Prod Router
       - "traefik.http.routers.metube.rule=Host(`metube.forust.xyz`)"
       - "traefik.http.routers.metube.entrypoints=websecure"
       - "traefik.http.routers.metube.middlewares=security-chain@file"
+      - "traefik.http.routers.metube.service=metube"
       - "traefik.http.routers.metube.tls=true"
+      - "traefik.http.services.metube.loadbalancer.server.port=8081"
+
       # Local Router
-      - "traefik.http.routers.metube-local.rule=Host(`metube.workstation.internal`)"
+      - "traefik.http.routers.metube-local.rule=Host(`metube.workstation.internal`) || Host(`metube.internal`)"
       - "traefik.http.routers.metube-local.entrypoints=websecure"
+      - "traefik.http.routers.metube-local.middlewares=security-headers@file"
+      - "traefik.http.routers.metube-local.service=metube"
       - "traefik.http.routers.metube-local.tls=true"
+
       # Dev Router
       - "traefik.http.routers.metube-dev.rule=Host(`metube.gigaforust.internal`)"
       - "traefik.http.routers.metube-dev.entrypoints=websecure"
+      - "traefik.http.routers.metube-dev.middlewares=security-chain@file"
+      - "traefik.http.routers.metube-dev.service=metube"
       - "traefik.http.routers.metube-dev.tls=true"
+
     networks:
-      - proxy
+      - traefik-proxy
 networks:
-  proxy:
+  traefik-proxy:
     external: true

n8n/compose.yaml

@@ -13,8 +13,8 @@ services:
       - N8N_SECURE_COOKIE=false
       - N8N_COMMUNITY_PACKAGES_ALLOW_TOOL_USAGE=true
     volumes:
-      - node-data:/home/node/.n8n
+      - ./n8n-node-data:/home/node/.n8n
-      - files:/files
+      - ./n8n-files:/files
     extra_hosts:
       - "enterprise.n8n.io:104.26.13.187"
       - "enterprise.n8n.io:104.26.12.187"
@@ -23,23 +23,32 @@ services:
       - 1.1.1.1
       - 8.8.8.8
     networks:
-      - proxy
+      - traefik-proxy
       - n8n
     labels:
       - "traefik.enable=true"
-      - "traefik.http.services.n8n.loadbalancer.server.port=5678"
+      - "traefik.docker.network=traefik-proxy"
 
       # Prod Router
       - "traefik.http.routers.n8n.rule=Host(`n8n.forust.xyz`)"
       - "traefik.http.routers.n8n.entrypoints=websecure"
+      - "traefik.http.routers.n8n.middlewares=security-headers@file"
+      - "traefik.http.routers.n8n.service=n8n"
       - "traefik.http.routers.n8n.tls=true"
+      - "traefik.http.services.n8n.loadbalancer.server.port=5678"
+
       # Local Router
-      - "traefik.http.routers.n8n-local.rule=Host(`n8n.workstation.internal`)"
+      - "traefik.http.routers.n8n-local.rule=Host(`n8n.workstation.internal`) || Host(`n8n.internal`)"
       - "traefik.http.routers.n8n-local.entrypoints=websecure"
+      - "traefik.http.routers.n8n-local.middlewares=security-headers@file"
+      - "traefik.http.routers.n8n-local.service=n8n"
       - "traefik.http.routers.n8n-local.tls=true"
+
       # Dev Router
       - "traefik.http.routers.n8n-dev.rule=Host(`n8n.gigaforust.internal`)"
       - "traefik.http.routers.n8n-dev.entrypoints=websecure"
+      - "traefik.http.routers.n8n-dev.middlewares=security-headers@file"
+      - "traefik.http.routers.n8n-dev.service=n8n"
       - "traefik.http.routers.n8n-dev.tls=true"
 
       - glance.name=n8n
@@ -49,9 +58,5 @@ services:
 networks:
   n8n:
     external: false
-  proxy:
+  traefik-proxy:
     external: true
-
-volumes:
-  node-data:
-  files:

netronome/.env.example

@@ -1,29 +0,0 @@
-## https://github.com/autobrr/netronome?tab=readme-ov-file#environment-variables
-
-# Server settings
-NETRONOME__HOST=0.0.0.0              # Listen address
-NETRONOME__PORT=7575                 # Web UI port
-NETRONOME__BASE_URL=/netronome                # Base URL for reverse proxy
-
-# Database (SQLite by default)
-NETRONOME__DB_TYPE=postgres            # sqlite or postgres
-NETRONOME__DB_PATH=netronome.db      # SQLite database path
-
-# PostgreSQL (when DB_TYPE=postgres)
-NETRONOME__DB_TYPE=postgres
-NETRONOME__DB_HOST=postgres
-NETRONOME__DB_PORT=5432
-NETRONOME__DB_USER=netronome
-NETRONOME__DB_PASSWORD=netronome
-NETRONOME__DB_NAME=netronome
-NETRONOME__DB_SSLMODE=disable
-
-# Authentication
-NETRONOME__AUTH_WHITELIST=127.0.0.1/32,192.168.1.0/24  # IP whitelist (comma-separated)
-NETRONOME__SESSION_SECRET=           # Session secret (auto-generated if empty)
-
-# OIDC (optional)
-NETRONOME__OIDC_ISSUER=https://accounts.google.com
-NETRONOME__OIDC_CLIENT_ID=your-client-id
-NETRONOME__OIDC_CLIENT_SECRET=your-secret
-NETRONOME__OIDC_REDIRECT_URL=https://example.com/api/auth/oidc/callback

netronome/compose.yaml

@@ -1,59 +0,0 @@
-services:
-  netronome:
-    image: ghcr.io/autobrr/netronome:latest
-    restart: unless-stopped
-    container_name: netronome
-    ports:
-      - "7575:7575"
-    cap_add:
-      - NET_RAW
-    env_file:
-      - .env
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.services.netronome.loadbalancer.server.port=7575"
-
-      # Prod Router
-      - "traefik.http.routers.netronome.rule=Host(`nm.forust.xyz`)"
-      - "traefik.http.routers.netronome.entrypoints=websecure"
-      - "traefik.http.routers.netronome.tls=true"
-      # Local Router
-      - "traefik.http.routers.netronome-local.rule=Host(`nm.workstation.internal`)"
-      - "traefik.http.routers.netronome-local.entrypoints=websecure"
-      - "traefik.http.routers.netronome-local.tls=true"
-      # Dev Router
-      - "traefik.http.routers.netronome-dev.rule=Host(`nm.gigaforust.internal`)"
-      - "traefik.http.routers.netronome-dev.entrypoints=websecure"
-      - "traefik.http.routers.netronome-dev.tls=true"
-    networks:
-      - proxy
-      - netronome
-    depends_on:
-      postgres:
-        condition: service_healthy
-  postgres:
-    container_name: netronome-postgres
-    image: postgres:17-alpine
-    environment:
-      - POSTGRES_USER=netronome
-      - POSTGRES_PASSWORD=netronome
-      - POSTGRES_DB=netronome
-    volumes:
-      - data:/var/lib/postgresql/data
-    healthcheck:
-      test: [ "CMD-SHELL", "pg_isready -U netronome" ]
-      interval: 5s
-      timeout: 5s
-      retries: 5
-    restart: unless-stopped
-    networks:
-      - netronome
-volumes:
-  data:
-
-
-networks:
-  proxy:
-    external: true
-  netronome:
-    external: false

nextcloud/compose.yaml

@@ -7,10 +7,9 @@ services:
     volumes:
       - nextcloud_aio_mastercontainer:/mnt/docker-aio-config # Do not change (backup) 
       - /var/run/docker.sock:/var/run/docker.sock:ro
-      - /dev/dri:/dev/dri
     networks:
       - nextcloud-aio
-      - proxy # Optional: Connects the mastercontainer to the proxy network in order to make the built-in reverse proxy detection work. See https://github.com/nextcloud/all-in-one/blob/main/reverse-proxy.md
+      - traefik-proxy # Optional: Connects the mastercontainer to the traefik-proxy network in order to make the built-in reverse proxy detection work. See https://github.com/nextcloud/all-in-one/blob/main/reverse-proxy.md
       # ports:
       # - 8081:80 # may be removed if under reverse-proxy
       # - 8443:8443 
@@ -18,38 +17,49 @@ services:
 
     labels:
       - "traefik.enable=true"
+      - "traefik.docker.network=traefik-proxy"
+
       # AIO Services configuration
       - "traefik.http.services.nextcloud-aio.loadbalancer.server.port=8080"
       - "traefik.http.services.nextcloud-aio.loadbalancer.server.scheme=https"
       - "traefik.http.services.nextcloud-aio.loadbalancer.serverstransport=insecureTransport@file"
 
       # Prod Router
-      # - "traefik.http.routers.nextcloud-aio.rule=Host(`naio.forust.xyz`)"
+      # - "traefik.http.routers.nextcloud-aio.rule=Host(`nextcloud-aio.forust.xyz`)"
       # - "traefik.http.routers.nextcloud-aio.entrypoints=websecure"
-      # - "traefik.http.routers.nextcloud-aio.middlewares=security-chain@file"
+      # - "traefik.http.routers.nextcloud-aio.middlewares=security-headers"
+      # - "traefik.http.routers.nextcloud-aio.service=nextcloud-aio"
       # - "traefik.http.routers.nextcloud-aio.tls=true"
+
       # Local Router
-      - "traefik.http.routers.nextcloud-aio-local.rule=Host(`naio.workstation.internal`)"
+      - "traefik.http.routers.nextcloud-aio-local.rule=Host(`nextcloud-aio.workstation.internal`) || Host(`nextcloud-aio.internal`)"
       - "traefik.http.routers.nextcloud-aio-local.entrypoints=websecure"
+      - "traefik.http.routers.nextcloud-aio-local.middlewares=security-headers@file"
+      - "traefik.http.routers.nextcloud-aio-local.service=nextcloud-aio"
       - "traefik.http.routers.nextcloud-aio-local.tls=true"
+
       # Dev Router
-      - "traefik.http.routers.nextcloud-aio-dev.rule=Host(`naio.gigaforust.internal`)"
+      - "traefik.http.routers.nextcloud-aio-dev.rule=Host(`nextcloud-aio.gigaforust.internal`)"
       - "traefik.http.routers.nextcloud-aio-dev.entrypoints=websecure"
+      - "traefik.http.routers.nextcloud-aio-dev.middlewares=security-headers@file"
+      - "traefik.http.routers.nextcloud-aio-dev.service=nextcloud-aio"
       - "traefik.http.routers.nextcloud-aio-dev.tls=true"
 
-      # Glance Metadata
+      # Glanceapp/glance config
       - glance.name=Nextcloud
+      # - glance.icon=si:nextcloud
       - glance.url=https://nextcloud.forust.xyz/
       - glance.description=Nextcloud is a suite of client-server software for creating and using file hosting services.
+
     environment:
       AIO_DISABLE_BACKUP_SECTION: false
       APACHE_PORT: 11000 # Is needed when running behind a web server or reverse proxy (like Apache, Nginx, Caddy, Cloudflare Tunnel and else). See https://github.com/nextcloud/all-in-one/blob/main/reverse-proxy.md
       APACHE_IP_BINDING: 0.0.0.0 # Configure when going with reverse-proxy https://github.com/nextcloud/all-in-one/blob/main/reverse-proxy.md
-      APACHE_ADDITIONAL_NETWORK: proxy # (Optional) Connect the apache container to an additional docker network. When going with reverse-proxy. See https://github.com/nextcloud/all-in-one/blob/main/reverse-proxy.md
+      APACHE_ADDITIONAL_NETWORK: traefik-proxy # (Optional) Connect the apache container to an additional docker network. When going with reverse-proxy. See https://github.com/nextcloud/all-in-one/blob/main/reverse-proxy.md
       BORG_RETENTION_POLICY: --keep-within=7d --keep-weekly=4 --keep-monthly=6 # Backup retention See https://github.com/nextcloud/all-in-one#how-to-adjust-borgs-retention-policy
       COLLABORA_SECCOMP_DISABLED: false # Setting this to true allows to disable Collabora's Seccomp feature. See https://github.com/nextcloud/all-in-one#how-to-disable-collaboras-seccomp-feature
       FULLTEXTSEARCH_JAVA_OPTIONS: "-Xms1024M -Xmx1024M" # adjust fulltextsearch java options. https://github.com/nextcloud/all-in-one#how-to-adjust-the-fulltextsearch-java-options
-      NEXTCLOUD_DATADIR: /mnt/nextcloud/ncdata # Allows to set the host directory for Nextcloud's datadir. ⚠️⚠️⚠️ Warning: do not set or adjust this value after the initial Nextcloud installation is done! See https://github.com/nextcloud/all-in-one#how-to-change-the-default-location-of-nextclouds-datadir
+      NEXTCLOUD_DATADIR: /media/forust/nextcloud/ncdata # Allows to set the host directory for Nextcloud's datadir. ⚠️⚠️⚠️ Warning: do not set or adjust this value after the initial Nextcloud installation is done! See https://github.com/nextcloud/all-in-one#how-to-change-the-default-location-of-nextclouds-datadir
       NEXTCLOUD_MOUNT: /mnt/ # Allows the Nextcloud container to access the chosen directory on the host. See https://github.com/nextcloud/all-in-one#how-to-allow-the-nextcloud-container-to-access-directories-on-the-host
       NEXTCLOUD_UPLOAD_LIMIT: 16G # https://github.com/nextcloud/all-in-one#how-to-adjust-the-upload-limit-for-nextcloud
       NEXTCLOUD_MAX_TIME: 7200 # Max uploading time See https://github.com/nextcloud/all-in-one#how-to-adjust-the-max-execution-time-for-nextcloud
@@ -58,17 +68,16 @@ services:
       NEXTCLOUD_STARTUP_APPS: deck twofactor_totp tasks calendar contacts notes # Allows to modify the Nextcloud apps that are installed on starting AIO the first time. See https://github.com/nextcloud/all-in-one#how-to-change-the-nextcloud-apps-that-are-installed-on-the-first-startup
       NEXTCLOUD_ADDITIONAL_APKS: imagemagick # This allows to add additional packages to the Nextcloud container permanently. Default is imagemagick but can be overwritten by modifying this value. See https://github.com/nextcloud/all-in-one#how-to-add-os-packages-permanently-to-the-nextcloud-container
       NEXTCLOUD_ADDITIONAL_PHP_EXTENSIONS: imagick # dditional php extensions to the Nextcloud container permanently. Default is imagick but can be overwritten by modifying this value. See https://github.com/nextcloud/all-in-one#how-to-add-php-extensions-permanently-to-the-nextcloud-container
-      # NEXTCLOUD_ENABLE_DRI_DEVICE: true # This allows to enable the /dev/dri device for containers that profit from it. ⚠️⚠️⚠️ Warning: this only works if the '/dev/dri' device is present on the host! If it should not exist on your host, don't set this to true as otherwise the Nextcloud container will fail to start! See https://github.com/nextcloud/all-in-one#how-to-enable-hardware-acceleration-for-nextcloud
+      NEXTCLOUD_ENABLE_DRI_DEVICE: true # This allows to enable the /dev/dri device for containers that profit from it. ⚠️⚠️⚠️ Warning: this only works if the '/dev/dri' device is present on the host! If it should not exist on your host, don't set this to true as otherwise the Nextcloud container will fail to start! See https://github.com/nextcloud/all-in-one#how-to-enable-hardware-acceleration-for-nextcloud
       # NEXTCLOUD_KEEP_DISABLED_APPS: false # Setting this to true will keep Nextcloud apps that are disabled in the AIO interface and not uninstall them if they should be installed. See https://github.com/nextcloud/all-in-one#how-to-keep-disabled-apps
       SKIP_DOMAIN_VALIDATION: true # This should only be set to true if things are correctly configured. See https://github.com/nextcloud/all-in-one?tab=readme-ov-file#how-to-skip-the-domain-validation
       # TALK_PORT: 3478 # This a-llows to adjust the port that the talk container is using which is exposed on the host. See https://github.com/nextcloud/all-in-one#how-to-adjust-the-talk-port
       # WATCHTOWER_DOCKER_SOCKET_PATH: /var/run/docker.sock # Needs to be specified if the docker socket on the host is not located in the default '/var/run/docker.sock'. For macos it needs to be '/var/run/docker.sock'
 
 networks:
-  proxy:
+  traefik-proxy:
     external: true
   nextcloud-aio:
-    name: nextcloud-aio
     driver: bridge
     external: false
 volumes:

penpot/compose.yaml

@@ -50,7 +50,7 @@ x-secret-key: &penpot-secret-key
 
 networks:
   penpot:
-  proxy:
+  traefik-proxy:
     external: true
 
 volumes:
@@ -86,8 +86,8 @@ services:
   penpot-frontend:
     image: "penpotapp/frontend:${PENPOT_VERSION:-latest}"
     restart: always
-    # ports:
+    ports:
-    #   - 9001:8080
+      - 9001:8080
 
     volumes:
       - penpot_assets:/opt/data/assets
@@ -98,26 +98,37 @@ services:
 
     networks:
       - penpot
-      - proxy
+      - traefik-proxy
 
     labels:
       - "traefik.enable=true"
-      - "traefik.http.services.penpot.loadbalancer.server.port=8080"
+      - "traefik.docker.network=traefik-proxy"
 
       # Prod Router
       - "traefik.http.routers.penpot.rule=Host(`penpot.forust.xyz`)"
       - "traefik.http.routers.penpot.entrypoints=websecure"
+      - "traefik.http.routers.penpot.middlewares=security-headers@file"
+      - "traefik.http.routers.penpot.service=penpot"
       - "traefik.http.routers.penpot.tls=true"
+      - "traefik.http.services.penpot.loadbalancer.server.port=8080"
+
       # Local Router
-      - "traefik.http.routers.penpot-local.rule=Host(`penpot.workstation.internal`)"
+      - "traefik.http.routers.penpot-local.rule=Host(`penpot.workstation.internal`) || Host(`penpot.internal`)"
       - "traefik.http.routers.penpot-local.entrypoints=websecure"
+      - "traefik.http.routers.penpot-local.middlewares=security-headers@file"
+      - "traefik.http.routers.penpot-local.service=penpot"
       - "traefik.http.routers.penpot-local.tls=true"
+
       # Dev Router
       - "traefik.http.routers.penpot-dev.rule=Host(`penpot.gigaforust.internal`)"
       - "traefik.http.routers.penpot-dev.entrypoints=websecure"
+      - "traefik.http.routers.penpot-dev.middlewares=security-headers@file"
+      - "traefik.http.routers.penpot-dev.service=penpot"
       - "traefik.http.routers.penpot-dev.tls=true"
+
     environment:
       <<: [ *penpot-flags, *penpot-http-body-size ]
+
   penpot-backend:
     image: "penpotapp/backend:${PENPOT_VERSION:-latest}"
     restart: always

portainer/compose.yaml

@@ -1,39 +1,54 @@
 services:
   portainer:
-    image: portainer/portainer-ce:2.41.0
     container_name: portainer
+    image: portainer/portainer-ce:latest
     restart: always
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
-      - data:/data
+      - ./portainer_data:/data
     ports:
-      - 9000:9000
+      - 9443:9443
       # - 8000:8000  # Remove if you do not intend to use Edge Agents
+    networks:
+      - traefik-proxy
     labels:
       - "traefik.enable=true"
-      - "traefik.http.services.portainer.loadbalancer.server.port=9000"
+      - "traefik.docker.network=traefik-proxy"
 
       # Prod Router
       - "traefik.http.routers.portainer.rule=Host(`portainer.forust.xyz`)"
       - "traefik.http.routers.portainer.entrypoints=websecure"
+      - "traefik.http.routers.portainer.middlewares=security-headers@file"
+      - "traefik.http.routers.portainer.service=portainer"
       - "traefik.http.routers.portainer.tls=true"
+      - "traefik.http.services.portainer.loadbalancer.server.port=9443"
+      - "traefik.http.services.portainer.loadbalancer.server.scheme=https"
+      - "traefik.http.services.portainer.loadbalancer.serverstransport=insecureTransport@file"
+
       # Local Router
-      - "traefik.http.routers.portainer-local.rule=Host(`portainer.workstation.internal`)"
+      - "traefik.http.routers.portainer-local.rule=Host(`portainer.workstation.internal`) || Host(`portainer.internal`)"
       - "traefik.http.routers.portainer-local.entrypoints=websecure"
+      - "traefik.http.routers.portainer-local.middlewares=security-headers@file"
+      - "traefik.http.routers.portainer-local.service=portainer"
       - "traefik.http.routers.portainer-local.tls=true"
+
       # Dev Router
       - "traefik.http.routers.portainer-dev.rule=Host(`portainer.gigaforust.internal`)"
       - "traefik.http.routers.portainer-dev.entrypoints=websecure"
+      - "traefik.http.routers.portainer-dev.middlewares=security-headers@file"
+      - "traefik.http.routers.portainer-dev.service=portainer"
       - "traefik.http.routers.portainer-dev.tls=true"
 
-      # Glance Metadata
       - glance.name=Portainer
       - glance.url=https://portainer.forust.xyz/
       - glance.description=Portainer is a lightweight management UI which allows you to easily manage your Docker environments.
-    networks:
+
-      - proxy
 volumes:
-  data:
+  portainer_data:
+    name: portainer_data
+
 networks:
-  proxy:
+  default:
+    name: portainer_network
+  traefik-proxy:
     external: true

searxng/.env.example

@@ -1,15 +0,0 @@
-# Read the documentation before using the `docker-compose.yml` file:
-# https://docs.searxng.org/admin/installation-docker.html
-#
-# Additional ENVs:
-# https://docs.searxng.org/admin/settings/settings_general.html#settings-general
-# https://docs.searxng.org/admin/settings/settings_server.html#settings-server
-
-# Use a specific version tag. E.g. "latest" or "2026.3.25-541c6c3cb".
-#SEARXNG_VERSION=latest
-
-# Listen to a specific address.
-#SEARXNG_HOST=[::]
-
-# Listen to a specific port.
-SEARXNG_PORT=8080

searxng/compose.yaml

@@ -1,45 +0,0 @@
-# Read the documentation before using the `docker-compose.yml` file:
-# https://docs.searxng.org/admin/installation-docker.html
-services:
-  core:
-    container_name: searxng-core
-    image: docker.io/searxng/searxng:${SEARXNG_VERSION:-latest}
-    restart: unless-stopped
-    # ports:
-      # - ${SEARXNG_PORT:-8080}
-    env_file: .env
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.services.searxng.loadbalancer.server.port=8080"
-      # Prod Router
-      - "traefik.http.routers.searxng.rule=Host(`s.forust.xyz` || `searxng.forust.xyz`)"
-      - "traefik.http.routers.searxng.entrypoints=websecure"
-      - "traefik.http.routers.searxng.tls=true"
-      # Local Router
-      - "traefik.http.routers.searxng-local.rule=Host(`s.workstation.internal` || `searxng.workstation.internal`)"
-      - "traefik.http.routers.searxng-local.entrypoints=websecure"
-      - "traefik.http.routers.searxng-local.tls=true"
-      # Dev Router
-      - "traefik.http.routers.searxng-dev.rule=Host(`searxng.gigaforust.internal`)"
-      - "traefik.http.routers.searxng-dev.entrypoints=websecure"
-      - "traefik.http.routers.searxng-dev.tls=true"
-    networks:
-      - proxy
-    volumes:
-      - ./core-config/:/etc/searxng/:Z
-      - core-data:/var/cache/searxng/
-
-  valkey:
-    container_name: searxng-valkey
-    image: docker.io/valkey/valkey:9-alpine
-    command: valkey-server --save 30 1 --loglevel warning
-    restart: unless-stopped
-    volumes:
-      - valkey-data:/data/
-
-volumes:
-  core-data:
-  valkey-data:
-networks:
-  proxy:
-    external: true

termix/compose.yaml

@@ -3,32 +3,44 @@ services:
     image: ghcr.io/lukegus/termix:latest
     container_name: termix
     restart: unless-stopped
-    # ports:
+    ports:
-    #   - "3331:8080"
+      - "3331:8080"
     volumes:
-      - data:/app/data
+      - ./termix-data:/app/data
     environment:
       PORT: "8080"
     labels:
       - "traefik.enable=true"
-      - "traefik.http.services.termix.loadbalancer.server.port=8080"
+      - "traefik.docker.network=traefik-proxy"
 
       # Prod Router
       - "traefik.http.routers.termix.rule=Host(`termix.forust.xyz`)"
       - "traefik.http.routers.termix.entrypoints=websecure"
+      - "traefik.http.routers.termix.middlewares=security-headers@file"
+      - "traefik.http.routers.termix.service=termix"
       - "traefik.http.routers.termix.tls=true"
+      - "traefik.http.services.termix.loadbalancer.server.port=8080"
+
       # Local Router
-      - "traefik.http.routers.termix-local.rule=Host(`termix.workstation.internal`)"
+      - "traefik.http.routers.termix-local.rule=Host(`termix.workstation.internal`) || Host(`termix.internal`)"
       - "traefik.http.routers.termix-local.entrypoints=websecure"
+      - "traefik.http.routers.termix-local.middlewares=security-headers@file"
+      - "traefik.http.routers.termix-local.service=termix"
       - "traefik.http.routers.termix-local.tls=true"
+
       # Dev Router
       - "traefik.http.routers.termix-dev.rule=Host(`termix.gigaforust.internal`)"
       - "traefik.http.routers.termix-dev.entrypoints=websecure"
+      - "traefik.http.routers.termix-dev.middlewares=security-headers@file"
+      - "traefik.http.routers.termix-dev.service=termix"
       - "traefik.http.routers.termix-dev.tls=true"
     networks:
-      - proxy
+      - traefik-proxy
+
 networks:
-  proxy:
+  traefik-proxy:
     external: true
+
 volumes:
-  data:
+  termix-data:
+    driver: local

traefik/compose.yaml

@@ -1,6 +1,6 @@
 services:
   traefik:
-    image: traefik:v3.7
+    image: traefik:latest
     container_name: traefik
     restart: unless-stopped
     command:
@@ -11,38 +11,38 @@ services:
       # Providers
       - "--providers.docker=true"
       - "--providers.docker.exposedbydefault=false"
-      - "--providers.docker.network=proxy"
+      - "--providers.docker.network=traefik-proxy"
       - "--providers.file.directory=/etc/traefik/dynamic"
       - "--providers.file.watch=true"
 
       # EntryPoints
       - "--entryPoints.web.address=:80"
-      - "--entryPoints.web.http.redirections.entryPoint.scheme=https"
-      - "--entryPoints.web.http.redirections.entryPoint.to=websecure"
       - "--entryPoints.websecure.address=:443"
-      - "--entryPoints.websecure.http.middlewares=error-pages@docker"
       - "--entryPoints.websecure.http.tls=true"
+      - "--entryPoints.web.http.redirections.entryPoint.to=websecure"
+      - "--entryPoints.web.http.redirections.entryPoint.scheme=https"
       - "--entryPoints.ssh.address=:2221"
 
-      # Let's Encrypt
+      # Let's Encrypt STAGING. CURRENTLY USING CF ORIGIN CA INSTEAD
-      - "--certificatesresolvers.letsencrypt.acme.email=${EMAIL}"
+      # - "--certificatesresolvers.letsencrypt.acme.email=${EMAIL}"
-      - "--certificatesresolvers.letsencrypt.acme.storage=/letsencrypt/acme.json"
+      # - "--certificatesresolvers.letsencrypt.acme.storage=/letsencrypt/acme.json"
-      - "--certificatesresolvers.letsencrypt.acme.httpchallenge=true"
-      - "--certificatesresolvers.letsencrypt.acme.httpchallenge.entrypoint=web"
-      # # STAGING
       # - "--certificatesresolvers.letsencrypt.acme.caserver=https://acme-staging-v02.api.letsencrypt.org/directory"
+      # - "--certificatesresolvers.letsencrypt.acme.httpchallenge=true"
+      # - "--certificatesresolvers.letsencrypt.acme.httpchallenge.entrypoint=web"
 
       # 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"
-      - "--log.format=json"
       - "--accesslog=true"
       - "--accesslog.filepath=/var/log/traefik/access.log"
+
     labels:
       - "traefik.enable=true"
+      - "traefik.docker.network=traefik-proxy"
 
       # Prod Router (Dash)
       - "traefik.http.routers.traefik-dashboard.rule=Host(`traefik.forust.xyz`)"
@@ -50,32 +50,42 @@ services:
       - "traefik.http.routers.traefik-dashboard.middlewares=security-chain@file"
       - "traefik.http.routers.traefik-dashboard.service=api@internal"
       - "traefik.http.routers.traefik-dashboard.tls=true"
+
       # Local Router
-      - "traefik.http.routers.traefik-dashboard-local.rule=Host(`traefik.workstation.internal`)"
+      - "traefik.http.routers.traefik-dashboard-local.rule=Host(`traefik.workstation.internal`) || Host(`traefik.internal`)"
       - "traefik.http.routers.traefik-dashboard-local.entrypoints=websecure"
+      - "traefik.http.routers.traefik-dashboard-local.middlewares=security-headers@file"
       - "traefik.http.routers.traefik-dashboard-local.service=api@internal"
       - "traefik.http.routers.traefik-dashboard-local.tls=true"
+
       # Dev Router
       - "traefik.http.routers.traefik-dashboard-dev.rule=Host(`traefik.gigaforust.internal`)"
       - "traefik.http.routers.traefik-dashboard-dev.entrypoints=websecure"
+      - "traefik.http.routers.traefik-dashboard-dev.middlewares=security-chain@file"
       - "traefik.http.routers.traefik-dashboard-dev.service=api@internal"
       - "traefik.http.routers.traefik-dashboard-dev.tls=true"
 
-      # Glance Metadata
       - glance.name=Traefik
       - glance.url=https://traefik.forust.xyz/
       - glance.description=Traefik is a modern reverse proxy and load balancer
+
+    ports:
+      - "80:80"
+      - "443:443"
+
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock:ro
       - ./dynamic:/etc/traefik/dynamic:ro
       - ./certs:/certs:ro
       - ./logs:/var/log/traefik
-      - ./letsencrypt:/letsencrypt
+      # - ./traefik/letsencrypt:/letsencrypt
-    ports:
+
-      - "80:80"
-      - "443:443"
     networks:
-      - proxy
+      - traefik-proxy
+
+    environment:
+      - TZ=Europe/Bratislava
+
 networks:
-  proxy:
+  traefik-proxy:
     external: true

traefik/dynamic/dynamic.yml

@@ -1,4 +1,4 @@
 http:
   serversTransports:
     insecureTransport:
-      insecureSkipVerify: true
+      insecureSkipVerify: true

traefik/dynamic/fileservers.yml.example

@@ -1,23 +0,0 @@
-http:
-  routers:
-    fs1-public:
-      rule: "Host(`fs1.domain.xyz`)"
-      entrypoints:
-        - websecure
-      service: fs1
-      middlewares:
-        - security-chain@file
-      tls: {}
-
-    fs1-workstation:
-      rule: "Host(`fs1.workstation.internal`)"
-      entrypoints:
-        - websecure
-      service: fs1
-      tls: {}
-      
-  services:
-    fs1:
-      loadBalancer:
-        servers:
-          - url: "http://127.0.0.1:3923" # Copyparty port example

traefik/dynamic/middlewares.yml

@@ -5,6 +5,29 @@ http:
       redirectScheme:
         scheme: https
         permanent: true
+
+    # Metube Basic Auth
+    metube-auth:
+      basicAuth:
+        users:
+          - "vv:$2y$05$JdT8AGUO9bd.E/PiCmKaoOJS1RFlXkrrmZ5mJ4f8/a1bEW39L3FbS"
+
+        realm: "MeTube Access"
+
+    # Basic Auth Traefik Dashboard
+    auth:
+      basicAuth:
+        users:
+          - "admin:$2y$05$.CKDD82sNUxcpaRrLbHuK.dopqt1fgurc2yfTKAT5OFzT7RvPrJHK"
+        realm: "Traefik Dashboard"
+
+    # Basic Auth Dockmon
+    dockmon-auth:
+      basicAuth:
+        users:
+          - "admin:$2y$05$.CKDD82sNUxcpaRrLbHuK.dopqt1fgurc2yfTKAT5OFzT7RvPrJHK"
+        realm: "Dockmon Access"
+
     # Cloudflare IP Whitelist
     cloudflare-ipwhitelist:
       ipWhiteList:
@@ -35,7 +58,6 @@ http:
       forwardAuth:
         address: "http://authentik-server:9000/outpost.goauthentik.io/auth/traefik"
         trustForwardHeader: true
-        maxResponseBodySize: 1048576
         authResponseHeaders:
           - X-authentik-username
           - X-authentik-groups

traefik/dynamic/nextcloud-apache.yml

@@ -15,6 +15,7 @@ http:
       rule: "Host(`nextcloud.workstation.internal`)"
       entrypoints:
         - websecure
+        - web
       service: nextcloud
       middlewares:
         - nextcloud-chain
@@ -25,6 +26,7 @@ http:
       rule: "Host(`nextcloud.gigaforust.internal`)"
       entrypoints:
         - websecure
+        - web
       service: nextcloud
       middlewares:
         - nextcloud-chain

traefik/dynamic/redirect.yml

@@ -1,8 +0,0 @@
-http:
-  routers:
-    acme-challenge-exempt:
-      rule: "PathPrefix(`/.well-known/acme-challenge`)"
-      entryPoints:
-        - web
-      service: noop@internal
-      priority: 100

traefik/dynamic/tls.yml

@@ -2,14 +2,16 @@
 tls:
   certificates:
     # Cloudflare Origin CA *.forust.xyz
-    # - certFile: /certs/cloudflare.pem
+    - certFile: /certs/cloudflare.pem
-    #   keyFile: /certs/cloudflare.key
+      keyFile: /certs/cloudflare.key
+    - certFile: /certs/xdfnx.pem
+      keyFile: /certs/xdfnx.key
   stores:
     default:
       defaultCertificate:
         # Fallback local certificate
-        certFile: /certs/local.pem
+        certFile: /certs/gigaforust.internal+1.pem
-        keyFile: /certs/local-key.pem
+        keyFile: /certs/gigaforust.internal+1-key.pem
 
   options:
     default:

uptime-kuma/compose.yaml

@@ -1,32 +1,34 @@
 services:
   uptime-kuma:
     image: louislam/uptime-kuma:2
-    container_name: uptime-kuma
     restart: unless-stopped
+    container_name: uptime-kuma
     volumes:
-      - data:/app/data
+      - ./data:/app/data
-    # ports:
+    ports:
-    #   - "3001:3001"
+      # <Host Port>:<Container Port>
+      - "3001:3001"
     labels:
       - "traefik.enable=true"
-      - "traefik.http.services.uptime-kuma.loadbalancer.server.port=3001"
+      - "traefik.docker.network=traefik-proxy"
 
       # Prod Router
       - "traefik.http.routers.uptime-kuma.rule=Host(`uptime.forust.xyz`)"
       - "traefik.http.routers.uptime-kuma.entrypoints=websecure"
       - "traefik.http.routers.uptime-kuma.tls=true"
+      - "traefik.http.services.uptime-kuma.loadbalancer.server.port=3001"
+
       # Local Router
-      - "traefik.http.routers.uptime-kuma-local.rule=Host(`uptime.workstation.internal`)"
+      - "traefik.http.routers.uptime-kuma-local.rule=Host(`uptime.workstation.internal`) || Host(`uptime.internal`)"
       - "traefik.http.routers.uptime-kuma-local.entrypoints=websecure"
       - "traefik.http.routers.uptime-kuma-local.tls=true"
+
       # Dev Router
       - "traefik.http.routers.uptime-kuma-dev.rule=Host(`uptime.gigaforust.internal`)"
       - "traefik.http.routers.uptime-kuma-dev.entrypoints=websecure"
       - "traefik.http.routers.uptime-kuma-dev.tls=true"
     networks:
-      - proxy
+      - traefik-proxy
-volumes:
-  data:
 networks:
-  proxy:
+  traefik-proxy:
-    external: true
+    external: true

userbot/.dockerignore

@@ -1,12 +1 @@
 .unused
-Downloads
-.venv
-volumes
-.env
-.env.*
-my_account.session
-.gitignore
-README.md
-.git
-uv.lock
-.deepsource.toml

userbot/Dockerfile

@@ -1,18 +1,10 @@
-FROM python:3.11-slim
+FROM python:3.11
-
 WORKDIR /app
-
-RUN apt-get update && apt-get install -y --no-install-recommends \
-    git wget ffmpeg mediainfo && \ 
-    rm -rf /var/lib/apt/lists/*
-
-COPY requirements.txt /app/
-
-RUN python -m pip install --no-cache-dir --upgrade pip && \
-    python -m pip install --no-cache-dir -r /app/requirements.txt
-
 COPY . /app
-
+RUN apt-get -qq update && apt-get -qq install -y git wget ffmpeg mediainfo\
-ENV PYTHONUNBUFFERED=1
+ && apt-get clean \
-
+ && rm -rf /var/lib/apt/lists/*
-CMD ["python", "-u", "main.py"]
+RUN python -m venv --copies /opt/venv
+ENV PATH="/opt/venv/bin:$PATH"
+RUN pip install --no-cache-dir -r requirements.txt
+CMD ["python", "main.py"]

userbot/compose.yaml

@@ -3,8 +3,6 @@ services:
     build:
       context: .
       dockerfile: Dockerfile
-    image: userbot:latest
-    pull_policy: never
     restart: unless-stopped
     env_file:
       - .env
@@ -18,10 +16,9 @@ services:
       - 1.1.1.1
 
   anna:
-    image: userbot:latest
+    build:
-    pull_policy: never
+      context: .
-    depends_on:
+      dockerfile: Dockerfile
-      - forust
     restart: unless-stopped
     env_file:
       - .env

userbot/main.py

@@ -90,19 +90,11 @@ def load_missing_modules():
     os.makedirs(custom_modules_path, exist_ok=True)
 
     try:
-        resp = requests.get(
+        f = requests.get(
-            "https://raw.githubusercontent.com/The-MoonTg-project/custom_modules/main/full.txt",
+            "https://raw.githubusercontent.com/The-MoonTg-project/custom_modules/main/full.txt"
-            timeout=10,
+        ).text
-        )
+    except Exception:
-        if not resp.ok:
+        logging.error("Failed to fetch custom modules list")
-            logging.error(
-                "Failed to fetch custom modules list: HTTP %s",
-                resp.status_code,
-            )
-            return
-        f = resp.text
-    except Exception as e:
-        logging.error("Failed to fetch custom modules list: %s", e)
         return
     modules_dict = {
         line.split("/")[-1].split()[0]: line.strip() for line in f.splitlines()

userbot/pyproject.toml

@@ -3,7 +3,7 @@ name = "userbot"
 version = "0.1.0"
 description = "Add your description here"
 readme = "README.md"
-requires-python = ">=3.11"
+requires-python = ">=3.13"
 dependencies = [
     "aiofiles>=25.1.0",
     "aiohttp>=3.13.2",

userbot/requirements.txt

@@ -18,5 +18,3 @@ aiohttp
 aiofiles
 pySmartDL
 qrcode
-bottle
-dulwich

userbot/utils/config.py

@@ -1,8 +1,8 @@
 import os
 import environs
 
-env = environs.Env()
 try:
+    env = environs.Env()
     env.read_env("./.env")
 except FileNotFoundError:
     print("No .env file found, using os.environ.")

userbot/utils/scripts.py

@@ -22,7 +22,6 @@ import re
 import shlex
 import subprocess
 import sys
-import tempfile
 import time
 import traceback
 from PIL import Image
@@ -86,17 +85,13 @@ async def edit_or_send_as_file(
         return
     if len(tex) > 1024:
         await message.edit("<code>OutPut is Too Large, Sending As File!</code>")
-        with tempfile.NamedTemporaryFile(
+        file_names = f"{file_name}.txt"
-            "w", delete=False, suffix=".txt", prefix=f"{file_name}_"
+        with open(file_names, "w") as fn:
-        ) as fn:
             fn.write(tex)
-            temp_path = fn.name
+        await client.send_document(message.chat.id, file_names, caption=caption)
-        try:
+        await message.delete()
-            await client.send_document(message.chat.id, temp_path, caption=caption)
+        if os.path.exists(file_names):
-            await message.delete()
+            os.remove(file_names)
-        finally:
-            if os.path.exists(temp_path):
-                os.remove(temp_path)
         return
     return await message.edit(tex)
 
@@ -254,7 +249,12 @@ def is_admin(func):
             chat_member = await client.get_chat_member(
                 message.chat.id, message.from_user.id
             )
-            if chat_member.status in ("administrator", "creator"):
+            chat_admins = []
+            async for member in client.get_chat_members(
+                message.chat.id, filter=ChatMembersFilter.ADMINISTRATORS
+            ):
+                chat_admins.append(member)
+            if chat_member in chat_admins:
                 return await func(client, message)
             await message.edit("You need to be an admin to perform this action.")
         except UserNotParticipant: