diff --git a/.gitignore b/.gitignore index ed6da58..c01ee8c 100644 --- a/.gitignore +++ b/.gitignore @@ -2,10 +2,8 @@ sync.ffs_lock .sync.ffs_db -# Environment -.env -.env.anna -.env.forust +# Copyparty +*.hist/ # Volumes and data directories gitea/gitea-db/ @@ -18,6 +16,20 @@ portainer/portainer_data/* metube/MeTube_downloads uptime-kuma/data/ termix/termix-data/* +cfddns/config.json +checkmk/checkmk/* +downtify/Downtify_downloads +headscale/config/* +headscale/data/* + +# Steaming services files +streaming/jellyfin/* +streaming/jellyseerr/* +streaming/sonarr/* +streaming/radarr/* +streaming/data/* +streaming/qbittorrent/* +streaming/prowlarr/* # Steaming services files streaming/jellyfin/* @@ -29,17 +41,63 @@ streaming/qbittorrent/* streaming/prowlarr/* # Homepage -homepage/files/assets/images/team/* +homepages/forust_files/assets/images/team/* +homepages/forust_files/.well-known/* # Traefik files traefik/letsencrypt/acme.json +traefik/dynamic/fileservers.yml traefik/logs/* + +# SSL Certificates +adguardhome/certs/* traefik/certs/* +# Monitoring +monitoring/prometheus.yml + # Python .python-version -.venv/ venv/ +pyc +unknown_errors.txt +moonlogs.txt +thumb.jpg +antipm_pic.jpg +musicbot/ +.trunk/ +previous_profiles/ +.python-version +/modules/__pycache__/ +__pycache__/ +*.session +*.session-old +*.db +*.sqlite3 +*-journal +/venv/ +.venv/ -#DataSecurity +# DataSecurity replacements.txt + +# Vscode +.vscode + +# Git +.gitattributes + +# Misc +.DS_Store +.idea + +# Temp files +edu_master/temp/ +temp/* + +# Environment +.env +.env.anna +.env.forust +.env.* +!*example \ No newline at end of file diff --git a/adguardhome/compose.yaml b/adguardhome/compose.yaml index 0b38acd..503a82d 100644 --- a/adguardhome/compose.yaml +++ b/adguardhome/compose.yaml @@ -3,26 +3,54 @@ 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/work:/opt/adguardhome/work - ./data/conf:/opt/adguardhome/conf + - ./certs:/certs:ro networks: - - traefik-proxy + - proxy labels: - "traefik.enable=true" - - "traefik.docker.network=traefik-proxy" + - "traefik.docker.network=proxy" + - "traefik.http.services.adguard.loadbalancer.server.port=3000" + + # Prod Router + - "traefik.http.routers.adguard.rule=Host(`dns.forust.xyz`) || 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" + + # Local Router + - "traefik.http.routers.adguard-local.rule=Host(`dns.workstation.internal`) || Host(`adguard.internal`) || Host(`adguard.workstation.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(`dns.gigaforust.internal`) || 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 + - "traefik.http.routers.dns.rule=(Host(`dns.forust.xyz`) && PathPrefix(`/dns-query`))" + - "traefik.http.routers.dns.entrypoints=websecure" + - "traefik.http.routers.dns.service=adguard" + - "traefik.http.routers.dns.tls.certresolver=letsencrypt" + - glance.name=adguard - # - glance.icon=si:adguard - glance.url=https://adguard.forust.xyz/ - glance.description=AdGuard Home is a network-wide software for blocking ads. networks: - traefik-proxy: - external: true \ No newline at end of file + proxy: + external: true diff --git a/authentik/.env.example b/authentik/.env.example new file mode 100644 index 0000000..a1222c4 --- /dev/null +++ b/authentik/.env.example @@ -0,0 +1,20 @@ +# =================================== +# Authentification app (authentik) + +# PostgresQL conf +PG_PASS=change_this_cuz_its_ur_db_pass +PG_USER=authentik # it's okay + +# Image Settings +AUTHENTIK_IMAGE=ghcr.io/goauthentik/server +AUTHENTIK_TAG=2025.10.2 + +# Networking +PORT_HTTP=9000 +PORT_HTTPS=9443 # btw likely already used by portainer + +AUTHENTIK_SECRET_KEY=super_secret_super_scary_authenik_key + +AUTHENTIK_BOOTSTRAP_PASSWORD=pls_change_this + +AUTHENTIK_ERROR_REPORTING__ENABLED=true # Or false to turn off \ No newline at end of file diff --git a/authentik/compose.yaml b/authentik/compose.yaml new file mode 100644 index 0000000..4acee8e --- /dev/null +++ b/authentik/compose.yaml @@ -0,0 +1,106 @@ +services: + postgresql: + image: docker.io/library/postgres:15-alpine + restart: unless-stopped + env_file: + - .env + environment: + POSTGRES_DB: ${PG_DB:-authentik} + POSTGRES_PASSWORD: ${PG_PASS:?database password required} + POSTGRES_USER: ${PG_USER:-authentik} + healthcheck: + interval: 30s + retries: 5 + start_period: 20s + test: + - CMD-SHELL + - pg_isready -d $${POSTGRES_DB} -U $${POSTGRES_USER} + timeout: 5s + volumes: + - database:/var/lib/postgresql/data + networks: + - authentik + + server: + image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2025.10.2} + command: server + container_name: authentik-server + restart: unless-stopped + # ports: + # - ${PORT_HTTP:-9000}:9000 + # - ${PORT_HTTPS:-9443}:9443 + env_file: + - .env + environment: + AUTHENTIK_POSTGRESQL__HOST: postgresql + AUTHENTIK_POSTGRESQL__NAME: ${PG_DB:-authentik} + AUTHENTIK_POSTGRESQL__PASSWORD: ${PG_PASS} + AUTHENTIK_POSTGRESQL__USER: ${PG_USER:-authentik} + AUTHENTIK_SECRET_KEY: ${AUTHENTIK_SECRET_KEY:?secret key required} + + labels: + - "traefik.enable=true" + - "traefik.docker.network=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`) || 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 + - authentik + depends_on: + postgresql: + condition: service_healthy + worker: + image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2025.10.2} + restart: unless-stopped + user: root + command: worker + env_file: + - .env + environment: + AUTHENTIK_POSTGRESQL__HOST: postgresql + AUTHENTIK_POSTGRESQL__NAME: ${PG_DB:-authentik} + AUTHENTIK_POSTGRESQL__PASSWORD: ${PG_PASS} + AUTHENTIK_POSTGRESQL__USER: ${PG_USER:-authentik} + AUTHENTIK_SECRET_KEY: ${AUTHENTIK_SECRET_KEY:?secret key required} + volumes: + - /var/run/docker.sock:/var/run/docker.sock + - ./media:/media + - ./certs:/certs + - ./custom-templates:/templates + networks: + - authentik + depends_on: + postgresql: + condition: service_healthy +volumes: + database: + driver: local +networks: + authentik: + proxy: + external: true diff --git a/cfddns/compose.yaml b/cfddns/compose.yaml new file mode 100644 index 0000000..8c3a0f3 --- /dev/null +++ b/cfddns/compose.yaml @@ -0,0 +1,13 @@ +services: + cloudflare-ddns: + image: timothyjmiller/cloudflare-ddns:latest + container_name: cloudflare-ddns + security_opt: + - no-new-privileges:true + network_mode: 'host' + environment: + - PUID=1000 + - PGID=1000 + volumes: + - ./config.json:/config.json + restart: unless-stopped diff --git a/cfddns/config.json.example b/cfddns/config.json.example new file mode 100644 index 0000000..d290046 --- /dev/null +++ b/cfddns/config.json.example @@ -0,0 +1,22 @@ +{ + "cloudflare": [ + { + "authentication": { + "api_token": "API_TOKEN" + }, + "api_key": { + "api_key": "api_key_here", + "account_email": "your_email_here" + } + "zone_id": "your_zone-id", + "subdomains": [ + { "name": "", "proxied": true }, + { "name": "www", "proxied": true } + ] + } + ], + "a": true, + "aaaa": false, + "purgeUnknownRecords": false, + "ttl": 300 +} diff --git a/checkmk/.env.example b/checkmk/.env.example new file mode 100644 index 0000000..a57b7d2 --- /dev/null +++ b/checkmk/.env.example @@ -0,0 +1,2 @@ +CMK_PASSWORD=password +TZ=Europe/Berlin \ No newline at end of file diff --git a/checkmk/compose.yaml b/checkmk/compose.yaml new file mode 100644 index 0000000..5cc9cc0 --- /dev/null +++ b/checkmk/compose.yaml @@ -0,0 +1,50 @@ +services: + checkmk: + image: "checkmk/check-mk-raw:2.4.0-latest" + container_name: "checkmk" + environment: + - CMK_PASSWORD=${CMK_PASSWORD:-password} + - CMK_SITE_ID=cmk + + volumes: + - sites:/omd/sites + tmpfs: + - /opt/omd/sites/cmk/tmp:uid=1000,gid=1000 + ports: + - 5000:5000 + - 6776:8000 + restart: unless-stopped + labels: + - "traefik.enable=true" + - "traefik.docker.network=proxy" + - "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.service=checkmk" + - "traefik.http.routers.checkmk.middlewares=security-headers@file" + - "traefik.http.routers.checkmk.tls=true" + + # Local Router + - "traefik.http.routers.checkmk-local.rule=Host(`cmk.workstation.internal`) || Host(`cmk.internal`)" + - "traefik.http.routers.checkmk-local.entrypoints=websecure" + - "traefik.http.routers.checkmk-local.service=checkmk" + - "traefik.http.routers.checkmk-local.middlewares=security-headers@file" + - "traefik.http.routers.checkmk-local.tls=true" + + # Dev Router + - "traefik.http.routers.checkmk-dev.rule=Host(`cmk.gigaforust.internal`)" + - "traefik.http.routers.checkmk-dev.middlewares=security-headers@file" + - "traefik.http.routers.checkmk-dev.service=checkmk" + - "traefik.http.routers.checkmk-dev.entrypoints=websecure" + - "traefik.http.routers.checkmk-dev.tls=true" + + networks: + - proxy + +networks: + proxy: + external: true +volumes: + sites: diff --git a/dockmon/compose.yaml b/dockmon/compose.yaml index 6caae8d..b7f11de 100644 --- a/dockmon/compose.yaml +++ b/dockmon/compose.yaml @@ -11,20 +11,44 @@ services: - ./data:/app/data - /var/run/docker.sock:/var/run/docker.sock healthcheck: - test: ["CMD", "curl", "-k", "-f", "https://localhost:443/health"] + test: [ "CMD", "curl", "-k", "-f", "https://localhost:443/health" ] interval: 30s timeout: 10s retries: 3 networks: - - traefik-proxy + - proxy labels: - - "traefik.enable=true" - - "traefik.docker.network=traefik-proxy" - - glance.name=dockmon - # - glance.icon=sh: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. + - "traefik.enable=true" + - "traefik.docker.network=proxy" + + # 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`) || 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.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: - traefik-proxy: - external: true + proxy: + external: true diff --git a/downtify/compose.yaml b/downtify/compose.yaml new file mode 100644 index 0000000..f507091 --- /dev/null +++ b/downtify/compose.yaml @@ -0,0 +1,39 @@ +services: + downtify: + container_name: downtify + image: ghcr.io/henriquesebastiao/downtify:latest + # ports: + # - '7077:8000' + labels: + - traefik.enable=true + - traefik.http.services.downtify.loadbalancer.server.port=8000 + + # Prod Router + - traefik.http.routers.downtify.rule=Host(`downtify.forust.xyz`) + - traefik.http.routers.downtify.entrypoints=websecure + - traefik.http.routers.downtify.middlewares=security-chain@file + - traefik.http.routers.downtify.service=downtify + - traefik.http.routers.downtify.tls=true + + # Local Router + - traefik.http.routers.downtify-local.rule=Host(`downtify.workstation.internal`) || Host(`downtify.internal`) + - traefik.http.routers.downtify-local.entrypoints=websecure + - traefik.http.routers.downtify-local.middlewares=security-headers@file + - traefik.http.routers.downtify-local.service=downtify + - traefik.http.routers.downtify-local.tls=true + + # Dev Router + - traefik.http.routers.downtify-dev.rule=Host(`downtify.gigaforust.internal`) + - traefik.http.routers.downtify-dev.entrypoints=websecure + - traefik.http.routers.downtify-dev.middlewares=security-chain@file + - traefik.http.routers.downtify-dev.service=downtify + - traefik.http.routers.downtify-dev.tls=true + networks: + - proxy + + volumes: + - ./Downtify_downloads:/downloads + +networks: + proxy: + external: true diff --git a/edu_master/.env.example b/edu_master/.env.example new file mode 100644 index 0000000..e0c4a1e --- /dev/null +++ b/edu_master/.env.example @@ -0,0 +1,13 @@ +EDU_LOGIN=your_edu_login_here +EDU_PASSWORD=your_edu_password_here +EDU_URL_LOGIN=https://edu.edu.vn.ua/user/login +EDU_URL_VERIFY=https://edu.edu.vn.ua/course/userlist +PHPSESSID_INTERVAL=10 +USER_AGENT="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/142.0.0.0 Safari/537.36" +WEBINAR_URL=https://edu.edu.vn.ua/webinar/useractive +WEBINAR_CHECK_INTERVAL=60 +REDIS_HOST=redis +REDIS_PORT=6379 +PLAYWRIGHT_WS=ws://playwright-service:3000/ws +WEBINAR_TELEGRAM_TOKEN=your_telegram_bot_token_here +WEBINAR_ADMIN_ID=123456789 diff --git a/edu_master/backend/Dockerfile b/edu_master/backend/Dockerfile deleted file mode 100644 index 89681fd..0000000 --- a/edu_master/backend/Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -ARG VERSION -# Use the official WaterCrawl image as the base image -FROM watercrawl/watercrawl:${VERSION:-v0.10.2} - -# Set working directory -WORKDIR /var/www - -# Copy the extra requirements file -COPY extra_requirements.txt /var/www/extra_requirements.txt - -# Install any additional packages -RUN poetry run pip install -r /var/www/extra_requirements.txt - -# The rest of the configuration is inherited from the base image -# The entrypoint and command should be defined in docker-compose.yml diff --git a/edu_master/backend/extra_requirements.txt b/edu_master/backend/extra_requirements.txt deleted file mode 100644 index 54bb109..0000000 --- a/edu_master/backend/extra_requirements.txt +++ /dev/null @@ -1 +0,0 @@ -# Add your additional Python packages here, one per line diff --git a/edu_master/compose.yaml b/edu_master/compose.yaml index 0aa1fbd..09cc10e 100644 --- a/edu_master/compose.yaml +++ b/edu_master/compose.yaml @@ -1,262 +1,45 @@ -x-app: &app - build: - context: ./backend/ - dockerfile: Dockerfile - args: - - VERSION=${VERSION:-v0.10.2} - depends_on: - db: - condition: service_healthy - dns: - - 8.8.8.8 - - 1.1.1.1 - environment: - - SECRET_KEY=${SECRET_KEY:-django-insecure-el4wo4a4--=f0+ag#omp@^w4eq^8v4(scda&1a(td_y2@=sh6&} - - API_ENCRYPTION_KEY=${API_ENCRYPTION_KEY:-8zSd6JIuC7ovfZ4AoxG_XmhubW6CPnQWW7Qe_4TD1TQ=} - - DEBUG=${DEBUG:-True} - - ALLOWED_HOSTS=${ALLOWED_HOSTS:-*} - - LANGUAGE_CODE=${LANGUAGE_CODE:-en-us} - - TIME_ZONE=${TIME_ZONE:-UTC} - - USE_I18N=${USE_I18N:-True} - - USE_TZ=${USE_TZ:-True} - - STATIC_ROOT=${STATIC_ROOT:-storage/static/} - - MEDIA_ROOT=${MEDIA_ROOT:-storage/media/} - - LOG_LEVEL=${LOG_LEVEL:-INFO} - - REDIS_URL=${REDIS_URL:-redis://redis:6379/1} - - DATABASE_URL=postgres://${POSTGRES_USER:-postgres}:${POSTGRES_PASSWORD:-postgres}@${POSTGRES_HOST:-db}:${POSTGRES_PORT:-5432}/${POSTGRES_DB:-postgres} - - CELERY_BROKER_URL=${CELERY_BROKER_URL:-redis://redis:6379/0} - - CELERY_RESULT_BACKEND=${CELERY_RESULT_BACKEND:-django-db} - - REDIS_LOCKER_URL=${REDIS_LOCKER_URL:-redis://redis:6379/3} - - MINIO_ENDPOINT=minio:9000 - - MINIO_EXTERNAL_ENDPOINT=nginx - - MINIO_REGION=us-east-1 - - MINIO_ACCESS_KEY=minio - - MINIO_SECRET_KEY=minio123 - - MINIO_USE_HTTPS=False - - MINIO_EXTERNAL_ENDPOINT_USE_HTTPS=False - - MINIO_URL_EXPIRY_HOURS=7 - - MINIO_PRIVATE_BUCKET=private - - MINIO_PUBLIC_BUCKET=public - - CSRF_TRUSTED_ORIGINS=${CSRF_TRUSTED_ORIGINS:-} - - CORS_ALLOWED_ORIGINS=${CORS_ALLOWED_ORIGINS:-} - - CORS_ALLOWED_ORIGIN_REGEXES=${CORS_ALLOWED_ORIGIN_REGEXES:-} - - CORS_ALLOW_ALL_ORIGINS=${CORS_ALLOW_ALL_ORIGINS:-False} - - FRONTEND_URL=${FRONTEND_URL:-http://localhost} - - IS_LOGIN_ACTIVE=${IS_LOGIN_ACTIVE:-True} - - IS_SIGNUP_ACTIVE=${IS_SIGNUP_ACTIVE:-True} - - IS_GITHUB_LOGIN_ACTIVE=${IS_GITHUB_LOGIN_ACTIVE:-True} - - IS_GOOGLE_LOGIN_ACTIVE=${IS_GOOGLE_LOGIN_ACTIVE:-True} - - GITHUB_CLIENT_ID=${GITHUB_CLIENT_ID:-} - - GITHUB_CLIENT_SECRET=${GITHUB_CLIENT_SECRET:-} - - GOOGLE_CLIENT_ID=${GOOGLE_CLIENT_ID:-} - - GOOGLE_CLIENT_SECRET=${GOOGLE_CLIENT_SECRET:-} - - ACCESS_TOKEN_LIFETIME_MINUTES=${ACCESS_TOKEN_LIFETIME_MINUTES:-5} - - REFRESH_TOKEN_LIFETIME_DAYS=${REFRESH_TOKEN_LIFETIME_DAYS:-30} - - EMAIL_BACKEND=${EMAIL_BACKEND:-django.core.mail.backends.smtp.EmailBackend} - - EMAIL_HOST=${EMAIL_HOST:-} - - EMAIL_PORT=${EMAIL_PORT:-587} - - EMAIL_USE_TLS=${EMAIL_USE_TLS:-True} - - EMAIL_HOST_USER=${EMAIL_HOST_USER:-} - - EMAIL_HOST_PASSWORD=${EMAIL_HOST_PASSWORD:-} - - DEFAULT_FROM_EMAIL=${DEFAULT_FROM_EMAIL:-} - - SCRAPY_USER_AGENT=${SCRAPY_USER_AGENT:-WaterCrawl/0.1 (+https://github.com/watercrawl/watercrawl)} - - SCRAPY_ROBOTSTXT_OBEY=${SCRAPY_ROBOTSTXT_OBEY:-True} - - SCRAPY_CONCURRENT_REQUESTS=${SCRAPY_CONCURRENT_REQUESTS:-16} - - SCRAPY_DOWNLOAD_DELAY=${SCRAPY_DOWNLOAD_DELAY:-0} - - SCRAPY_CONCURRENT_REQUESTS_PER_DOMAIN=${SCRAPY_CONCURRENT_REQUESTS_PER_DOMAIN:-4} - - SCRAPY_CONCURRENT_REQUESTS_PER_IP=${SCRAPY_CONCURRENT_REQUESTS_PER_IP:-4} - - SCRAPY_COOKIES_ENABLED=${SCRAPY_COOKIES_ENABLED:-False} - - SCRAPY_HTTPCACHE_ENABLED=${SCRAPY_HTTPCACHE_ENABLED:-True} - - SCRAPY_HTTPCACHE_EXPIRATION_SECS=${SCRAPY_HTTPCACHE_EXPIRATION_SECS:-3600} - - SCRAPY_HTTPCACHE_DIR=${SCRAPY_HTTPCACHE_DIR:-httpcache} - - SCRAPY_LOG_LEVEL=${SCRAPY_LOG_LEVEL:-ERROR} - - SCRAPY_GOOGLE_API_KEY=${SCRAPY_GOOGLE_API_KEY:-} - - SCRAPY_GOOGLE_CSE_ID=${SCRAPY_GOOGLE_CSE_ID:-} - - SCRAPY_MAX_NUMBER_OF_SITEMAP_URLS=${SCRAPY_MAX_NUMBER_OF_SITEMAP_URLS:-20000} - - SCRAPY_SITEMAP_CRAWL_PAGE_LIMIT=${SCRAPY_SITEMAP_CRAWL_PAGE_LIMIT:-100} - - PLAYWRIGHT_SERVER=${PLAYWRIGHT_SERVER:-http://playwright:8000} - - PLAYWRIGHT_API_KEY=${PLAYWRIGHT_API_KEY:-your-secret-api-key} - - OPENAI_API_KEY=${OPENAI_API_KEY:-} - - STRIPE_SECRET_KEY=${STRIPE_SECRET_KEY:-} - - STRIPE_WEBHOOK_SECRET=${STRIPE_WEBHOOK_SECRET:-} - - GOOGLE_ANALYTICS_ID=${GOOGLE_ANALYTICS_ID:-} - - IS_ENTERPRISE_MODE_ACTIVE=${IS_ENTERPRISE_MODE_ACTIVE:-False} - - MAX_CRAWL_DEPTH=${MAX_CRAWL_DEPTH:--1} - - CAPTURE_USAGE_HISTORY=${CAPTURE_USAGE_HISTORY:-True} - - MCP_SERVER=${MCP_SERVER:-http://localhost/sse} - networks: - - traefik-proxy - - default - - n8n - -x-frontend: &frontend - image: watercrawl/frontend:${VERSION:-v0.10.2} - environment: - - VITE_API_BASE_URL=${API_BASE_URL:-http://localhost/api} - depends_on: - - app - services: - nginx: - image: nginx:alpine - volumes: - - ./nginx/nginx.conf:/etc/nginx/conf.d/default.conf.template - - ./nginx/entrypoint.sh:/entrypoint.sh - environment: - - MINIO_PRIVATE_BUCKET=${MINIO_PRIVATE_BUCKET:-private} - - MINIO_PUBLIC_BUCKET=${MINIO_PUBLIC_BUCKET:-public} - command: ["/bin/sh", "/entrypoint.sh"] - depends_on: - - app - - frontend - - minio - restart: unless-stopped - networks: - - traefik-proxy - - n8n - - labels: - - "traefik.enable=true" - - "traefik.docker.network=traefik-proxy" - - app: - <<: *app - command: [ "gunicorn", "-b", "0.0.0.0:9000", "-w", "2", "watercrawl.wsgi:application", "--access-logfile", "-", "--error-logfile", "-", "--timeout", "60" ] - - celery: - <<: *app - command: [ "celery", "-A", "watercrawl", "worker", "-l", "info", "-S", "django" ] - dns: - - 1.1.1.1 - - 8.8.8.8 - - celery-beat: - <<: *app - command: [ "celery", "-A", "watercrawl", "beat", "-l", "info", "-S", "django" ] - - frontend: - <<: *frontend - command: [ "npm", "run", "serve" ] - - minio: - image: minio/minio:RELEASE.2024-11-07T00-52-20Z + redis: + image: redis:alpine restart: unless-stopped volumes: - - ./volumes/minio-data:/data - command: server /data --console-address ":9001" - environment: - - MINIO_BROWSER_REDIRECT_URL=${MINIO_BROWSER_REDIRECT_URL:-http://localhost/minio-console/} - - MINIO_SERVER_URL=${MINIO_SERVER_URL:-http://localhost/} - - MINIO_ROOT_USER=${MINIO_ACCESS_KEY:-minio} - - MINIO_ROOT_PASSWORD=${MINIO_SECRET_KEY:-minio123} - - playwright: - image: watercrawl/playwright:1.1 - restart: unless-stopped - user: root - environment: - - AUTH_API_KEY=${PLAYWRIGHT_API_KEY:-your-secret-api-key} - - PORT=${PLAYWRIGHT_PORT:-8000} - - HOST=${PLAYWRIGHT_HOST:-0.0.0.0} - dns: - - 8.8.8.8 - - 1.1.1.1 - networks: - - traefik-proxy - - n8n - - db: - image: postgres:17.2-alpine3.21 - restart: unless-stopped - environment: - - POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-postgres} - - POSTGRES_USER=${POSTGRES_USER:-postgres} - - POSTGRES_DB=${POSTGRES_DB:-postgres} - volumes: - - ./volumes/postgres-db:/var/lib/postgresql/data + - redis-data:/data healthcheck: - test: [ "CMD-SHELL", "pg_isready" ] - interval: 10s - timeout: 5s + test: [ "CMD", "redis-cli", "ping" ] + interval: 5s + timeout: 3s retries: 5 - mcp: - image: watercrawl/mcp:v1.2.0 + playwright-service: + image: mcr.microsoft.com/playwright:v1.56.0-jammy restart: unless-stopped - command: [ "sse", "--base-url", "http://app:9000", '--port', '3000', '--endpoint', '/sse' ] - networks: - - n8n + command: npx -y playwright@1.56.0 run-server --port 3000 --path /ws - redis: - image: redis:latest + session-keeper: + build: ./phpsessid-bot + env_file: .env restart: unless-stopped + depends_on: + redis: + condition: service_healthy + healthcheck: + test: [ "CMD-SHELL", "redis-cli -h redis EXISTS EDU_PHPSESSID | grep -q 1" ] + interval: 30s + timeout: 5s + retries: 10 + start_period: 60s - llm: - image: ollama/ollama:latest + webinar-checker: + build: ./webinar-checker + env_file: .env restart: unless-stopped - volumes: - - ./volumes/ollama-models:/root/.ollama - environment: - - OLLAMA_DISABLE_TELEMETRY=true - - OLLAMA_KEEP_ALIVE=5m - - OLLAMA_HOST=0.0.0.0:11434 - - OLLAMA_NUM_PARALLEL=1 - - OLLAMA_MAX_LOADED_MODELS=1 - dns: - - 1.1.1.1 - - 8.8.8.8 - networks: - - n8n - -# docker exec -it edu_master-llm-1 ollama pull neural-chat:7b-q4 -# docker exec -it edu_master-llm-1 ollama pull mistral:7b-q4 - - # lessons-bot: - # build: - # context: edu_master/lessons_bot/ - # dockerfile: Dockerfile - # restart: unless-stopped - # environment: - # - LESSONS_BOT_TOKEN=${LESSONS_BOT_TOKEN} - # - N8N_WEBHOOK_URL=${N8N_WEBHOOK_URL:-http://n8n:5678/webhook-test/get-lessons} - # - N8N_SECRET=${N8N_SECRET:-your-secret-token-here} - # - WATERCRAWL_API_URL=${WATERCRAWL_API_URL:-http://app:9000/api} - # - PHPSESSID_BOT_URL=${PHPSESSID_BOT_URL:-http://phpsessid-bot:5000} - # - EDU_HOST=${EDU_HOST:-edu.edu.vn.ua} - # depends_on: - # - n8n - # - app - # - phpsessid-bot - # dns: - # - 1.1.1.1 - # - 8.8.8.8 - # networks: - # - default - - phpsessid-bot: - build: - context: ./phpsessid_bot/ - dockerfile: Dockerfile - restart: unless-stopped - environment: - - EDU_HOST=${EDU_HOST:-edu.edu.vn.ua} - - EDU_LOGIN=${EDU_LOGIN} - - EDU_PASSWORD=${EDU_PASSWORD} - - BOT_PORT=${PHPSESSID_BOT_PORT:-5000} - - BOT_HOST=${PHPSESSID_BOT_HOST:-0.0.0.0} - dns: - - 1.1.1.1 - - 8.8.8.8 - networks: - - default - + depends_on: + redis: + condition: service_healthy + session-keeper: + condition: service_healthy + playwright-service: + condition: service_started volumes: - n8n_data: - postgres-db: - minio-data: - ollama-models: - lmstudio_data: -networks: - traefik-proxy: - external: true + redis-data: diff --git a/edu_master/lessons_bot/Dockerfile b/edu_master/lessons_bot/Dockerfile deleted file mode 100644 index 1af5983..0000000 --- a/edu_master/lessons_bot/Dockerfile +++ /dev/null @@ -1,16 +0,0 @@ -FROM python:3.11-slim - -WORKDIR /app - -# Установка зависимостей -COPY requirements.txt . -RUN pip install --no-cache-dir -r requirements.txt - -# Копирование кода -COPY config.py . -COPY utils.py . -COPY handlers.py . -COPY main.py . - -# Запуск бота -CMD ["python", "-u", "main.py"] \ No newline at end of file diff --git a/edu_master/lessons_bot/config.py b/edu_master/lessons_bot/config.py deleted file mode 100644 index 8326eca..0000000 --- a/edu_master/lessons_bot/config.py +++ /dev/null @@ -1,26 +0,0 @@ -import os -from dotenv import load_dotenv - -load_dotenv() - -# Telegram -BOT_TOKEN = os.getenv('LESSONS_BOT_TOKEN') - -# n8n -N8N_WEBHOOK_URL = os.getenv('N8N_WEBHOOK_URL', 'http://n8n:5678/webhook/homework-check') -N8N_SECRET = os.getenv('N8N_SECRET', 'your-secret-token-here') - -# WaterCrawl API -WATERCRAWL_API_URL = os.getenv('WATERCRAWL_API_URL', 'http://app:9000/api') - -# PHPSESSID Bot -PHPSESSID_BOT_URL = os.getenv('PHPSESSID_BOT_URL', 'http://phpsessid-bot:5000') - -# EDU site -EDU_HOST = os.getenv('EDU_HOST', 'edu.edu.vn.ua') -EDU_WEBINAR_URL = f'https://{EDU_HOST}/webinar/useractive' - -# Playwright -PLAYWRIGHT_SERVER = os.getenv('PLAYWRIGHT_SERVER', 'http://playwright:8000') -PLAYWRIGHT_API_KEY = os.getenv('PLAYWRIGHT_API_KEY', 'your-secret-api-key') -WEBINAR_WAIT_TIME = int(os.getenv('WEBINAR_WAIT_TIME', '3')) # Секунды ожидания загрузки \ No newline at end of file diff --git a/edu_master/lessons_bot/handlers.py b/edu_master/lessons_bot/handlers.py deleted file mode 100644 index 5ff92dc..0000000 --- a/edu_master/lessons_bot/handlers.py +++ /dev/null @@ -1,131 +0,0 @@ -import logging -import requests -from telegram import Update -from telegram.ext import ContextTypes -import config -from utils import fetch_webinars, format_webinar_message - -logger = logging.getLogger(__name__) - - -async def start(update: Update, context: ContextTypes.DEFAULT_TYPE): - """Команда /start""" - welcome_message = """ -Привет! Я бот для проверки домашних заданий и вебинаров. - -Команды: -/check - Проверить несделанные уроки -/webinar - Проверить активные онлайн уроки -/help - Помощь - """ - await update.message.reply_text(welcome_message, parse_mode='HTML') - - -async def help_command(update: Update, context: ContextTypes.DEFAULT_TYPE): - """Команда /help""" - help_text = """ -Как пользоваться ботом: - -/check - Проверка домашних заданий -- Поиск несделанных уроков - -⏱ Проверка занимает 10-30 секунд - -/webinar - Активные онлайн уроки -- Проверка активных вебинаровв -⏱ Проверка занимает 3-5 секунд - """ - await update.message.reply_text(help_text, parse_mode='HTML') - - -async def check_homework(update: Update, context: ContextTypes.DEFAULT_TYPE): - """Команда /check - запускает проверку уроков""" - chat_id = update.effective_chat.id - user_id = update.effective_user.id - username = update.effective_user.username or "unknown" - - # Отправляем уведомление что начали работу - status_message = await update.message.reply_text("Запускаю проверку уроков...") - - # Формируем данные для n8n - payload = { - "chat_id": chat_id, - "user_id": user_id, - "username": username, - "timestamp": update.message.date.isoformat() - } - - headers = { - "Authorization": f"Bearer {config.N8N_SECRET}", - "Content-Type": "application/json" - } - - try: - logger.info(f"Sending request to n8n for user {user_id}") - - # Отправляем запрос в n8n - response = requests.post( - config.N8N_WEBHOOK_URL, - json=payload, - headers=headers, - timeout=5 # Короткий таймаут т.к. это асинхронный запрос - ) - - if response.status_code == 200: - await status_message.edit_text( - "✅ Запрос принят!\n" - "🔄 Парсинг сайта и анализ данных...\n" - "⏱ Это займет 10-30 секунд" - ) - logger.info(f"Request accepted for user {user_id}") - else: - await status_message.edit_text( - f"Ошибка при отправке запроса. Функция в разработке\n" - f"Код: {response.status_code}" - ) - logger.error(f"n8n returned status {response.status_code}") - - except requests.Timeout: - await status_message.edit_text("⏱ Запрос обрабатывается (таймаут соединения)") - logger.warning(f"Timeout for user {user_id}") - except Exception as e: - await status_message.edit_text(f"❌ Ошибка: {str(e)}") - logger.error(f"Error for user {user_id}: {e}", exc_info=True) - - -async def check_webinar(update: Update, context: ContextTypes.DEFAULT_TYPE): - """Команда /webinar - проверяет активные онлайн уроки""" - user_id = update.effective_user.id - - # Отправляем уведомление что начали работу - status_message = await update.message.reply_text("Проверяю активные вебинары...") - - try: - logger.info(f"Checking webinars for user {user_id}") - - # Получаем список вебинаров - webinars = fetch_webinars() - - if webinars is None: - await status_message.edit_text( - "❌ Не удалось получить информацию о вебинарах\n" - "Попробуйте позже или обратитесь к администратору\n" - "|@MrForust|mr.forust| Либо же прямо сюда." - ) - logger.error(f"Failed to fetch webinars for user {user_id}") - return - - # Форматируем и отправляем результат - message = format_webinar_message(webinars) - await status_message.edit_text(message, parse_mode='HTML', disable_web_page_preview=True) - - logger.info(f"Webinar check completed for user {user_id}: found {len(webinars)} webinars") - - except Exception as e: - await status_message.edit_text(f"❌ Ошибка: {str(e)}") - logger.error(f"Error checking webinars for user {user_id}: {e}", exc_info=True) - - -async def error_handler(update: Update, context: ContextTypes.DEFAULT_TYPE): - """Обработчик ошибок""" - logger.error(f"Update {update} caused error {context.error}", exc_info=context.error) diff --git a/edu_master/lessons_bot/main.py b/edu_master/lessons_bot/main.py deleted file mode 100644 index 5758598..0000000 --- a/edu_master/lessons_bot/main.py +++ /dev/null @@ -1,42 +0,0 @@ -import logging -from telegram import Update -from telegram.ext import Application, CommandHandler -import config -from handlers import start, help_command, check_homework, check_webinar, error_handler - -# Настройка логирования -logging.basicConfig( - format='%(asctime)s - %(name)s - %(levelname)s - %(message)s', - level=logging.INFO -) -logger = logging.getLogger(__name__) - - -def main(): - """Запуск бота""" - if not config.BOT_TOKEN: - logger.error("LESSONS_BOT_TOKEN not set!") - return - - # Создаем приложение - application = Application.builder().token(config.BOT_TOKEN).build() - - # Регистрируем обработчики команд - application.add_handler(CommandHandler("start", start)) - application.add_handler(CommandHandler("help", help_command)) - application.add_handler(CommandHandler("check", check_homework)) - application.add_handler(CommandHandler("webinar", check_webinar)) - - # Регистрируем обработчик ошибок - application.add_error_handler(error_handler) - - # Запускаем бота - logger.info("Lessons Bot started!") - logger.info(f"PHPSESSID Bot URL: {config.PHPSESSID_BOT_URL}") - logger.info(f"n8n Webhook URL: {config.N8N_WEBHOOK_URL}") - - application.run_polling(allowed_updates=Update.ALL_TYPES) - - -if __name__ == '__main__': - main() \ No newline at end of file diff --git a/edu_master/lessons_bot/requirements.txt b/edu_master/lessons_bot/requirements.txt deleted file mode 100644 index 9753745..0000000 --- a/edu_master/lessons_bot/requirements.txt +++ /dev/null @@ -1,5 +0,0 @@ -python-telegram-bot==20.7 -requests==2.31.0 -beautifulsoup4==4.12.2 -python-dotenv==1.0.0 -lxml==4.9.3 diff --git a/edu_master/lessons_bot/utils.py b/edu_master/lessons_bot/utils.py deleted file mode 100644 index 7e3c57b..0000000 --- a/edu_master/lessons_bot/utils.py +++ /dev/null @@ -1,258 +0,0 @@ -import logging -import requests -from bs4 import BeautifulSoup -from typing import Optional, Dict, List -import config - -logger = logging.getLogger(__name__) - - -def get_phpsessid() -> Optional[str]: - """ - Получает валидный PHPSESSID через phpsessid-bot - - Returns: - str: PHPSESSID или None в случае ошибки - """ - try: - url = f"{config.PHPSESSID_BOT_URL}/get-session" - logger.info(f"Requesting PHPSESSID from {url}") - - response = requests.post(url, timeout=10) - - if response.status_code == 200: - data = response.json() - if data.get('success'): - phpsessid = data.get('phpsessid') - logger.info(f"Got PHPSESSID: {phpsessid[:10]}...") - return phpsessid - else: - logger.error(f"Failed to get PHPSESSID: {data.get('error')}") - return None - else: - logger.error(f"PHPSESSID bot returned status {response.status_code}") - return None - - except Exception as e: - logger.error(f"Error getting PHPSESSID: {e}", exc_info=True) - return None - - -def parse_webinar_table(html_content: str) -> List[Dict[str, str]]: - """ - Парсит таблицу с вебинарами - - Args: - html_content: HTML контент страницы - - Returns: - List[Dict]: Список вебинаров или пустой список - """ - try: - soup = BeautifulSoup(html_content, 'html.parser') - - # Находим таблицу с вебинарами - meetings_div = soup.find('div', {'id': 'meetings'}) - if not meetings_div: - logger.warning("meetings div not found") - return [] - - table = meetings_div.find('table', {'class': 'table table-zebra'}) - if not table: - logger.warning("table not found") - return [] - - tbody = table.find('tbody') - if not tbody: - logger.warning("tbody not found") - return [] - - rows = tbody.find_all('tr') - if not rows: - return [] - - # Проверяем на сообщение "Жодного онлайн уроку зараз" - first_row = rows[0] - td = first_row.find('td') - if td and 'Жодного онлайн уроку зараз' in td.get_text(strip=True): - logger.info("No webinars available") - return [] - - # Парсим активные вебинары - webinars = [] - for row in rows: - tds = row.find_all('td') - if len(tds) >= 4: - webinar = { - 'topic': tds[0].get_text(strip=True), - 'course': tds[1].get_text(strip=True), - 'teacher': tds[2].get_text(strip=True), - 'join_link': tds[3].find('a')['href'] if tds[3].find('a') else '' - } - webinars.append(webinar) - - logger.info(f"Parsed {len(webinars)} webinars") - return webinars - - except Exception as e: - logger.error(f"Error parsing webinar table: {e}", exc_info=True) - return [] - - -def fetch_webinars_with_playwright() -> Optional[List[Dict[str, str]]]: - """ - Получает список активных вебинаров используя Playwright для динамического контента - - Returns: - List[Dict]: Список вебинаров или None в случае ошибки - """ - # Получаем PHPSESSID - phpsessid = get_phpsessid() - if not phpsessid: - logger.error("Failed to get PHPSESSID") - return None - - try: - # Подготавливаем cookies для Playwright - cookies = [ - { - 'name': 'PHPSESSID', - 'value': phpsessid, - 'domain': config.EDU_HOST, - 'path': '/' - } - ] - - # Запрос к Playwright серверу - playwright_request = { - 'url': config.EDU_WEBINAR_URL, - 'cookies': cookies, - 'wait_until': 'networkidle', # Ждем пока сеть успокоится - 'wait_time': config.WEBINAR_WAIT_TIME * 1000, # Дополнительное ожидание в миллисекундах - 'user_agent': 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/141.0.0.0 Safari/537.36' - } - - headers = { - 'Authorization': f'Bearer {config.PLAYWRIGHT_API_KEY}', - 'Content-Type': 'application/json' - } - - logger.info(f"Fetching webinars via Playwright from {config.EDU_WEBINAR_URL}") - logger.info(f"Will wait {config.WEBINAR_WAIT_TIME} seconds for dynamic content") - - response = requests.post( - f"{config.PLAYWRIGHT_SERVER}/render", - json=playwright_request, - headers=headers, - timeout=30 - ) - - if response.status_code != 200: - logger.error(f"Playwright server returned status {response.status_code}") - logger.error(f"Response: {response.text}") - return None - - result = response.json() - html_content = result.get('html', '') - - if not html_content: - logger.error("No HTML content in Playwright response") - return None - - # Парсим таблицу - webinars = parse_webinar_table(html_content) - return webinars - - except Exception as e: - logger.error(f"Error fetching webinars via Playwright: {e}", exc_info=True) - return None - - -def fetch_webinars() -> Optional[List[Dict[str, str]]]: - """ - Получает список активных вебинаров - Сначала пробует через Playwright (для динамического контента), - при неудаче - через обычный requests - - Returns: - List[Dict]: Список вебинаров или None в случае ошибки - """ - # Пробуем через Playwright - logger.info("Attempting to fetch via Playwright for dynamic content") - webinars = fetch_webinars_with_playwright() - - if webinars is not None: - return webinars - - # Fallback на обычный requests - logger.warning("Playwright fetch failed, falling back to simple requests") - - # Получаем PHPSESSID - phpsessid = get_phpsessid() - if not phpsessid: - logger.error("Failed to get PHPSESSID") - return None - - # Запрашиваем страницу с вебинарами - try: - headers = { - 'User-Agent': 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/141.0.0.0 Safari/537.36', - 'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8', - 'Accept-Language': 'ru-RU,ru;q=0.9,uk;q=0.8', - 'Referer': f'https://{config.EDU_HOST}/' - } - - cookies = { - 'PHPSESSID': phpsessid - } - - logger.info(f"Fetching webinars from {config.EDU_WEBINAR_URL}") - response = requests.get( - config.EDU_WEBINAR_URL, - headers=headers, - cookies=cookies, - timeout=15 - ) - - if response.status_code != 200: - logger.error(f"Failed to fetch webinars page: {response.status_code}") - return None - - # Парсим таблицу - webinars = parse_webinar_table(response.text) - return webinars - - except Exception as e: - logger.error(f"Error fetching webinars: {e}", exc_info=True) - return None - - -def format_webinar_message(webinars: List[Dict[str, str]]) -> str: - """ - Форматирует список вебинаров для отправки в Telegram - - Args: - webinars: Список вебинаров - - Returns: - str: Отформатированное сообщение - """ - if not webinars: - return "📭 Жодного онлайн уроку зараз" - - message = "🎓 Активні онлайн уроки:\n\n" - - for i, webinar in enumerate(webinars, 1): - message += f"{i}. {webinar['topic']}\n" - message += f"📚 Курс: {webinar['course']}\n" - message += f"👨‍🏫 Вчитель: {webinar['teacher']}\n" - - if webinar['join_link']: - full_link = webinar['join_link'] - if not full_link.startswith('http'): - full_link = f"https://{config.EDU_HOST}{webinar['join_link']}" - message += f"🔗 Увійти до уроку\n" - - message += "\n" - - return message \ No newline at end of file diff --git a/edu_master/nginx/entrypoint.sh b/edu_master/nginx/entrypoint.sh deleted file mode 100644 index 349f084..0000000 --- a/edu_master/nginx/entrypoint.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -set -e - -# Replace environment variables in the Nginx configuration template -envsubst '${MINIO_PRIVATE_BUCKET} ${MINIO_PUBLIC_BUCKET}' < /etc/nginx/conf.d/default.conf.template > /etc/nginx/conf.d/default.conf - -# Start Nginx -exec nginx -g 'daemon off;' diff --git a/edu_master/nginx/nginx.conf b/edu_master/nginx/nginx.conf deleted file mode 100644 index 84925e2..0000000 --- a/edu_master/nginx/nginx.conf +++ /dev/null @@ -1,87 +0,0 @@ -server { - listen 80; - server_name localhost; - client_max_body_size 100M; - - # Frontend - location / { - proxy_pass http://frontend:80; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - } - - # API - location /api/ { - proxy_pass http://app:9000; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - } - - # MCP - location ~ ^/(sse|messages) { - proxy_pass http://mcp:3000; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - - - # Important SSE settings - proxy_http_version 1.1; - proxy_set_header Connection ""; - - # Disable buffering so events are sent immediately - proxy_buffering off; - proxy_cache off; - - # Increase timeouts so connection stays open - proxy_read_timeout 3600s; - proxy_send_timeout 3600s; - } - - - # MinIO private bucket - location /${MINIO_PRIVATE_BUCKET}/ { - proxy_pass http://minio:9000/${MINIO_PRIVATE_BUCKET}/; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_buffering off; - } - - # MinIO public bucket - location /${MINIO_PUBLIC_BUCKET}/ { - proxy_pass http://minio:9000/${MINIO_PUBLIC_BUCKET}/; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_buffering off; - } - - # MinIO API - for direct S3 operations - # location /minio/api/ { - # proxy_pass http://minio:9000/; - # proxy_set_header Host $host; - # proxy_set_header X-Real-IP $remote_addr; - # proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - # proxy_set_header X-Forwarded-Proto $scheme; - # proxy_buffering off; - # } - - # MinIO Console - location /minio-console/ { - proxy_pass http://minio:9001/; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - # Rewrite location headers - proxy_redirect / /minio-console/; - } -} \ No newline at end of file diff --git a/edu_master/phpsessid-bot/Dockerfile b/edu_master/phpsessid-bot/Dockerfile new file mode 100644 index 0000000..b66780c --- /dev/null +++ b/edu_master/phpsessid-bot/Dockerfile @@ -0,0 +1,15 @@ +FROM python:3.11-slim + +WORKDIR /app + +# Install system dependencies +RUN apt-get update && apt-get install -y redis-tools && rm -rf /var/lib/apt/lists/* + +# Install dependencies +RUN pip install requests redis + +# Copy application code +COPY . . + +# Run the bot +CMD ["python", "bot.py"] diff --git a/edu_master/phpsessid-bot/bot.py b/edu_master/phpsessid-bot/bot.py new file mode 100644 index 0000000..d74cc76 --- /dev/null +++ b/edu_master/phpsessid-bot/bot.py @@ -0,0 +1,129 @@ +import os +import time +import requests +import logging +import redis +from datetime import datetime + +# Configure logging +logging.basicConfig( + level=logging.INFO, + format='%(asctime)s - %(levelname)s - %(message)s' +) +logger = logging.getLogger(__name__) + +# Load configuration (adapted to .env keys) +def _env(key, default=None): + v = os.getenv(key, default) + if isinstance(v, str) and len(v) >= 2 and ((v[0] == '"' and v[-1] == '"') or (v[0] == "'" and v[-1] == "'")): + return v[1:-1] + return v + +LOGIN = _env('KEEPER_LOGIN') +PASSWORD = _env('KEEPER_PASSWORD') + +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' + +def touch_success_file(): + """Updates the timestamp of the success file for healthchecks.""" + try: + with open(SUCCESS_FILE, 'w') as f: + f.write(str(datetime.now().timestamp())) + except Exception as e: + logger.error(f"Failed to touch success file: {e}") + +def main(): + logger.info("Starting Session Keeper Bot") + + # Connect to Redis + try: + redis_client = redis.Redis(host=REDIS_HOST, port=REDIS_PORT, decode_responses=True) + redis_client.ping() + logger.info(f"Connected to Redis at {REDIS_HOST}:{REDIS_PORT}") + except Exception as e: + logger.error(f"Failed to connect to Redis: {e}") + return + + session = requests.Session() + + # Set headers + headers = { + 'User-Agent': USER_AGENT, + 'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7', + 'Accept-Language': 'en-US,en;q=0.9', + 'Cache-Control': 'max-age=0', + 'Upgrade-Insecure-Requests': '1', + 'Sec-Fetch-Site': 'same-origin', + 'Sec-Fetch-Mode': 'navigate', + 'Sec-Fetch-User': '?1', + 'Sec-Fetch-Dest': 'document', + 'Sec-Ch-Ua': '"Not_A Brand";v="99", "Chromium";v="142"', + 'Sec-Ch-Ua-Mobile': '?0', + 'Sec-Ch-Ua-Platform': '"Linux"', + 'Accept-Encoding': 'gzip, deflate, br', + 'Priority': 'u=0, i' + } + session.headers.update(headers) + + while True: + try: + logger.info("Attempting login...") + + # Login payload + payload = { + 'login': LOGIN, + 'password': PASSWORD + } + + # Perform Login + # Note: The user request shows a POST to /user/login with form data + # We need to make sure we handle the PHPSESSID correctly. + # If we already have a PHPSESSID, requests will send it. + + login_response = session.post(URL_LOGIN, data=payload, allow_redirects=True) + + logger.info(f"Login Response Status: {login_response.status_code}") + logger.info(f"Cookies after login: {session.cookies.get_dict()}") + + # Verify Session + logger.info("Verifying session...") + verify_response = session.get(URL_VERIFY, allow_redirects=False) + + logger.info(f"Verify Response Status: {verify_response.status_code}") + + if verify_response.status_code == 200: + logger.info("Session verification SUCCESS (200 OK).") + touch_success_file() + + # Save PHPSESSID to Redis + phpsessid = session.cookies.get('PHPSESSID') + if phpsessid: + try: + redis_client.set('EDU_PHPSESSID', phpsessid) + logger.info(f"Saved PHPSESSID to Redis: {phpsessid}") + except Exception as e: + logger.error(f"Failed to save PHPSESSID to Redis: {e}") + elif verify_response.status_code == 302: + logger.warning("Session verification FAILED (302 Redirect). Session might be invalid.") + else: + logger.warning(f"Session verification returned unexpected status: {verify_response.status_code}") + + except Exception as e: + logger.error(f"An error occurred: {e}") + + logger.info(f"Sleeping for {INTERVAL} minutes...") + time.sleep(INTERVAL * 60) + +if __name__ == "__main__": + main() diff --git a/edu_master/phpsessid_bot/Dockerfile b/edu_master/phpsessid_bot/Dockerfile deleted file mode 100644 index 6506397..0000000 --- a/edu_master/phpsessid_bot/Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -FROM python:3.11-slim - -WORKDIR /app - -# Устанавливаем зависимости -RUN pip install --no-cache-dir flask requests - -# Копируем код бота -COPY main.py . - -# Открываем порт -EXPOSE 5000 - -# Запускаем бот -CMD ["python", "-u", "main.py"] diff --git a/edu_master/phpsessid_bot/main.py b/edu_master/phpsessid_bot/main.py deleted file mode 100644 index 50afec9..0000000 --- a/edu_master/phpsessid_bot/main.py +++ /dev/null @@ -1,216 +0,0 @@ -import os -import logging -from flask import Flask, request, jsonify -import requests -from datetime import datetime - -# Настройка логирования -logging.basicConfig( - level=logging.INFO, - format='%(asctime)s - %(name)s - %(levelname)s - %(message)s' -) -logger = logging.getLogger(__name__) - -app = Flask(__name__) - -# Конфигурация из переменных окружения -EDU_HOST = os.getenv('EDU_HOST', 'edu.edu.vn.ua') -EDU_LOGIN = os.getenv('EDU_LOGIN', '') -EDU_PASSWORD = os.getenv('EDU_PASSWORD', '') -BOT_PORT = int(os.getenv('BOT_PORT', '5000')) -BOT_HOST = os.getenv('BOT_HOST', '0.0.0.0') - -# Кэш для хранения актуальной сессии -session_cache = { - 'phpsessid': None, - 'expires_at': None -} - - -def login_and_get_session(): - """ - Выполняет логин и возвращает новый PHPSESSID - """ - url = f"https://{EDU_HOST}/user/login" - - headers = { - 'Cache-Control': 'max-age=0', - 'Sec-Ch-Ua': '"Chromium";v="141", "Not?A_Brand";v="8"', - 'Sec-Ch-Ua-Mobile': '?0', - 'Sec-Ch-Ua-Platform': '"Linux"', - 'Accept-Language': 'ru-RU,ru;q=0.9', - 'Origin': f'https://{EDU_HOST}', - 'Content-Type': 'application/x-www-form-urlencoded', - 'Upgrade-Insecure-Requests': '1', - 'User-Agent': 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/141.0.0.0 Safari/537.36', - 'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7', - 'Sec-Fetch-Site': 'same-origin', - 'Sec-Fetch-Mode': 'navigate', - 'Sec-Fetch-User': '?1', - 'Sec-Fetch-Dest': 'document', - 'Referer': f'https://{EDU_HOST}/', - 'Accept-Encoding': 'gzip, deflate, br', - 'Priority': 'u=0, i' - } - - data = { - 'login': EDU_LOGIN, - 'password': EDU_PASSWORD - } - - try: - logger.info(f"Attempting login to {url}") - response = requests.post( - url, - data=data, - headers=headers, - allow_redirects=False, - timeout=10 - ) - - # Получаем PHPSESSID из cookies - phpsessid = response.cookies.get('PHPSESSID') - - if phpsessid: - logger.info(f"Login successful, got PHPSESSID: {phpsessid[:10]}...") - return { - 'success': True, - 'phpsessid': phpsessid, - 'status_code': response.status_code - } - else: - logger.warning(f"Login failed: no PHPSESSID in response. Status: {response.status_code}") - return { - 'success': False, - 'error': 'No PHPSESSID in response', - 'status_code': response.status_code - } - - except requests.exceptions.RequestException as e: - logger.error(f"Login request failed: {str(e)}") - return { - 'success': False, - 'error': str(e) - } - - -def validate_phpsessid(phpsessid): - """ - Проверяет валидность существующего PHPSESSID - """ - url = f"https://{EDU_HOST}/" - - headers = { - 'User-Agent': 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/141.0.0.0 Safari/537.36', - 'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8' - } - - cookies = { - 'PHPSESSID': phpsessid - } - - try: - response = requests.get(url, headers=headers, cookies=cookies, timeout=10) - - # Проверяем, не редиректит ли на страницу логина - is_valid = response.status_code == 200 and '/user/login' not in response.url - - return { - 'valid': is_valid, - 'status_code': response.status_code, - 'url': response.url - } - except requests.exceptions.RequestException as e: - logger.error(f"Validation request failed: {str(e)}") - return { - 'valid': False, - 'error': str(e) - } - - -@app.route('/health', methods=['GET']) -def health(): - """Health check endpoint""" - return jsonify({'status': 'ok', 'timestamp': datetime.now().isoformat()}) - - -@app.route('/get-session', methods=['POST', 'GET']) -def get_session(): - """ - Основной endpoint для получения валидного PHPSESSID - Возвращает кэшированную сессию или создает новую - """ - result = login_and_get_session() - - if result['success']: - session_cache['phpsessid'] = result['phpsessid'] - session_cache['last_updated'] = datetime.now().isoformat() - - return jsonify({ - 'success': True, - 'phpsessid': result['phpsessid'], - 'timestamp': datetime.now().isoformat() - }) - else: - return jsonify({ - 'success': False, - 'error': result.get('error', 'Login failed'), - 'timestamp': datetime.now().isoformat() - }), 400 - - -@app.route('/validate-session', methods=['POST']) -def validate_session(): - """ - Проверяет валидность переданного PHPSESSID - """ - data = request.get_json() or {} - phpsessid = data.get('phpsessid') or request.args.get('phpsessid') - - if not phpsessid: - return jsonify({ - 'success': False, - 'error': 'PHPSESSID not provided' - }), 400 - - validation_result = validate_phpsessid(phpsessid) - - return jsonify({ - 'success': True, - 'valid': validation_result.get('valid', False), - 'details': validation_result, - 'timestamp': datetime.now().isoformat() - }) - - -@app.route('/refresh-session', methods=['POST', 'GET']) -def refresh_session(): - """ - Принудительно обновляет сессию - """ - result = login_and_get_session() - - if result['success']: - return jsonify({ - 'success': True, - 'phpsessid': result['phpsessid'], - 'message': 'Session refreshed successfully', - 'timestamp': datetime.now().isoformat() - }) - else: - return jsonify({ - 'success': False, - 'error': result.get('error', 'Failed to refresh session'), - 'timestamp': datetime.now().isoformat() - }), 400 - - -if __name__ == '__main__': - if not EDU_LOGIN or not EDU_PASSWORD: - logger.error("EDU_LOGIN and EDU_PASSWORD must be set!") - exit(1) - - logger.info(f"Starting PHPSESSID validator bot on {BOT_HOST}:{BOT_PORT}") - logger.info(f"Target host: {EDU_HOST}") - - app.run(host=BOT_HOST, port=BOT_PORT, debug=False) \ No newline at end of file diff --git a/edu_master/phpsessid_bot/requirements.txt b/edu_master/phpsessid_bot/requirements.txt deleted file mode 100644 index 4614e8a..0000000 --- a/edu_master/phpsessid_bot/requirements.txt +++ /dev/null @@ -1,3 +0,0 @@ -flask==3.0.0 -requests==2.31.0 -Werkzeug==3.0.1 diff --git a/edu_master/webinar-checker/Dockerfile b/edu_master/webinar-checker/Dockerfile new file mode 100644 index 0000000..ec581f7 --- /dev/null +++ b/edu_master/webinar-checker/Dockerfile @@ -0,0 +1,10 @@ +FROM python:3.11-slim + +WORKDIR /app + +# Install dependencies +RUN pip install --upgrade pip && pip install playwright==1.56.0 redis requests "python-telegram-bot[job-queue]" + +COPY checker.py . + +CMD ["python", "checker.py"] diff --git a/edu_master/webinar-checker/checker.py b/edu_master/webinar-checker/checker.py new file mode 100644 index 0000000..65043cf --- /dev/null +++ b/edu_master/webinar-checker/checker.py @@ -0,0 +1,665 @@ +import os +import logging +import redis +import json + +from telegram import Update, InlineKeyboardButton, InlineKeyboardMarkup, ChatMember +from telegram.constants import ChatType +from telegram.ext import Application, CommandHandler, CallbackQueryHandler, ContextTypes +from playwright.async_api import async_playwright + +# Logger +logging.basicConfig( + level=logging.INFO, + format='%(asctime)s - %(levelname)s - %(message)s' +) +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): + v = os.getenv(key, default) + if isinstance(v, str) and len(v) >= 2 and ((v[0] == '"' and v[-1] == '"') or (v[0] == "'" and v[-1] == "'")): + return v[1:-1] + return v + +EDU_BASE = _env('EDU_URL_BASE', 'https://edu.edu.vn.ua') +EDU_WEBINAR_PATH = _env('EDU_URL_WEBINAR', '/webinar/useractive') +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 + +# Initialize Redis +try: + redis_client = redis.Redis(host=REDIS_HOST, port=REDIS_PORT, decode_responses=True) + redis_client.ping() + logger.info(f"Connected to Redis at {REDIS_HOST}:{REDIS_PORT}") +except Exception as e: + logger.error(f"Failed to connect to Redis: {e}") + exit(1) + +# --- Translations --- + +TRANSLATIONS = { + 'ru': { + 'welcome': "👋 Привет, {name}!\n\nЯ бот-уведомитель о вебинарах. Я буду сообщать вам, когда появится новый вебинар.\nВы подписаны на уведомления.", + 'welcome_admin': "\n\n👑 Режим администратора активен", + 'access_denied': "⛔ Доступ запрещен. Вас нет в белом списке.", + 'help_title': "🤖 Помощь по боту\n\n", + 'help_commands': "/start - Подписаться на уведомления\n/stop - Отписаться от уведомлений\n/help - Показать это сообщение\n/language - Сменить язык", + 'help_admin': "\nКоманды администратора:\n/adduser [user_id] - Добавить пользователя в белый список\n/removeuser [user_id] - Удалить пользователя из белого списка\nИли используйте панель ниже для управления настройками.", + 'admin_only': "⛔ Только для администратора!", + 'user_added': "✅ Пользователь {user_id} добавлен в белый список", + 'user_removed': "✅ Пользователь {user_id} удален из белого списка", + 'user_not_in_whitelist': "⚠️ Пользователь {user_id} не был в белом списке", + 'cannot_remove_admin': "❌ Невозможно удалить администратора из белого списка", + 'invalid_user_id': "❌ Неверный ID пользователя. Должно быть число.", + 'usage_adduser': "Использование: /adduser [user_id]", + 'usage_removeuser': "Использование: /removeuser [user_id]", + 'whitelist_enabled': "✅ Белый список включен", + 'whitelist_disabled': "✅ Белый список отключен", + 'whitelist_title': "📋 Белый список:\n", + 'subscribers_title': "👥 Подписчики:\n", + 'empty': "Пусто", + 'force_check_running': "🔄 Запускаю проверку...", + 'check_failed': "❌ Проверка не удалась. Смотрите логи.", + 'check_completed_none': "✅ Проверка завершена. Вебинаров не найдено.", + 'check_completed': "✅ Проверка завершена. Найдено {count} вебинар(ов)!", + 'toggle_whitelist_disable': "🔒 Отключить белый список", + 'toggle_whitelist_enable': "🔓 Включить белый список", + 'view_whitelist': "📋 Посмотреть белый список", + 'view_subscribers': "👥 Посмотреть подписчиков", + 'force_check': "🔄 Принудительная проверка", + 'webinar_found': "🎓 Новый вебинар!\n\n", + 'webinar_item': "📌 {name}\n🔗 https://edu.edu.vn.ua{url}", + 'select_language': "🌐 Выберите язык / Оберіть мову / Select language:", + 'language_changed': "✅ Язык изменен на русский", + 'flag_ru': "🇷🇺 Русский", + 'flag_uk': "🇺🇦 Українська", + 'flag_en': "🇬🇧 English", + 'history_cleared': "✅ История вебинаров очищена", + 'history_clear_failed': "❌ Ошибка при очистке истории", + }, + 'uk': { + 'welcome': "👋 Привіт, {name}!\n\nЯ бот-сповіщувач про вебінари. Я повідомлятиму вас, коли з'явиться новий вебінар.\nВи підписані на сповіщення.", + 'welcome_admin': "\n\n👑 Режим адміністратора активний", + 'access_denied': "⛔ Доступ заборонено. Вас немає в білому списку.", + 'help_title': "🤖 Довідка по боту\n\n", + 'help_commands': "/start - Підписатися на сповіщення\n/stop - Відписатися від сповіщень\n/help - Показати це повідомлення\n/language - Змінити мову", + 'help_admin': "\nКоманди адміністратора:\n/adduser [user_id] - Додати користувача до білого списку\n/removeuser [user_id] - Видалити користувача з білого списку\nАбо використовуйте панель нижче для керування налаштуваннями.", + 'admin_only': "⛔ Тільки для адміністратора!", + 'user_added': "✅ Користувач {user_id} доданий до білого списку", + 'user_removed': "✅ Користувач {user_id} видалений з білого списку", + 'user_not_in_whitelist': "⚠️ Користувач {user_id} не був у білому списку", + 'cannot_remove_admin': "❌ Неможливо видалити адміністратора з білого списку", + 'invalid_user_id': "❌ Невірний ID користувача. Має бути число.", + 'usage_adduser': "Використання: /adduser [user_id]", + 'usage_removeuser': "Використання: /removeuser [user_id]", + 'whitelist_enabled': "✅ Білий список увімкнено", + 'whitelist_disabled': "✅ Білий список вимкнено", + 'whitelist_title': "📋 Білий список:\n", + 'subscribers_title': "👥 Підписники:\n", + 'empty': "Порожньо", + 'force_check_running': "🔄 Запускаю перевірку...", + 'check_failed': "❌ Перевірка не вдалася. Дивіться логи.", + 'check_completed_none': "✅ Перевірка завершена. Вебінарів не знайдено.", + 'check_completed': "✅ Перевірка завершена. Знайдено {count} вебінар(ів)!", + 'toggle_whitelist_disable': "🔒 Вимкнути білий список", + 'toggle_whitelist_enable': "🔓 Увімкнути білий список", + 'view_whitelist': "📋 Переглянути білий список", + 'view_subscribers': "👥 Переглянути підписників", + 'force_check': "🔄 Примусова перевірка", + 'webinar_found': "🎓 Новий вебінар!\n\n", + 'webinar_item': "📌 {name}\n🔗 https://edu.edu.vn.ua{url}", + 'select_language': "🌐 Виберіть мову / Выберите язык / Select language:", + 'language_changed': "✅ Мову змінено на українську", + '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👑 Admin Mode Active", + 'access_denied': "⛔ Access denied. You are not on the whitelist.", + 'help_title': "🤖 Bot Help\n\n", + 'help_commands': "/start - Subscribe to notifications\n/stop - Unsubscribe from notifications\n/help - Show this message\n/language - Change language", + 'help_admin': "\nAdmin Commands:\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", + 'user_removed': "✅ User {user_id} removed from whitelist", + 'user_not_in_whitelist': "⚠️ User {user_id} was not in whitelist", + 'cannot_remove_admin': "❌ Cannot remove admin from whitelist", + 'invalid_user_id': "❌ Invalid user ID. Must be a number.", + 'usage_adduser': "Usage: /adduser [user_id]", + 'usage_removeuser': "Usage: /removeuser [user_id]", + 'whitelist_enabled': "✅ Whitelist Enabled", + 'whitelist_disabled': "✅ Whitelist Disabled", + 'whitelist_title': "📋 Whitelist:\n", + 'subscribers_title': "👥 Subscribers:\n", + 'empty': "Empty", + 'force_check_running': "🔄 Running immediate check...", + 'check_failed': "❌ Check failed. See logs for details.", + 'check_completed_none': "✅ Check completed. No webinars found.", + 'check_completed': "✅ Check completed. Found {count} webinar(s)!", + 'toggle_whitelist_disable': "🔒 Disable Whitelist", + 'toggle_whitelist_enable': "🔓 Enable Whitelist", + 'view_whitelist': "📋 View Whitelist", + 'view_subscribers': "👥 View Subscribers", + 'force_check': "🔄 Force Check", + 'webinar_found': "🎓 New webinar found!\n\n", + 'webinar_item': "📌 {name}\n🔗 https://edu.edu.vn.ua{url}", + 'select_language': "🌐 Select language / Виберіть мову / Выберите язык:", + 'language_changed': "✅ Language changed to English", + 'flag_ru': "🇷🇺 Русский", + 'flag_uk': "🇺🇦 Українська", + 'flag_en': "🇬🇧 English", + 'history_cleared': "✅ Webinar history cleared", + 'history_clear_failed': "❌ Error clearing history", + } +} + +# --- Language Helper Functions --- + +def get_user_language(user_id: int) -> str: + """Get user's preferred language from Redis. Default: Ukrainian.""" + lang = redis_client.get(f"user:{user_id}:language") + return lang if lang in ['ru', 'uk', 'en'] else 'uk' + +def set_user_language(user_id: int, lang: str): + """Save user's language preference to Redis.""" + if lang in ['ru', 'uk', 'en']: + redis_client.set(f"user:{user_id}:language", lang) + logger.info(f"User {user_id} language set to {lang}") + +def t(user_id: int, key: str, **kwargs) -> str: + """Translate message for user with optional formatting.""" + lang = get_user_language(user_id) + message = TRANSLATIONS.get(lang, TRANSLATIONS['uk']).get(key, key) + if kwargs: + return message.format(**kwargs) + return message + +def get_language_keyboard(): + """Generate language selection keyboard.""" + keyboard = [ + [ + InlineKeyboardButton("🇷🇺 Русский", callback_data="lang_ru"), + InlineKeyboardButton("🇺🇦 Українська", callback_data="lang_uk"), + ], + [ + InlineKeyboardButton("🇬🇧 English", callback_data="lang_en"), + ] + ] + return InlineKeyboardMarkup(keyboard) + +# --- Helper Functions --- + +def is_whitelisted(user_id: int) -> bool: + """Check if user is allowed to use the bot.""" + if user_id == ADMIN_ID: + return True + + enabled = redis_client.get(KEY_WHITELIST_ENABLED) + if enabled == "0": # Whitelist disabled + return True + + 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" + toggle_text = t(user_id, 'toggle_whitelist_disable') if whitelist_enabled else t(user_id, 'toggle_whitelist_enable') + + keyboard = [ + [InlineKeyboardButton(toggle_text, callback_data="toggle_whitelist")], + [InlineKeyboardButton(t(user_id, 'view_whitelist'), callback_data="view_whitelist")], + [InlineKeyboardButton(t(user_id, 'view_subscribers'), callback_data="view_subscribers")], + [InlineKeyboardButton(t(user_id, 'force_check'), callback_data="force_check")] + ] + return InlineKeyboardMarkup(keyboard) + +# --- Command Handlers --- + +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 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!) + redis_client.sadd(KEY_SUBSCRIBERS, chat.id) + + msg = t(chat.id, 'welcome', name=user.first_name) + + if user.id == ADMIN_ID and chat.type == "private": + msg += t(chat.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') + +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(chat_id, 'help_title') + t(chat_id, 'help_commands') + + if user_id == ADMIN_ID and update.effective_chat.type == "private": + msg += t(chat_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 + 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'), + parse_mode='HTML', + reply_markup=get_language_keyboard() + ) + +async def add_user(update: Update, context: ContextTypes.DEFAULT_TYPE): + """Add user to whitelist (admin only).""" + admin_id = update.effective_user.id + if admin_id != ADMIN_ID: + await update.message.reply_text(t(admin_id, 'admin_only')) + return + + if not context.args: + await update.message.reply_text(t(admin_id, 'usage_adduser')) + return + + try: + user_id = int(context.args[0]) + redis_client.sadd(KEY_WHITELIST, str(user_id)) + await update.message.reply_text(t(admin_id, 'user_added', user_id=user_id)) + logger.info(f"Admin added user {user_id} to whitelist") + except ValueError: + await update.message.reply_text(t(admin_id, 'invalid_user_id')) + +async def remove_user(update: Update, context: ContextTypes.DEFAULT_TYPE): + """Remove user from whitelist (admin only).""" + admin_id = update.effective_user.id + if admin_id != ADMIN_ID: + await update.message.reply_text(t(admin_id, 'admin_only')) + return + + if not context.args: + await update.message.reply_text(t(admin_id, 'usage_removeuser')) + return + + try: + user_id = int(context.args[0]) + if str(user_id) == str(ADMIN_ID): + await update.message.reply_text(t(admin_id, 'cannot_remove_admin')) + return + + removed = redis_client.srem(KEY_WHITELIST, str(user_id)) + if removed: + await update.message.reply_text(t(admin_id, 'user_removed', user_id=user_id)) + logger.info(f"Admin removed user {user_id} from whitelist") + else: + await update.message.reply_text(t(admin_id, 'user_not_in_whitelist', user_id=user_id)) + 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): + """Handle admin panel button clicks.""" + query = update.callback_query + user_id = query.from_user.id + + if user_id != ADMIN_ID: + await query.answer(t(user_id, 'admin_only'), show_alert=True) + return + + await query.answer() + data = query.data + + if data == "toggle_whitelist": + current = redis_client.get(KEY_WHITELIST_ENABLED) + new_state = "0" if current != "0" else "1" + redis_client.set(KEY_WHITELIST_ENABLED, new_state) + state_text = t(user_id, 'whitelist_disabled') if new_state == "0" else t(user_id, 'whitelist_enabled') + await query.edit_message_reply_markup(reply_markup=get_admin_keyboard(user_id)) + await query.message.reply_text(state_text) + + elif data == "view_whitelist": + members = redis_client.smembers(KEY_WHITELIST) + msg = t(user_id, 'whitelist_title') + ("\n".join(members) if members else t(user_id, 'empty')) + await query.message.reply_text(msg, parse_mode='HTML') + + elif data == "view_subscribers": + subs = redis_client.smembers(KEY_SUBSCRIBERS) + msg = t(user_id, 'subscribers_title') + ("\n".join(subs) if subs else t(user_id, 'empty')) + await query.message.reply_text(msg, parse_mode='HTML') + + elif data == "force_check": + await query.message.reply_text(t(user_id, 'force_check_running')) + result = await check_webinars_job(context) + + if result is None: + await query.message.reply_text(t(user_id, 'check_failed')) + elif result == 0: + await query.message.reply_text(t(user_id, 'check_completed_none')) + else: + await query.message.reply_text(t(user_id, 'check_completed', count=result)) + +async def language_callback(update: Update, context: ContextTypes.DEFAULT_TYPE): + """Handle language selection button clicks.""" + query = update.callback_query + user_id = query.from_user.id + data = query.data + + if data.startswith("lang_"): + lang = data.split("_")[1] + set_user_language(user_id, lang) + await query.answer() + await query.edit_message_text( + t(user_id, 'language_changed'), + parse_mode='HTML' + ) + +# --- Webinar Checking Job --- + +def get_webinar_key(url: str) -> str: + """Generate unique key for a webinar based on URL.""" + return url + +def get_stored_webinars() -> list: + """Get list of stored webinar keys from Redis.""" + data = redis_client.get(KEY_WEBINAR_HISTORY) + if data: + try: + return json.loads(data) + except Exception as e: + logger.error(f"Failed to parse webinar history: {e}") + return [] + +def store_webinars(webinar_keys: list): + """Store up to 3 most recent webinar keys in Redis.""" + # Keep only last 3 + webinar_keys = webinar_keys[-3:] + try: + redis_client.set(KEY_WEBINAR_HISTORY, json.dumps(webinar_keys)) + logger.info(f"Stored {len(webinar_keys)} webinar(s) in history") + except Exception as e: + logger.error(f"Failed to store webinar history: {e}") + +async def check_webinars_job(context: ContextTypes.DEFAULT_TYPE): + """Background job to check for webinars using Async Playwright. + + Returns: + int: Number of webinars found, or None if check failed + """ + logger.info("Running webinar check...") + + phpsessid = redis_client.get(KEY_PHPSESSID) + if not phpsessid: + logger.warning("PHPSESSID missing. Skipping check.") + # --- DEBUG LOGGING --- + try: + with open('phpsessid_missing.log', 'a') as f: + f.write(f"[{os.getcwd()}] PHPSESSID missing at {context.job.last_run: %Y-%m-%d %H:%M:%S}\n") + except Exception as e: + logger.error(f"Failed to write PHPSESSID debug log: {e}") + # --------------------- + return None + + current_webinars = [] # List of dicts with name, url, and formatted text + content = "" + + try: + async with async_playwright() as p: + # Connect to remote Playwright service + browser = await p.chromium.connect(PLAYWRIGHT_WS) + + try: + # Create browser context with user agent + context_browser = await browser.new_context(user_agent=USER_AGENT) + + # Add PHPSESSID cookie + await context_browser.add_cookies([{ + 'name': 'PHPSESSID', + 'value': phpsessid, + 'domain': 'edu.edu.vn.ua', + 'path': '/' + }]) + + # Create new page + page = await context_browser.new_page() + + try: + # Navigate to webinar page + await page.goto(WEBINAR_URL, wait_until='domcontentloaded') + + # Wait for the table to load + await page.wait_for_selector('#meetings table', timeout=10000) + await page.wait_for_timeout(2000) + + # Get page content + content = await page.content() + + # Check if "no webinar" message is present + if "Жодного онлайн уроку зараз" not in content: + logger.info("!!! WEBINAR FOUND !!!") + + # Extract webinar details from table rows + rows = page.locator('#meetings table tbody tr') + count = await rows.count() + + for i in range(count): + row = rows.nth(i) + text = await row.inner_text() + + if "Жодного онлайн уроку зараз" not in text: + # Extract name (topic) from first column + name_elem = row.locator('td').nth(0) + name = await name_elem.inner_text() + name = name.strip() + + # Extract join URL from fourth column + url_elem = row.locator('td').nth(3).locator('a[href*="/webinar/join/"]').first + url = await url_elem.get_attribute('href') + + if name and url: + current_webinars.append({ + 'name': name, + 'url': url, + 'text': text.strip() + }) + logger.info(f"Found webinar: {name} -> {url}") + else: + logger.info("No webinars found (expected message present)") + + except Exception as e: + logger.error(f"Error checking page: {e}. Saving content for debug.") + # If page content is available, save it on error + try: + if page and not content: + content = await page.content() + except Exception: + pass # Ignore error during content retrieval on check error + + return None + finally: + await page.close() + await context_browser.close() + + finally: + await browser.close() + + except Exception as e: + logger.error(f"Playwright error: {e}") + return None + + # --- DEBUG LOGGING (Saving last response content) --- + if not current_webinars and content: #if no webinars found, save the page content + try: + with open('response.html', 'w', encoding='utf-8') as f: + f.write(content) + logger.info("Saved page content to response.html for debug.") + except Exception as e: + logger.error(f"Failed to write debug HTML: {e}") + # ----------------------------------------------------- + + # Check for NEW webinars and notify + if current_webinars: + # Get stored webinar history + stored_keys = get_stored_webinars() + logger.info(f"Stored webinar keys: {stored_keys}") + + # Find new webinars (not in history) + new_webinars = [] + current_keys = [] + + for webinar in current_webinars: + key = get_webinar_key(webinar['url']) + current_keys.append(key) + + if key not in stored_keys: + new_webinars.append(webinar) + logger.info(f"NEW webinar detected: {webinar['name']}") + + # Update stored history with current webinars + # Merge old and new, keeping only last 5 + updated_keys = stored_keys + [k for k in current_keys if k not in stored_keys] + store_webinars(updated_keys) + + # Notify subscribers ONLY about NEW webinars + if new_webinars: + subscribers = redis_client.smembers(KEY_SUBSCRIBERS) + logger.info(f"Sending notification about {len(new_webinars)} new webinar(s) to {len(subscribers)} subscriber(s)") + + 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 + ]) + message = t(int(sub_id), 'webinar_found') + webinar_items + + await context.bot.send_message(chat_id=sub_id, text=message, parse_mode='HTML') + logger.info(f"Notification sent to {sub_id}") + except Exception as e: + logger.error(f"Failed to send to {sub_id}: {e}") + else: + logger.info(f"Found {len(current_webinars)} webinar(s), but all are already known") + + return len(current_webinars) + +# --- Main --- + +def main(): + if not WEBINAR_TELEGRAM_TOKEN: + logger.error("WEBINAR_TELEGRAM_TOKEN is missing!") + return + + # Set default whitelist state if not set + if not redis_client.exists(KEY_WHITELIST_ENABLED): + redis_client.set(KEY_WHITELIST_ENABLED, "1") # Enabled by default + + # Add admin to whitelist + if ADMIN_ID: + redis_client.sadd(KEY_WHITELIST, str(ADMIN_ID)) + + app = Application.builder().token(WEBINAR_TELEGRAM_TOKEN).build() + + # 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_")) + app.add_handler(CallbackQueryHandler(admin_callback)) + + # Job Queue + job_queue = app.job_queue + job_queue.run_repeating(check_webinars_job, interval=WEBINAR_CHECK_INTERVAL, first=10) + + logger.info("Bot started polling...") + app.run_polling() + +if __name__ == "__main__": + main() \ No newline at end of file diff --git a/gitea/.env.example b/gitea/.env.example index b5a1c0a..916e272 100644 --- a/gitea/.env.example +++ b/gitea/.env.example @@ -1,3 +1,6 @@ GITEA_POSTGRES_USER= GITEA_POSTGRES_PASSWORD= -GITEA_POSTGRES_DB=gitea \ No newline at end of file +GITEA_POSTGRES_DB=gitea +GITEA_SMTP_PASS= +MAILER_ADDR= +SERVICE_EMAIL=email.used.by.services@domain.tld \ No newline at end of file diff --git a/gitea/compose.yaml b/gitea/compose.yaml index 376cda9..16ca04f 100644 --- a/gitea/compose.yaml +++ b/gitea/compose.yaml @@ -13,23 +13,58 @@ services: - GITEA__database__NAME=gitea #Server - GITEA__server__ROOT_URL=https://gitea.forust.xyz + - GITEA__server__SSH_DOMAIN=gitssh.forust.xyz - GITEA__server__SSH_PORT=2221 + # Mailer + - GITEA__mailer__ENABLED=true + - GITEA__mailer__FROM=${SERVICE_EMAIL} + - GITEA__mailer__SMTP_ADDR=${MAILER_ADDR}:465 + - GITEA__mailer__USER=${SERVICE_EMAIL} + - GITEA__mailer__PASSWD=${GITEA_SMTP_PASS} + - GITEA__mailer__PROTOCOL=SMTP + - GITEA__service__REGISTER_EMAIL_CONFIRM=true + - GITEA__service__ENABLE_NOTIFY_MAIL=true restart: always networks: - gitea-db - - traefik-proxy + - proxy volumes: - ./gitea-data:/data - /etc/timezone:/etc/timezone:ro - /etc/localtime:/etc/localtime:ro labels: - "traefik.enable=true" - - "traefik.docker.network=traefik-proxy" + - "traefik.docker.network=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`) || 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" + - "traefik.tcp.routers.gitea.entrypoints=ssh" + - "traefik.tcp.routers.gitea.rule=HostSNI(`*`)" + - "traefik.tcp.services.gitea.loadbalancer.server.port=22" ports: - "2221:22" depends_on: - db - + db: image: docker.io/library/postgres:14 restart: always @@ -41,9 +76,9 @@ services: - gitea-db volumes: - ./gitea-db/:/var/lib/postgresql/data - + networks: gitea-db: external: false - traefik-proxy: + proxy: external: true diff --git a/glance/compose.yaml b/glance/compose.yaml index f393688..2ebc851 100644 --- a/glance/compose.yaml +++ b/glance/compose.yaml @@ -10,13 +10,31 @@ services: - /var/run/docker.sock:/var/run/docker.sock:ro env_file: .env labels: - - "traefik.enable=true" - - "traefik.docker.network=traefik-proxy" + - "traefik.enable=true" + - "traefik.docker.network=proxy" + + # Prod Router + - "traefik.http.routers.glance.rule=Host(`glance.forust.xyz`)" + - "traefik.http.routers.glance.entrypoints=websecure" + - "traefik.http.routers.glance.middlewares=security-headers@file" + - "traefik.http.routers.glance.tls=true" + + # Local Router + - "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-headers@file" + - "traefik.http.routers.glance-dev.tls=true" networks: - - traefik-proxy + - proxy dns: - 1.1.1.1 - 8.8.8.8 networks: - traefik-proxy: + proxy: external: true \ No newline at end of file diff --git a/headscale/compose.yaml b/headscale/compose.yaml new file mode 100644 index 0000000..e4c299e --- /dev/null +++ b/headscale/compose.yaml @@ -0,0 +1,84 @@ +services: + server: + image: headscale/headscale:latest + restart: unless-stopped + command: serve + networks: + - proxy + volumes: + - ./config:/etc/headscale + - ./data:/var/lib/headscale + labels: + - "traefik.enable=true" + - "traefik.docker.network=proxy" + - "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" + dns: + - 1.1.1.1 + - 1.0.0.1 + web: + image: goodieshq/headscale-admin:latest + restart: unless-stopped + networks: + - proxy + labels: + - "traefik.enable=true" + - "treafik.docker.network=proxy" + - "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.service=headscale-ui" + - "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.middlewares=security-chain@file" + - "traefik.http.routers.headscale-ui-local.service=headscale-ui" + - "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.middlewares=security-chain@file" + - "traefik.http.routers.headscale-ui-dev.service=headscale-ui" + - "traefik.http.routers.headscale-ui-dev.tls=true" + +networks: + proxy: + external: true diff --git a/headscale/config/config.yaml.example b/headscale/config/config.yaml.example new file mode 100644 index 0000000..1a485bf --- /dev/null +++ b/headscale/config/config.yaml.example @@ -0,0 +1,79 @@ +# 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 diff --git a/homepage/compose.yaml b/homepage/compose.yaml deleted file mode 100644 index dc5a182..0000000 --- a/homepage/compose.yaml +++ /dev/null @@ -1,14 +0,0 @@ -services: - forust-homepage: - build: . - ports: - - "8085:80" - restart: unless-stopped - volumes: - - ./files:/usr/share/nginx/html - networks: - - traefik-proxy - -networks: - traefik-proxy: - external: true \ No newline at end of file diff --git a/homepages/Dockerfile.forust b/homepages/Dockerfile.forust new file mode 100644 index 0000000..1ad49a9 --- /dev/null +++ b/homepages/Dockerfile.forust @@ -0,0 +1,10 @@ +# everyone use that +FROM nginx:alpine + +RUN rm -rf /usr/share/nginx/html/* + +COPY ./forust_files /usr/share/nginx/html + +EXPOSE 80 +# Start +CMD ["nginx", "-g", "daemon off;"] \ No newline at end of file diff --git a/homepage/Dockerfile b/homepages/Dockerfile.xdfnx similarity index 75% rename from homepage/Dockerfile rename to homepages/Dockerfile.xdfnx index 51b2d93..e788c02 100644 --- a/homepage/Dockerfile +++ b/homepages/Dockerfile.xdfnx @@ -3,7 +3,7 @@ FROM nginx:alpine RUN rm -rf /usr/share/nginx/html/* -COPY ./files /usr/share/nginx/html +COPY ./xdfnx_files /usr/share/nginx/html EXPOSE 80 # Start diff --git a/homepages/compose.yaml b/homepages/compose.yaml new file mode 100644 index 0000000..17c3fac --- /dev/null +++ b/homepages/compose.yaml @@ -0,0 +1,82 @@ +services: + forust: + build: + context: . + dockerfile: Dockerfile.forust + # ports: + # - "8085:80" + restart: unless-stopped + volumes: + - ./forust_files:/usr/share/nginx/html + networks: + - proxy + labels: + - "traefik.enable=true" + - "traefik.docker.network=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`) || 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 + volumes: + - ./xdfnx_files:/usr/share/nginx/html + networks: + - proxy + labels: + - "traefik.enable=true" + - "traefik.docker.network=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.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`) || 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: + external: true diff --git a/homepage/files/assets/css/style.css b/homepages/forust_files/assets/css/style.css similarity index 100% rename from homepage/files/assets/css/style.css rename to homepages/forust_files/assets/css/style.css diff --git a/homepage/files/index.html b/homepages/forust_files/index.html similarity index 77% rename from homepage/files/index.html rename to homepages/forust_files/index.html index 1573d24..8aff9c9 100644 --- a/homepage/files/index.html +++ b/homepages/forust_files/index.html @@ -1,5 +1,6 @@ + @@ -8,6 +9,7 @@ +
@@ -22,24 +24,31 @@

./socials

@@ -94,31 +103,41 @@

./xrock_team

# It's a select caste. Cybershamans. Cryptoanarchists. Shadows on the net..

- +
-
+
+
MrForust
-
+
+
Anna~
-
+
+
Chernuha
-
+
+
p1ngvi
- +
-
- xdfnx +
+
+ xdfnx
@@ -152,7 +171,7 @@ - +
+ \ No newline at end of file diff --git a/homepage/files/miku.html b/homepages/forust_files/miku.html similarity index 100% rename from homepage/files/miku.html rename to homepages/forust_files/miku.html diff --git a/homepages/xdfnx_files/favicon.ico b/homepages/xdfnx_files/favicon.ico new file mode 100644 index 0000000..93ed59e Binary files /dev/null and b/homepages/xdfnx_files/favicon.ico differ diff --git a/homepages/xdfnx_files/index.html b/homepages/xdfnx_files/index.html new file mode 100644 index 0000000..8f623bd --- /dev/null +++ b/homepages/xdfnx_files/index.html @@ -0,0 +1,1142 @@ + + + + + + + xdfnx + + + + + + + +
+
+
+
+ +
+
+ + + +
+ +
+
+
Open for Complex Projects +
+

xdfnx

+

+ Senior Full Stack Engineer with a focus on system performance. + I build scalable web applications and optimize core infrastructure using Rust & + C++. +

+ +
+ Contact Me + View Work +
+ +
+
+ 6+ + Years Experience +
+
+ 20+ + Production Deploys +
+
+ 100% + Performance Focused +
+
+
+ +
+

Professional Experience

+
+ +
+

Senior Full Stack Engineer

+ TechFlow Systems + 2025 - Present +

+ Leading the backend migration to microservices. Implemented a high-throughput event processing pipeline + using Python and Rust, reducing latency by 40%. Oversaw the React frontend + architecture for the main dashboard. +

+
+ +
+

Software Engineer

+ Creative Solutions Ltd. + 2020 - 2023 +

+ Developed full-stack web applications using Node.js and TypeScript. Integrated native C++ + modules for image processing tasks, speeding up user workflows by 3x. +

+
+ +
+
+ +
+

Technical Arsenal

+
+ +
+
Modern Frontend
+
+ Frontend +
+

+ Building responsive, type-safe interfaces with a focus on UX and accessibility. +

+
+ +
+
Backend & Infra
+
+ Backend +
+

+ Scalable architectures using Node & Python. Dockerized deployments and cloud infrastructure. +

+
+ +
+
Systems & Low Level
+
+ Systems +
+

+ When JS isn't fast enough. Writing memory-safe, high-performance modules for critical paths. +

+
+ +
+
+ +
+

Selected Work

+
+ +
+
+

Fintech Analytics Engine

+
+

+ A real-time dashboard for financial data visualization. The backend aggregates streams from multiple sources + using a custom Rust service for zero-cost abstraction performance. +

+
+ Next.js + Rust + WebSockets +
+
+ +
+
+

AI Data Pipeline

+
+

+ Automated ETL pipeline processing terabytes of data. Written in Python for flexibility with + C++ bindings for heavy computational steps. +

+
+ Python + C++ + Docker +
+
+ +
+
+

Distributed Task Queue

+
+

+ Fault-tolerant job scheduler inspired by Celery but optimized for low-memory environments. +

+
+ Node.js + Redis + System Design +
+
+ +
+
+ +
+

The Team

+
+ + +
+
C
+

chernuha

+ chernuha.space +
+ + +
+
M
+

MrForust

+ forust.xyz +
+ + +
+
H
+

hudan

+ hudan.xyz +
+ +
+
+ + + +
+ + + + + \ No newline at end of file diff --git a/metube/compose.yaml b/metube/compose.yaml index 0d0d9b4..47490eb 100644 --- a/metube/compose.yaml +++ b/metube/compose.yaml @@ -4,7 +4,7 @@ services: # container_name: metube restart: unless-stopped # ports: - # - "8081:8081" + # - "8081:8081" environment: - DOWNLOAD_MODE=limited - MAX_CONCURRENT_DOWNLOADS=3 @@ -14,10 +14,32 @@ services: - ./MeTube_downloads:/downloads labels: - traefik.enable=true - - "traefik.docker.network=traefik-proxy" + - "traefik.docker.network=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`) || 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: - - traefik-proxy + - proxy networks: - traefik-proxy: - external: true \ No newline at end of file + proxy: + external: true diff --git a/n8n/compose.yaml b/n8n/compose.yaml index 390dbc8..ff73617 100644 --- a/n8n/compose.yaml +++ b/n8n/compose.yaml @@ -23,17 +23,40 @@ services: - 1.1.1.1 - 8.8.8.8 networks: - - traefik-proxy + - proxy - n8n labels: - - "traefik.enable=true" - - "traefik.docker.network=traefik-proxy" - - glance.name=n8n - - glance.icon=si:n8n - - glance.url=https://n8n.forust.xyz/ - - glance.description=n8n is a workflow automation tool that enables you to connect various apps and services to automate tasks and processes. + - "traefik.enable=true" + - "traefik.docker.network=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`) || 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 + - glance.icon=si:n8n + - glance.url=https://n8n.forust.xyz/ + - glance.description=n8n is a workflow automation tool that enables you to connect various apps and services to automate tasks and processes. networks: n8n: external: false - traefik-proxy: - external: true \ No newline at end of file + proxy: + external: true diff --git a/nextcloud/compose.yaml b/nextcloud/compose.yaml index 987c542..fa087c4 100644 --- a/nextcloud/compose.yaml +++ b/nextcloud/compose.yaml @@ -1,58 +1,86 @@ services: nextcloud-aio-mastercontainer: - image: ghcr.io/nextcloud-releases/all-in-one:latest # This is the container image used. You can switch to ghcr.io/nextcloud-releases/all-in-one:beta if you want to help testing new releases. See https://github.com/nextcloud/all-in-one#how-to-switch-the-channel + image: ghcr.io/nextcloud-releases/all-in-one:beta init: true # This setting makes sure that signals from main process inside the container are correctly forwarded to children. See https://docs.docker.com/reference/compose-file/services/#init - restart: unless-stopped # This makes sure that the container starts always together with the host OS. See https://docs.docker.com/reference/compose-file/services/#restart - container_name: nextcloud-aio-mastercontainer # This line is not allowed to be changed as otherwise AIO will not work correctly + restart: unless-stopped + container_name: nextcloud-aio-mastercontainer # Do not change volumes: - - nextcloud_aio_mastercontainer:/mnt/docker-aio-config # This line is not allowed to be changed as otherwise the built-in backup solution will not work - - /var/run/docker.sock:/var/run/docker.sock:ro # May be changed on macOS, Windows or docker rootless. See the applicable documentation. If adjusting, don't forget to also set 'WATCHTOWER_DOCKER_SOCKET_PATH'! - # network_mode: bridge # This adds the container to the same network as docker run would do. Comment this line and uncomment the line below and the networks section at the end of the file if you want to define a custom MTU size for the docker network - networks: + - nextcloud_aio_mastercontainer:/mnt/docker-aio-config # Do not change (backup) + - /var/run/docker.sock:/var/run/docker.sock:ro + networks: - nextcloud-aio - - traefik-proxy # Optional: Connects the mastercontainer to the traefik-proxy network in order to make the built-in reverse proxy detection work. - # ports: - # - 8081:80 # Can be removed 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 - # - 8888:8080 # This is the AIO interface, served via https and self-signed certificate. See https://github.com/nextcloud/all-in-one#explanation-of-used-ports - # - 8443:8443 # Can be removed 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 + - 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 + # ports: + # - 8081:80 # may be removed if under reverse-proxy + # - 8443:8443 + # - 8888:8080 # AIO + labels: - - "traefik.enable=true" - - "traefik.docker.network=traefik-proxy" - - 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. + - "traefik.enable=true" + - "traefik.docker.network=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" - environment: # Is needed when using any of the options below - AIO_DISABLE_BACKUP_SECTION: false # Setting this to true allows to hide the backup section in the AIO interface. See https://github.com/nextcloud/all-in-one#how-to-disable-the-backup-section + # Prod Router + # - "traefik.http.routers.nextcloud-aio.rule=Host(`naio.forust.xyz`)" + # - "traefik.http.routers.nextcloud-aio.entrypoints=websecure" + # - "traefik.http.routers.nextcloud-aio.middlewares=security-chain@file" + # - "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`) || 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.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" + + # 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 # Should be set when running behind a web server or reverse proxy (like Apache, Nginx, Caddy, Cloudflare Tunnel and else) that is running on the same host. 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. Needed when behind a web server or reverse proxy (like Apache, Nginx, Caddy, Cloudflare Tunnel and else) running in a different docker network on same server. 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 # Allows to adjust borgs retention policy. See https://github.com/nextcloud/all-in-one#how-to-adjust-borgs-retention-policy + 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 + 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" # Allows to adjust the fulltextsearch java options. See https://github.com/nextcloud/all-in-one#how-to-adjust-the-fulltextsearch-java-options - 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: /media/forust/nextcloud # 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 # Can be adjusted if you need more. See https://github.com/nextcloud/all-in-one#how-to-adjust-the-upload-limit-for-nextcloud - NEXTCLOUD_MAX_TIME: 3600 # Can be adjusted if you need more. See https://github.com/nextcloud/all-in-one#how-to-adjust-the-max-execution-time-for-nextcloud + 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_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 NEXTCLOUD_MEMORY_LIMIT: 512M # Can be adjusted if you need more. See https://github.com/nextcloud/all-in-one#how-to-adjust-the-php-memory-limit-for-nextcloud - # NEXTCLOUD_TRUSTED_CACERTS_DIR: /path/to/my/cacerts # CA certificates in this directory will be trusted by the OS of the nextcloud container (Useful e.g. for LDAPS) See https://github.com/nextcloud/all-in-one#how-to-trust-user-defined-certification-authorities-ca + # NEXTCLOUD_TRUSTED_CACERTS_DIR: /path/to/my/cacerts # CA certificates will be trusted by the OS of the nextcloud container See https://github.com/nextcloud/all-in-one#how-to-trust-user-defined-certification-authorities-ca 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 # This allows to add additional 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_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_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: false # 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 + 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'. Otherwise mastercontainer updates will fail. For macos it needs to be '/var/run/docker.sock' + # 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: - traefik-proxy: + proxy: external: true nextcloud-aio: driver: bridge external: false -volumes: # If you want to store the data on a different drive, see https://github.com/nextcloud/all-in-one#how-to-store-the-filesinstallation-on-a-separate-drive +volumes: + # If you want to store the data on a different drive, see https://github.com/nextcloud/all-in-one#how-to-store-the-filesinstallation-on-a-separate-drive nextcloud_aio_mastercontainer: - name: nextcloud_aio_mastercontainer # This line is not allowed to be changed as otherwise the built-in backup solution will not work \ No newline at end of file + name: nextcloud_aio_mastercontainer # Do not change diff --git a/penpot/.env.example b/penpot/.env.example new file mode 100644 index 0000000..040fc0a --- /dev/null +++ b/penpot/.env.example @@ -0,0 +1 @@ +PENPOT_SECRET_KEY=somesecretfdsfsdfds \ No newline at end of file diff --git a/penpot/compose.yaml b/penpot/compose.yaml new file mode 100644 index 0000000..3f1c5d8 --- /dev/null +++ b/penpot/compose.yaml @@ -0,0 +1,295 @@ +## Common flags: +# demo-users +# email-verification +# log-emails +# log-invitation-tokens +# login-with-github +# login-with-gitlab +# login-with-google +# login-with-ldap +# login-with-oidc +# login-with-password +# prepl-server +# registration +# secure-session-cookies +# smtp +# smtp-debug +# telemetry +# webhooks +## +## You can read more about all available flags and other +## environment variables here: +## https://help.penpot.app/technical-guide/configuration/#penpot-configuration +# +# WARNING: if you're exposing Penpot to the internet, you should remove the flags +# 'disable-secure-session-cookies' and 'disable-email-verification' +x-flags: &penpot-flags + PENPOT_FLAGS: disable-email-verification enable-prepl-server disable-secure-session-cookies login-with-github + +x-uri: &penpot-public-uri + PENPOT_PUBLIC_URI: http://localhost:9001 + +x-body-size: + # Max body size (30MiB); Used for plain requests, should never be + # greater than multi-part size + &penpot-http-body-size + PENPOT_HTTP_SERVER_MAX_BODY_SIZE: 31457280 + + # Max multipart body size (350MiB) + PENPOT_HTTP_SERVER_MAX_MULTIPART_BODY_SIZE: 367001600 + +## Penpot SECRET KEY. It serves as a master key from which other keys for subsystems +## (eg http sessions, or invitations) are derived. +## +## We recommend to use a trully randomly generated +## 512 bits base64 encoded string here. You can generate one with: +## +## python3 -c "import secrets; print(secrets.token_urlsafe(64))" +x-secret-key: &penpot-secret-key + PENPOT_SECRET_KEY: ${PENPOT_SECRET_KEY} + +networks: + penpot: + proxy: + external: true + +volumes: + penpot_postgres_v15: + penpot_assets: + penpot_traefik: + # penpot_minio: + +services: + ## Traefik service declaration example. Consider using it if you are going to expose + ## penpot to the internet, or a different host than `localhost`. + + # traefik: + # image: traefik:v3.3 + # networks: + # - penpot + # command: + # - "--api.insecure=true" + # - "--entryPoints.web.address=:80" + # - "--providers.docker=true" + # - "--providers.docker.exposedbydefault=false" + # - "--entryPoints.websecure.address=:443" + # - "--certificatesresolvers.letsencrypt.acme.tlschallenge=true" + # - "--certificatesresolvers.letsencrypt.acme.email=" + # - "--certificatesresolvers.letsencrypt.acme.storage=/traefik/acme.json" + # volumes: + # - "penpot_traefik:/traefik" + # - "/var/run/docker.sock:/var/run/docker.sock" + # ports: + # - "80:80" + # - "443:443" + + penpot-frontend: + image: "penpotapp/frontend:${PENPOT_VERSION:-latest}" + restart: always + # ports: + # - 9001:8080 + + volumes: + - penpot_assets:/opt/data/assets + + depends_on: + - penpot-backend + - penpot-exporter + + networks: + - penpot + - proxy + + labels: + - "traefik.enable=true" + - "traefik.docker.network=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`) || 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 + + volumes: + - penpot_assets:/opt/data/assets + + depends_on: + penpot-postgres: + condition: service_healthy + penpot-valkey: + condition: service_healthy + + networks: + - penpot + + ## Configuration envronment variables for the backend container. + + environment: + <<: [ *penpot-flags, *penpot-public-uri, *penpot-http-body-size, *penpot-secret-key ] + + ## The PREPL host. Mainly used for external programatic access to penpot backend + ## (example: admin). By default it will listen on `localhost` but if you are going to use + ## the `admin`, you will need to uncomment this and set the host to `0.0.0.0`. + + # PENPOT_PREPL_HOST: 0.0.0.0 + + ## Database connection parameters. Don't touch them unless you are using custom + ## postgresql connection parameters. + + PENPOT_DATABASE_URI: postgresql://penpot-postgres/penpot + PENPOT_DATABASE_USERNAME: penpot + PENPOT_DATABASE_PASSWORD: penpot + + ## Valkey (or previously redis) is used for the websockets notifications. Don't touch + ## unless the valkey container has different parameters or different name. + + PENPOT_REDIS_URI: redis://penpot-valkey/0 + + ## Default configuration for assets storage: using filesystem based with all files + ## stored in a docker volume. + + PENPOT_ASSETS_STORAGE_BACKEND: assets-fs + PENPOT_STORAGE_ASSETS_FS_DIRECTORY: /opt/data/assets + + ## Also can be configured to to use a S3 compatible storage + ## service like MiniIO. Look below for minio service setup. + + # AWS_ACCESS_KEY_ID: + # AWS_SECRET_ACCESS_KEY: + # PENPOT_ASSETS_STORAGE_BACKEND: assets-s3 + # PENPOT_STORAGE_ASSETS_S3_ENDPOINT: http://penpot-minio:9000 + # PENPOT_STORAGE_ASSETS_S3_BUCKET: + + ## Telemetry. When enabled, a periodical process will send anonymous data about this + ## instance. Telemetry data will enable us to learn how the application is used, + ## based on real scenarios. If you want to help us, please leave it enabled. You can + ## audit what data we send with the code available on github. + + PENPOT_TELEMETRY_ENABLED: true + PENPOT_TELEMETRY_REFERER: compose + # PENPOT_SMTP_DEFAULT_FROM: no-reply@example.com + # PENPOT_SMTP_DEFAULT_REPLY_TO: no-reply@example.com + # PENPOT_SMTP_HOST: penpot-mailcatch + # PENPOT_SMTP_PORT: 1025 + # PENPOT_SMTP_USERNAME: + # PENPOT_SMTP_PASSWORD: + # PENPOT_SMTP_TLS: false + # PENPOT_SMTP_SSL: false + + penpot-exporter: + image: "penpotapp/exporter:${PENPOT_VERSION:-latest}" + restart: always + + depends_on: + penpot-valkey: + condition: service_healthy + + networks: + - penpot + + environment: + <<: [ *penpot-secret-key ] + # Don't touch it; this uses an internal docker network to + # communicate with the frontend. + PENPOT_PUBLIC_URI: http://penpot-frontend:8080 + + ## Valkey (or previously Redis) is used for the websockets notifications. + PENPOT_REDIS_URI: redis://penpot-valkey/0 + + penpot-postgres: + image: "postgres:15" + restart: always + stop_signal: SIGINT + + healthcheck: + test: [ "CMD-SHELL", "pg_isready -U penpot" ] + interval: 2s + timeout: 10s + retries: 5 + start_period: 2s + + volumes: + - penpot_postgres_v15:/var/lib/postgresql/data + + networks: + - penpot + + environment: + - POSTGRES_INITDB_ARGS=--data-checksums + - POSTGRES_DB=penpot + - POSTGRES_USER=penpot + - POSTGRES_PASSWORD=penpot + + penpot-valkey: + image: valkey/valkey:8.1 + restart: always + + healthcheck: + test: [ "CMD-SHELL", "valkey-cli ping | grep PONG" ] + interval: 1s + timeout: 3s + retries: 5 + start_period: 3s + + networks: + - penpot + + environment: + # You can increase the max memory size if you have sufficient resources, + # although this should not be necessary. + - VALKEY_EXTRA_FLAGS=--maxmemory 128mb --maxmemory-policy volatile-lfu + ## A mailcatch service, used as temporal SMTP server. You can access via HTTP to the + ## port 1080 for read all emails the penpot platform has sent. Should be only used as a + ## temporal solution while no real SMTP provider is configured. + + # penpot-mailcatch: + # image: sj26/mailcatcher:latest + # restart: always + # expose: + # - '1025' + # ports: + # - "1080:1080" + # networks: + # - penpot + + ## Example configuration of MiniIO (S3 compatible object storage service); If you don't + ## have preference, then just use filesystem, this is here just for the completeness. + + # minio: + # image: "minio/minio:latest" + # command: minio server /mnt/data --console-address ":9001" + # restart: always + # + # volumes: + # - "penpot_minio:/mnt/data" + # + # environment: + # - MINIO_ROOT_USER=minioadmin + # - MINIO_ROOT_PASSWORD=minioadmin + # + # ports: + # - 9000:9000 + # - 9001:9001 diff --git a/portainer/compose.yaml b/portainer/compose.yaml index aefd9d6..c56e465 100644 --- a/portainer/compose.yaml +++ b/portainer/compose.yaml @@ -1,7 +1,7 @@ services: portainer: container_name: portainer - image: portainer/portainer-ce:lts + image: portainer/portainer-ce:latest restart: always volumes: - /var/run/docker.sock:/var/run/docker.sock @@ -10,12 +10,36 @@ services: - 9443:9443 # - 8000:8000 # Remove if you do not intend to use Edge Agents networks: - - traefik-proxy + - proxy labels: - "traefik.enable=true" - - "traefik.docker.network=traefik-proxy" + - "traefik.docker.network=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`) || 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.name=Portainer - # - glance.icon=si:portainer - glance.url=https://portainer.forust.xyz/ - glance.description=Portainer is a lightweight management UI which allows you to easily manage your Docker environments. @@ -26,5 +50,5 @@ volumes: networks: default: name: portainer_network - traefik-proxy: + proxy: external: true diff --git a/termix/compose.yaml b/termix/compose.yaml index 241fa19..92cdf52 100644 --- a/termix/compose.yaml +++ b/termix/compose.yaml @@ -3,19 +3,44 @@ services: image: ghcr.io/lukegus/termix:latest container_name: termix restart: unless-stopped - ports: - - "3331:8080" + # ports: + # - "3331:8080" volumes: - ./termix-data:/app/data environment: PORT: "8080" + labels: + - "traefik.enable=true" + - "traefik.docker.network=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`) || 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: - - traefik-proxy + - proxy networks: - traefik-proxy: + proxy: external: true volumes: termix-data: - driver: local \ No newline at end of file + driver: local diff --git a/traefik/.env.example b/traefik/.env.example new file mode 100644 index 0000000..cf72c84 --- /dev/null +++ b/traefik/.env.example @@ -0,0 +1,3 @@ +# =================================== +# Traefik envs +EMAIL=bobrovod@national.shitposting.agency diff --git a/traefik/compose.yaml b/traefik/compose.yaml index 3dcb7a9..492f401 100644 --- a/traefik/compose.yaml +++ b/traefik/compose.yaml @@ -1,20 +1,20 @@ services: traefik: - image: traefik:v3.5 + image: traefik:latest container_name: traefik restart: unless-stopped command: # API - - "--api.insecure=false" + - "--api.insecure=true" - "--api.dashboard=true" - + # Providers - "--providers.docker=true" - "--providers.docker.exposedbydefault=false" - - "--providers.docker.network=traefik-proxy" + - "--providers.docker.network=proxy" - "--providers.file.directory=/etc/traefik/dynamic" - "--providers.file.watch=true" - + # EntryPoints - "--entryPoints.web.address=:80" - "--entryPoints.websecure.address=:443" @@ -22,48 +22,70 @@ services: - "--entryPoints.web.http.redirections.entryPoint.to=websecure" - "--entryPoints.web.http.redirections.entryPoint.scheme=https" - "--entryPoints.ssh.address=:2221" - - # Let's Encrypt STAGING. CURRENTLY USING CF ORIGIN CA INSTEAD - # - "--certificatesresolvers.letsencrypt.acme.email=${EMAIL}" - # - "--certificatesresolvers.letsencrypt.acme.storage=/letsencrypt/acme.json" + + # Let's Encrypt + - "--certificatesresolvers.letsencrypt.acme.email=${EMAIL}" + - "--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" - - "--accesslog=true" - - "--accesslog.filepath=/var/log/traefik/access.log" - + # # Logging + # - "--log.level=INFO" + # - "--log.filePath=/var/log/traefik/traefik.log" + # - "--accesslog=true" + # - "--accesslog.filepath=/var/log/traefik/access.log" + labels: - "traefik.enable=true" - - "traefik.docker.network=traefik-proxy" + - "traefik.docker.network=proxy" + + # Prod Router (Dash) + - "traefik.http.routers.traefik-dashboard.rule=Host(`traefik.forust.xyz`)" + - "traefik.http.routers.traefik-dashboard.entrypoints=websecure" + - "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`) || 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.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 - # - ./traefik/letsencrypt:/letsencrypt - + - ./letsencrypt:/letsencrypt + networks: - - traefik-proxy - + - proxy + environment: - TZ=Europe/Bratislava networks: - traefik-proxy: - external: true \ No newline at end of file + proxy: + external: true diff --git a/traefik/dynamic/dynamic.bak b/traefik/dynamic/dynamic.bak deleted file mode 100644 index dc39b9b..0000000 --- a/traefik/dynamic/dynamic.bak +++ /dev/null @@ -1,328 +0,0 @@ -http: - routers: - # Traefik Dashboard (ADMIN, local only) - traefik-dashboard: - rule: "Host(`traefik.workstation`)" - entryPoints: - - websecure - service: api@internal - middlewares: - # - auth - - security-headers - tls: {} - - # Nextcloud AIO Interface (ADMIN, local is better) - nextcloud-aio: - rule: "Host(`nextcloud-aio.workstation`)" - entryPoints: - - websecure - service: nextcloud-aio - middlewares: - - security-headers - tls: {} - - # Termix (public (account required)) - termix: - rule: "Host(`termix.forust.xyz`)" - entryPoints: - - websecure - service: termix - middlewares: - - security-headers - tls: {} - - # MeTube - metube: - rule: "Host(`metube.forust.xyz`)" - entryPoints: - - websecure - service: metube - middlewares: - - metube-auth - - security-headers - tls: {} - - # Portainer (public (account required)) - portainer: - rule: "Host(`portainer.forust.xyz`)" - entryPoints: - - websecure - service: portainer - middlewares: - - security-headers - tls: {} - - # Uptime Kuma - uptime-kuma: - rule: "Host(`uptime.forust.xyz`)" - entryPoints: - - websecure - service: uptime-kuma - tls: {} - - # AdGuard Home (public (account required)) - adguard: - rule: "Host(`adguard.forust.xyz`)" - entryPoints: - - websecure - service: adguard - middlewares: - - security-headers - tls: {} - - - # Nextcloud Main (public (account required)) - nextcloud: - rule: "Host(`nextcloud.forust.xyz`)" - entrypoints: - - websecure - service: nextcloud - middlewares: - - nextcloud-chain - tls: {} - - # Dockmon (public (account required)) - dockmon: - rule: "Host(`dockmon.forust.xyz`)" - entryPoints: - - websecure - service: dockmon - middlewares: - # - dockmon-auth - - security-headers - tls: {} - - # Gitea (public (account required)) - gitea: - rule: "Host(`gitea.forust.xyz`)" - entryPoints: - - websecure - - ssh - service: gitea - middlewares: - - security-headers - tls: {} - - # # Glance (local only) - # glance: - # rule: "Host(`glance.workstation`)" - # entryPoints: - # - websecure - # service: glance - # middlewares: - # - security-headers - # tls: {} - - # Watercrawl (local only) - watercrawl: - rule: "Host(`watercrawl.workstation`)" - entryPoints: - - websecure - service: watercrawl - middlewares: - - security-headers - tls: {} - - # N8N (local only) - n8n: - rule: "Host(`n8n.workstation`)" - entryPoints: - - websecure - service: n8n - middlewares: - - security-headers - tls: {} - - - services: - # Portainer - portainer: - loadBalancer: - servers: - - url: "https://portainer:9443" - serversTransport: insecureTransport - - # AdGuard Home - adguard: - loadBalancer: - servers: - - url: "http://adguardhome:3000" - - # Nextcloud AIO Interface - nextcloud-aio: - loadBalancer: - servers: - - url: "https://nextcloud-aio-mastercontainer:8080" - serversTransport: insecureTransport - - # Nextcloud Main - nextcloud: - loadBalancer: - servers: - - url: "http://nextcloud-aio-apache:11000" - - # Uptime Kuma - uptime-kuma: - loadBalancer: - servers: - - url: "http://uptime-kuma:3001" - - # Termix - termix: - loadBalancer: - servers: - - url: "http://termix:8080" - - # Dockmon - dockmon: - loadBalancer: - servers: - - url: "https://dockmon:443" - serversTransport: insecureTransport - - # # Glance - # glance: - # loadBalancer: - # servers: - # - url: "http://glance:8080" - - # Watercrawl - watercrawl: - loadBalancer: - servers: - - url: "http://nginx:80" - - # N8N - n8n: - loadBalancer: - servers: - - url: "http://n8n:5678" - - # Gitea - gitea: - loadBalancer: - servers: - - url: "http://gitea:3000" - # MeTube - metube: - loadBalancer: - servers: - - url: "http://metube:8081" - - serversTransports: - insecureTransport: - insecureSkipVerify: true - - middlewares: - # HTTPS Redirect - redirect-https: - redirectScheme: - scheme: https - permanent: true - - # Metube Basic Auth - metube-auth: - basicAuth: - users: - - "admin:$2y$05$3Q6gyLFW3NFNp4C6elnyfupntqB6VNB/tcIAeo8NEzvaqPxOjN0iC" - # - "jeepik:$2y$05$tIKrmhd7SYOe6yImRRAfpen7hpVdF8PnSbgBTCDZ.GI0Djx.Le2bq" - realm: "MeTube Access" - - # Basic Auth Traefik Dashboard - auth: - basicAuth: - users: - - "admin:$$apr1$$57E60OUM$$JoYwmLr/uZKaTy6U4IQd9." - # - "jeepik:$2y$05$Q8QqJwSjpycVYONyk4id/.rDFApW9oL8tycRMlGttNySsDv71Rnsu" - # - "vv:" - realm: "Traefik Dashboard" - - # Basic Auth Dockmon - dockmon-auth: - basicAuth: - users: - - "admin:$$apr1$$.bCpmIHl$$dxPEKdw5aZLAwo8wUz52b1" - realm: "Dockmon Access" - - # Cloudflare IP Whitelist - cloudflare-ipwhitelist: - ipWhiteList: - sourceRange: - - "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" - - # Security Headers - security-headers: - headers: - browserXssFilter: true - contentTypeNosniff: true - forceSTSHeader: true - stsIncludeSubdomains: true - stsPreload: true - stsSeconds: 31536000 - customFrameOptionsValue: "SAMEORIGIN" - customResponseHeaders: - X-Content-Type-Options: "nosniff" - Referrer-Policy: "strict-origin-when-cross-origin" - - # Nextcloud specific headers - nextcloud-secure-headers: - headers: - hostsProxyHeaders: - - "X-Forwarded-Host" - - "X-Forwarded-Proto" - referrerPolicy: "same-origin" - customFrameOptionsValue: "SAMEORIGIN" - - # Rate limiting - rate-limit: - rateLimit: - average: 100 - burst: 50 - period: 1m - - # Nextcloud chain - nextcloud-chain: - chain: - middlewares: - - nextcloud-secure-headers - - security-headers - -# TLS Configuration -tls: - certificates: - # Cloudflare Origin CA *.forust.xyz - - certFile: /certs/cloudflare.pem - keyFile: /certs/cloudflare.key - # Local certificate - - certFile: /certs/workstation+1.pem - keyFile: /certs/workstation+1-key.pem - - stores: - default: - defaultCertificate: - # Fallback local certificate - certFile: /certs/workstation+1.pem - keyFile: /certs/workstation+1-key.pem - - options: - default: - minVersion: VersionTLS12 - sniStrict: true - cipherSuites: - - TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 - - TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 - - TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305 \ No newline at end of file diff --git a/traefik/dynamic/dynamic.yml b/traefik/dynamic/dynamic.yml index 70bbffa..7e569bd 100644 --- a/traefik/dynamic/dynamic.yml +++ b/traefik/dynamic/dynamic.yml @@ -1,4 +1,4 @@ http: serversTransports: insecureTransport: - insecureSkipVerify: true \ No newline at end of file + insecureSkipVerify: true diff --git a/traefik/dynamic/fileservers.yml.example b/traefik/dynamic/fileservers.yml.example new file mode 100644 index 0000000..8bafc4c --- /dev/null +++ b/traefik/dynamic/fileservers.yml.example @@ -0,0 +1,23 @@ +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 diff --git a/traefik/dynamic/middlewares.yml b/traefik/dynamic/middlewares.yml index 8237b09..40eddfb 100644 --- a/traefik/dynamic/middlewares.yml +++ b/traefik/dynamic/middlewares.yml @@ -5,33 +5,6 @@ http: redirectScheme: scheme: https permanent: true - - # Metube Basic Auth - metube-auth: - basicAuth: - users: - - "admin:$2y$05$3Q6gyLFW3NFNp4C6elnyfupntqB6VNB/tcIAeo8NEzvaqPxOjN0iC" - # - "jeepik:$2y$05$tIKrmhd7SYOe6yImRRAfpen7hpVdF8PnSbgBTCDZ.GI0Djx.Le2bq" - - "vv:$2y$05$JdT8AGUO9bd.E/PiCmKaoOJS1RFlXkrrmZ5mJ4f8/a1bEW39L3FbS" - - realm: "MeTube Access" - - # Basic Auth Traefik Dashboard - auth: - basicAuth: - users: - - "admin:$$apr1$$57E60OUM$$JoYwmLr/uZKaTy6U4IQd9." - # - "jeepik:$2y$05$Q8QqJwSjpycVYONyk4id/.rDFApW9oL8tycRMlGttNySsDv71Rnsu" - # - "vv:" - realm: "Traefik Dashboard" - - # Basic Auth Dockmon - dockmon-auth: - basicAuth: - users: - - "admin:$$apr1$$.bCpmIHl$$dxPEKdw5aZLAwo8wUz52b1" - realm: "Dockmon Access" - # Cloudflare IP Whitelist cloudflare-ipwhitelist: ipWhiteList: @@ -52,6 +25,29 @@ http: - "172.64.0.0/13" - "131.0.72.0/22" + # Authentik + secure headers + security-chain: + chain: + middlewares: + - authentik@file + - security-headers@file + authentik: + forwardAuth: + address: "http://authentik-server:9000/outpost.goauthentik.io/auth/traefik" + trustForwardHeader: true + authResponseHeaders: + - X-authentik-username + - X-authentik-groups + - X-authentik-email + - X-authentik-name + - X-authentik-uid + - X-authentik-jwt + - X-authentik-meta-jwks + - X-authentik-meta-outpost + - X-authentik-meta-provider + - X-authentik-meta-app + - X-authentik-meta-version + # Security Headers security-headers: headers: @@ -86,5 +82,5 @@ http: nextcloud-chain: chain: middlewares: - - nextcloud-secure-headers - - security-headers \ No newline at end of file + - nextcloud-secure-headers@file + - security-headers@file diff --git a/traefik/dynamic/nextcloud-apache.yml b/traefik/dynamic/nextcloud-apache.yml new file mode 100644 index 0000000..e7d38e3 --- /dev/null +++ b/traefik/dynamic/nextcloud-apache.yml @@ -0,0 +1,40 @@ +http: + routers: + # Nextcloud prod + nextcloud: + rule: "Host(`nextcloud.forust.xyz`)" + entrypoints: + - websecure + service: nextcloud + middlewares: + - nextcloud-chain + tls: {} + + # Nextcloud dev + nextcloud-local: + rule: "Host(`nextcloud.workstation.internal`)" + entrypoints: + - websecure + - web + service: nextcloud + middlewares: + - nextcloud-chain + tls: {} + + # Nextcloud dev + nextcloud-dev: + rule: "Host(`nextcloud.gigaforust.internal`)" + entrypoints: + - websecure + - web + service: nextcloud + middlewares: + - nextcloud-chain + tls: {} + + services: + # Nextcloud Main + nextcloud: + loadBalancer: + servers: + - url: "http://nextcloud-aio-apache:11000" diff --git a/traefik/dynamic/redirect.yml b/traefik/dynamic/redirect.yml new file mode 100644 index 0000000..334325f --- /dev/null +++ b/traefik/dynamic/redirect.yml @@ -0,0 +1,8 @@ +http: + routers: + acme-challenge-exempt: + rule: "PathPrefix(`/.well-known/acme-challenge`)" + entryPoints: + - web + service: noop@internal + priority: 100 diff --git a/traefik/dynamic/routers-dev.yml b/traefik/dynamic/routers-dev.yml deleted file mode 100644 index 58c16d4..0000000 --- a/traefik/dynamic/routers-dev.yml +++ /dev/null @@ -1,143 +0,0 @@ -http: - routers: - # Traefik Dashboard (dev access. local only) - traefik-dashboard-dev: - rule: "Host(`traefik.gigaforust`)" - entryPoints: - - websecure - service: api@internal - middlewares: - # - auth - - security-headers - tls: {} - - - # Nextcloud AIO Interface (dev access. local only) - nextcloud-aio-dev: - rule: "Host(`nextcloud-aio.gigaforust`)" - entryPoints: - - websecure - service: nextcloud-aio - middlewares: - - security-headers - tls: {} - - # Termix (dev access, (account required)) - termix-dev: - rule: "Host(`termix.gigaforust`)" - entryPoints: - - websecure - service: termix - middlewares: - - security-headers - tls: {} - - # MeTube (dev access, (auth required)) - metube-dev: - rule: "Host(`metube.gigaforust`)" - entryPoints: - - websecure - service: metube - middlewares: - - metube-auth - - security-headers - tls: {} - - # Portainer (dev acess, (account required)) - portainer-dev: - rule: "Host(`portainer.gigaforust`)" - entryPoints: - - websecure - service: portainer - middlewares: - - security-headers - tls: {} - - # Uptime Kuma (dev access, (account required)) - uptime-kuma-dev: - rule: "Host(`uptime.gigaforust`)" - entryPoints: - - websecure - service: uptime-kuma - tls: {} - - # AdGuard Home (dev access, (account required)) - adguard-dev: - rule: "Host(`adguard.gigaforust`)" - entryPoints: - - websecure - service: adguard - middlewares: - - security-headers - tls: {} - - # Nextcloud Main (public (account required)) - nextcloud-dev: - rule: "Host(`nextcloud.gigaforust`)" - entrypoints: - - websecure - service: nextcloud - middlewares: - - nextcloud-chain - tls: {} - - # Dockmon (dev access (account required)) - dockmon-dev: - rule: "Host(`dockmon.gigaforust`)" - entryPoints: - - websecure - service: dockmon - middlewares: - - security-headers - tls: {} - - # Gitea (dev access (account required)) - gitea-dev: - rule: "Host(`gitea.gigaforust`)" - entryPoints: - - websecure - - ssh - service: gitea - middlewares: - - security-headers - tls: {} - - # Glance (dev access, local only) - glance-dev: - rule: "Host(`glance.gigaforust`)" - entryPoints: - - websecure - service: glance - middlewares: - - security-headers - tls: {} - - # Watercrawl (dev access, local only) - watercrawl-dev: - rule: "Host(`watercrawl.gigaforust`)" - entryPoints: - - websecure - service: watercrawl - middlewares: - - security-headers - tls: {} - - # N8N (local only) - n8n-dev: - rule: "Host(`n8n.gigaforust`)" - entryPoints: - - websecure - service: n8n - middlewares: - - security-headers - tls: {} - - # Landing Page (public) - forust-homepage-dev: - rule: "Host(`landing.gigaforust`)" - entryPoints: - - websecure - service: forust-homepage - middlewares: - - security-headers - tls: {} \ No newline at end of file diff --git a/traefik/dynamic/routers-local.yml b/traefik/dynamic/routers-local.yml deleted file mode 100644 index ecbab2f..0000000 --- a/traefik/dynamic/routers-local.yml +++ /dev/null @@ -1,143 +0,0 @@ -http: - routers: - # Traefik Dashboard (local access, ADMIN, local only) - traefik-dashboard-local: - rule: "Host(`traefik.workstation`)" - entryPoints: - - websecure - service: api@internal - middlewares: - # - auth - - security-headers - tls: {} - - - # Nextcloud AIO Interface (local access. ADMIN, local only) - nextcloud-aio-local: - rule: "Host(`nextcloud-aio.workstation`)" - entryPoints: - - websecure - service: nextcloud-aio - middlewares: - - security-headers - tls: {} - - # Termix (local access, (account required)) - termix-local: - rule: "Host(`termix.workstation`)" - entryPoints: - - websecure - service: termix - middlewares: - - security-headers - tls: {} - - # MeTube (local access, (auth required)) - metube-local: - rule: "Host(`metube.workstation`)" - entryPoints: - - websecure - service: metube - middlewares: - - metube-auth - - security-headers - tls: {} - - # Portainer (dev acess, (account required)) - portainer-local: - rule: "Host(`portainer.workstation`)" - entryPoints: - - websecure - service: portainer - middlewares: - - security-headers - tls: {} - - # Uptime Kuma (local access, (account required)) - uptime-kuma-local: - rule: "Host(`uptime.workstation`)" - entryPoints: - - websecure - service: uptime-kuma - tls: {} - - # AdGuard Home (local access, (account required)) - adguard-local: - rule: "Host(`adguard.workstation`)" - entryPoints: - - websecure - service: adguard - middlewares: - - security-headers - tls: {} - - # Nextcloud Main (public (account required)) - nextcloud-local: - rule: "Host(`nextcloud.workstation`)" - entrypoints: - - websecure - service: nextcloud - middlewares: - - nextcloud-chain - tls: {} - - # Dockmon (local access (account required)) - dockmon-local: - rule: "Host(`dockmon.workstation`)" - entryPoints: - - websecure - service: dockmon - middlewares: - - security-headers - tls: {} - - # Gitea (local access (account required)) - gitea-local: - rule: "Host(`gitea.workstation`)" - entryPoints: - - websecure - - ssh - service: gitea - middlewares: - - security-headers - tls: {} - - # Glance (local access) - glance-local: - rule: "Host(`glance.workstation`)" - entryPoints: - - websecure - service: glance - middlewares: - - security-headers - tls: {} - - # Watercrawl (local access) - watercrawl-local: - rule: "Host(`watercrawl.workstation`)" - entryPoints: - - websecure - service: watercrawl - middlewares: - - security-headers - tls: {} - - # N8N (local only) - n8n-local: - rule: "Host(`n8n.workstation`)" - entryPoints: - - websecure - service: n8n - middlewares: - - security-headers - tls: {} - - # Landing Page (local access) - forust-homepage-local: - rule: "Host(`landing.workstation`)" - entryPoints: - - websecure - service: forust-homepage - middlewares: - - security-headers - tls: {} diff --git a/traefik/dynamic/routers-prod.yml b/traefik/dynamic/routers-prod.yml deleted file mode 100644 index fd9e4b6..0000000 --- a/traefik/dynamic/routers-prod.yml +++ /dev/null @@ -1,142 +0,0 @@ -http: - routers: - # Traefik Dashboard (ADMIN, without subdomeain) - traefik-dashboard: - rule: "Host(`traefik.forust.xyz`)" - entryPoints: - - websecure - service: api@internal - middlewares: - - auth - - security-headers - tls: {} - - # Nextcloud AIO Interface (ADMIN, without subdomeain) - nextcloud-aio: - rule: "Host(`nextcloud-aio.forust.xyz`)" - entryPoints: - - websecure - service: nextcloud-aio - middlewares: - - security-headers - tls: {} - - # Termix (public (account required)) - termix: - rule: "Host(`termix.forust.xyz`)" - entryPoints: - - websecure - service: termix - middlewares: - - security-headers - tls: {} - - # MeTube (public (auth required)) - metube: - rule: "Host(`metube.forust.xyz`)" - entryPoints: - - websecure - service: metube - middlewares: - - metube-auth - - security-headers - tls: {} - - # Portainer (public (account required)) - portainer: - rule: "Host(`portainer.forust.xyz`)" - entryPoints: - - websecure - service: portainer - middlewares: - - security-headers - tls: {} - - # Uptime Kuma (public (account required)) - uptime-kuma: - rule: "Host(`uptime.forust.xyz`)" - entryPoints: - - websecure - service: uptime-kuma - tls: {} - - # AdGuard Home (public (account required)) - adguard: - rule: "Host(`adguard.forust.xyz`)" - entryPoints: - - websecure - service: adguard - middlewares: - - security-headers - tls: {} - - # Nextcloud Main (public (account required)) - nextcloud: - rule: "Host(`nextcloud.forust.xyz`)" - entrypoints: - - websecure - service: nextcloud - middlewares: - - nextcloud-chain - tls: {} - - # Dockmon (public (account required)) - dockmon: - rule: "Host(`dockmon.forust.xyz`)" - entryPoints: - - websecure - service: dockmon - middlewares: - - security-headers - tls: {} - - # Gitea (public (account required)) - gitea: - rule: "Host(`gitea.forust.xyz`)" - entryPoints: - - websecure - - ssh - service: gitea - middlewares: - - security-headers - tls: {} - - # Glance (public, without subdomain) - glance: - rule: "Host(`glance.forust.xyz`)" - entryPoints: - - websecure - service: glance - middlewares: - - security-headers - tls: {} - - # Watercrawl (public, without subdomain) - watercrawl: - rule: "Host(`watercrawl.fourst.xyz`)" - entryPoints: - - websecure - service: watercrawl - middlewares: - - security-headers - tls: {} - - # N8N (public, without subdomain) - n8n: - rule: "Host(`n8n.forust.xyz`)" - entryPoints: - - websecure - service: n8n - middlewares: - - security-headers - tls: {} - - # Landing Page (public) - forust-homepage: - rule: "Host(`forust.xyz`)" - entryPoints: - - websecure - service: forust-homepage - middlewares: - - security-headers - tls: {} \ No newline at end of file diff --git a/traefik/dynamic/services.yml b/traefik/dynamic/services.yml deleted file mode 100644 index 712706f..0000000 --- a/traefik/dynamic/services.yml +++ /dev/null @@ -1,80 +0,0 @@ -http: - services: - # Portainer - portainer: - loadBalancer: - servers: - - url: "https://portainer:9443" - serversTransport: insecureTransport - - # AdGuard Home - adguard: - loadBalancer: - servers: - - url: "http://adguardhome:3000" - - # Nextcloud AIO Interface - nextcloud-aio: - loadBalancer: - servers: - - url: "https://nextcloud-aio-mastercontainer:8080" - serversTransport: insecureTransport - - # Nextcloud Main - nextcloud: - loadBalancer: - servers: - - url: "http://nextcloud-aio-apache:11000" - - # Uptime Kuma - uptime-kuma: - loadBalancer: - servers: - - url: "http://uptime-kuma:3001" - - # Termix - termix: - loadBalancer: - servers: - - url: "http://termix:8080" - - # Dockmon - dockmon: - loadBalancer: - servers: - - url: "https://dockmon:443" - serversTransport: insecureTransport - - # Glance - glance: - loadBalancer: - servers: - - url: "http://glance:8080" - - # Watercrawl - watercrawl: - loadBalancer: - servers: - - url: "http://nginx:80" - - # N8N - n8n: - loadBalancer: - servers: - - url: "http://n8n:5678" - - # Gitea - gitea: - loadBalancer: - servers: - - url: "http://gitea:3000" - # MeTube - metube: - loadBalancer: - servers: - - url: "http://metube:8081" - # Landing Page - forust-homepage: - loadBalancer: - servers: - - url: "http://forust-homepage:80" \ No newline at end of file diff --git a/traefik/dynamic/tls.yml b/traefik/dynamic/tls.yml index 83ab0ce..cae87e2 100644 --- a/traefik/dynamic/tls.yml +++ b/traefik/dynamic/tls.yml @@ -4,22 +4,20 @@ tls: # Cloudflare Origin CA *.forust.xyz - certFile: /certs/cloudflare.pem keyFile: /certs/cloudflare.key - # Local certificate - - certFile: /certs/workstation+1.pem - keyFile: /certs/workstation+1-key.pem - + - certFile: /certs/xdfnx.pem + keyFile: /certs/xdfnx.key stores: default: defaultCertificate: # Fallback local certificate - certFile: /certs/workstation+1.pem - keyFile: /certs/workstation+1-key.pem - + certFile: /certs/gigaforust.internal+1.pem + keyFile: /certs/gigaforust.internal+1-key.pem + options: default: minVersion: VersionTLS12 - sniStrict: true + sniStrict: false cipherSuites: - TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 - TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 - - TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305 \ No newline at end of file + - TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305 diff --git a/uptime-kuma/compose.yaml b/uptime-kuma/compose.yaml index d9d97fe..a918a8e 100644 --- a/uptime-kuma/compose.yaml +++ b/uptime-kuma/compose.yaml @@ -5,14 +5,30 @@ services: container_name: uptime-kuma volumes: - ./data:/app/data - ports: + # ports: # : - - "3001:3001" + # - "3001:3001" labels: - - "traefik.enable=true" + - "traefik.enable=true" + - "traefik.docker.network=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`) || 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: - - traefik-proxy + - proxy networks: - traefik-proxy: - external: true - \ No newline at end of file + proxy: + external: true diff --git a/userbot/.gitignore b/userbot/.gitignore index 64097b5..fccd91b 100644 --- a/userbot/.gitignore +++ b/userbot/.gitignore @@ -1,5 +1,6 @@ .DS_Store .gitattributes + .vscode /modules/__pycache__/ __pycache__/ @@ -12,14 +13,4 @@ __pycache__/ .venv/ /downloads/ /Downloads/ -/modules/custom_modules -.idea config.ini -unknown_errors.txt -moonlogs.txt -thumb.jpg -antipm_pic.jpg -musicbot/ -.trunk/ -previous_profiles/ -.python-version \ No newline at end of file diff --git a/userbot/docker-compose.yaml b/userbot/compose.yaml similarity index 52% rename from userbot/docker-compose.yaml rename to userbot/compose.yaml index 01a1109..9cf008f 100644 --- a/userbot/docker-compose.yaml +++ b/userbot/compose.yaml @@ -1,9 +1,8 @@ services: - userbot_forust: + forust: build: context: . dockerfile: Dockerfile - container_name: userbot_forust restart: unless-stopped env_file: - .env @@ -16,11 +15,10 @@ services: - 8.8.8.8 - 1.1.1.1 - userbot_anna: + anna: build: context: . dockerfile: Dockerfile - container_name: userbot_anna restart: unless-stopped env_file: - .env @@ -31,27 +29,4 @@ services: - ./volumes/logs_anna:/app/logs dns: - 8.8.8.8 - - 1.1.1.1 - develop: - watch: - - action: sync - path: modules - target: /app/modules - - action: sync - path: utils - target: /app/utils - - action: sync - path: main.py - target: /app/main.py - - action: rebuild - path: .env - - action: rebuild - path: .env.anna - - -volumes: - downloads: - -networks: - userbot_network: - driver: bridge + - 1.1.1.1 \ No newline at end of file