Merge commit '3eaef5dc90b716cc0fa391cbe2394be56d5f6041' as 'userbot'
This commit is contained in:
@@ -0,0 +1,10 @@
|
|||||||
|
version = 1
|
||||||
|
|
||||||
|
[[analyzers]]
|
||||||
|
name = "shell"
|
||||||
|
|
||||||
|
[[analyzers]]
|
||||||
|
name = "python"
|
||||||
|
|
||||||
|
[analyzers.meta]
|
||||||
|
runtime_version = "3.x.x"
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
.unused
|
||||||
|
Downloads
|
||||||
|
.venv
|
||||||
|
volumes
|
||||||
|
.env
|
||||||
|
.env.*
|
||||||
|
my_account.session
|
||||||
|
.gitignore
|
||||||
|
README.md
|
||||||
|
.git
|
||||||
|
uv.lock
|
||||||
|
.deepsource.toml
|
||||||
@@ -1,24 +0,0 @@
|
|||||||
root = true
|
|
||||||
|
|
||||||
[*]
|
|
||||||
indent_style = space
|
|
||||||
indent_size = 2
|
|
||||||
end_of_line = lf
|
|
||||||
charset = utf-8
|
|
||||||
trim_trailing_whitespace = true
|
|
||||||
insert_final_newline = true
|
|
||||||
|
|
||||||
[*.{yml,yaml}]
|
|
||||||
indent_size = 2
|
|
||||||
|
|
||||||
[*.{json,jsonc}]
|
|
||||||
indent_size = 2
|
|
||||||
|
|
||||||
[*.md]
|
|
||||||
trim_trailing_whitespace = false
|
|
||||||
|
|
||||||
[*.py]
|
|
||||||
indent_size = 4
|
|
||||||
|
|
||||||
[{Makefile,makefile}]
|
|
||||||
indent_style = tab
|
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
API_ID=""
|
||||||
|
API_HASH=""
|
||||||
|
STRINGSESSION=""
|
||||||
+14
-70
@@ -1,70 +1,14 @@
|
|||||||
|
# apiflash api key only for webshot plugin
|
||||||
|
APIFLASH_KEY=""
|
||||||
#===============================
|
# gemini api key only for gemini plugin
|
||||||
# Basic auth credentials
|
GEMINI_KEY=""
|
||||||
#===============================
|
# VT api key only for VirusTotal plugin
|
||||||
#
|
VT_KEY=""
|
||||||
#
|
# rmbg api key only for removebg plugin
|
||||||
#
|
RMBG_KEY=""
|
||||||
#===============================
|
# cohere api key only for cohere plugin
|
||||||
|
COHERE_KEY=""
|
||||||
#===============================================
|
# sqlite/sqlite3 or mongo/mongodb
|
||||||
#BEGIN TRAEFIK ENVIRONMENT VARIABLES ===========
|
DATABASE_TYPE=""
|
||||||
#===============================================
|
# file name for sqlite3, database name for mongodb
|
||||||
|
DATABASE_NAME=""
|
||||||
#===============================================
|
|
||||||
# General Traefik Environment Variables
|
|
||||||
#===============================================
|
|
||||||
HOST=hostname
|
|
||||||
EMAIL=your@email.here
|
|
||||||
CF_DNS_API_TOKEN=API_TOKEN_HERE
|
|
||||||
CF_EMAIL=your_cloudflare@email.here
|
|
||||||
TZ=Europe/Berlin
|
|
||||||
|
|
||||||
#===============================================
|
|
||||||
# Dockmon Traefik Configuration File
|
|
||||||
#===============================================
|
|
||||||
DOCKMON_APPNAME=dockmon
|
|
||||||
DOCKMON_SUBDOMEN=dockmon
|
|
||||||
#===============================================
|
|
||||||
# Dashboard Traefik Environment Variables
|
|
||||||
#===============================================
|
|
||||||
DASHBOARD_APPNAME=traefik
|
|
||||||
DASHBOARD_SUBDOMEN=traefik
|
|
||||||
#===============================================
|
|
||||||
# Watercrawl Traefik Environment Variables
|
|
||||||
#===============================================
|
|
||||||
WATERCRAWL_APPNAME=watercrawl
|
|
||||||
WATERCRAWL_SUBDOMEN=watercrawl
|
|
||||||
#===============================================
|
|
||||||
# n8n Traefik Environment Variables
|
|
||||||
#===============================================
|
|
||||||
N8N_APPNAME=n8n
|
|
||||||
N8N_SUBDOMEN=n8n
|
|
||||||
#===============================================
|
|
||||||
# Glance Traefik Environment Variables
|
|
||||||
#===============================================
|
|
||||||
GLANCE_APPNAME=glance
|
|
||||||
GLANCE_SUBDOMEN=glance
|
|
||||||
#===============================================
|
|
||||||
# AdGuard Traefik Environment Variables
|
|
||||||
#===============================================
|
|
||||||
ADGUARD_APPNAME=adguard
|
|
||||||
ADGUARD_SUBDOMEN=adguard
|
|
||||||
#===============================================
|
|
||||||
# Portainer Traefik Environment Variables
|
|
||||||
#===============================================
|
|
||||||
PORTAINER_APPNAME=portainer
|
|
||||||
PORTAINER_SUBDOMEN=portainer
|
|
||||||
#===============================================
|
|
||||||
# Nextcloud Traefik Environment Variables
|
|
||||||
#===============================================
|
|
||||||
NEXTCLOUD_APPNAME=nextcloud
|
|
||||||
NEXTCLOUD_SUBDOMEN=nextcloud
|
|
||||||
#===============================================
|
|
||||||
# Aio Traefik Environment Variables
|
|
||||||
#===============================================
|
|
||||||
NEXTCLOUD_AIO_APPNAME=nextcloud-aio
|
|
||||||
NEXTCLOUD_AIO_SUBDOMEN=nextcloud-aio
|
|
||||||
# END OF TRAEFIK ENVIRONMENT VARIABLES
|
|
||||||
#===============================================
|
|
||||||
|
|||||||
@@ -1,39 +0,0 @@
|
|||||||
name: Deploy to Server
|
|
||||||
run-name: Deploying to ${{ runner.os}} server on ${{ gitea.ref }}
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches:
|
|
||||||
- main
|
|
||||||
- ci/gitea-actions
|
|
||||||
jobs:
|
|
||||||
deploy:
|
|
||||||
runs-on: prod
|
|
||||||
steps:
|
|
||||||
- name: Fetch and Diff Analysis
|
|
||||||
id: diff
|
|
||||||
run: |
|
|
||||||
cd ${{ secrets.PROD_DIR }}
|
|
||||||
git fetch origin main
|
|
||||||
CHANGES=$(git diff --name-only HEAD origin/main | cut -d/ -f1 | sort -u | tr '\n' ' ')
|
|
||||||
echo "dirs=$CHANGES" >> $GITHUB_OUTPUT
|
|
||||||
echo "Changed dirs: $CHANGES"
|
|
||||||
|
|
||||||
- name: Sync Server Files
|
|
||||||
run: |
|
|
||||||
cd ${{ secrets.PROD_DIR }}
|
|
||||||
git reset --hard origin/main
|
|
||||||
echo "Server files synced with origin/main"
|
|
||||||
|
|
||||||
- name: Deploy Services
|
|
||||||
run: |
|
|
||||||
cd ${{ secrets.PROD_DIR }}
|
|
||||||
for dir in ${{ steps.diff.outputs.dirs }}; do
|
|
||||||
if [ -d "$dir" ] && ([ -f "$dir/compose.yaml" ] || [ -f "$dir/docker-compose.yaml" ]); then
|
|
||||||
echo ">>> Deploying $dir"
|
|
||||||
cd "$dir"
|
|
||||||
DOCKER_BUILDKIT=1 BUILDKIT_PROGRESS=plain docker compose up -d --build --no-color
|
|
||||||
cd ..
|
|
||||||
else
|
|
||||||
echo ">>> Skipping $dir: no compose file found"
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
@@ -1,41 +0,0 @@
|
|||||||
## BINARY MODE, USE WITH THE GITHUB RUNNER BINARY INSTALLED ON THE SERVER
|
|
||||||
|
|
||||||
name: Deploy to Server
|
|
||||||
run-name: Deploying onto server on ${{ github.ref }}
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches:
|
|
||||||
- main
|
|
||||||
- ci/actions
|
|
||||||
jobs:
|
|
||||||
deploy:
|
|
||||||
runs-on: [prod, self-hosted]
|
|
||||||
steps:
|
|
||||||
- name: Fetch and Diff Analysis
|
|
||||||
id: diff
|
|
||||||
run: |
|
|
||||||
cd ${{ secrets.PROD_DIR }}
|
|
||||||
git fetch origin main
|
|
||||||
CHANGES=$(git diff --name-only HEAD origin/main | cut -d/ -f1 | sort -u | tr '\n' ' ')
|
|
||||||
echo "dirs=$CHANGES" >> $GITHUB_OUTPUT
|
|
||||||
echo "Changed dirs: $CHANGES"
|
|
||||||
|
|
||||||
- name: Sync Server Files
|
|
||||||
run: |
|
|
||||||
cd ${{ secrets.PROD_DIR }}
|
|
||||||
git reset --hard origin/main
|
|
||||||
echo "Server files synced with origin/main"
|
|
||||||
|
|
||||||
- name: Deploy Services
|
|
||||||
run: |
|
|
||||||
cd ${{ secrets.PROD_DIR }}
|
|
||||||
for dir in ${{ steps.diff.outputs.dirs }}; do
|
|
||||||
if [ -d "$dir" ] && ([ -f "$dir/compose.yaml" ] || [ -f "$dir/docker-compose.yaml" ]); then
|
|
||||||
echo ">>> Deploying $dir"
|
|
||||||
cd "$dir"
|
|
||||||
DOCKER_BUILDKIT=1 BUILDKIT_PROGRESS=plain docker compose up -d --build --no-color
|
|
||||||
cd ..
|
|
||||||
else
|
|
||||||
echo ">>> Skipping $dir: no compose file found"
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
+8
-98
@@ -1,69 +1,7 @@
|
|||||||
# FreeFileSync
|
.DS_Store
|
||||||
sync.ffs_lock
|
.gitattributes
|
||||||
.sync.ffs_db
|
|
||||||
|
|
||||||
# Copyparty
|
.vscode
|
||||||
*.hist/
|
|
||||||
|
|
||||||
# Volumes, configs and data directories
|
|
||||||
gitea/gitea-db/
|
|
||||||
gitea/gitea-data/*
|
|
||||||
n8n/n8n-data/*
|
|
||||||
n8n/n8n-node-data/*
|
|
||||||
adguardhome/conf/*
|
|
||||||
dockmon/data/*
|
|
||||||
portainer/portainer_data/*
|
|
||||||
metube/MeTube_downloads
|
|
||||||
uptime-kuma/data/
|
|
||||||
termix/termix-data/*
|
|
||||||
cfddns/config.json
|
|
||||||
checkmk/checkmk/*
|
|
||||||
downtify/Downtify_downloads
|
|
||||||
headscale/config/*
|
|
||||||
headscale/data/*
|
|
||||||
searxng/core-config/*
|
|
||||||
|
|
||||||
# Steaming services files
|
|
||||||
streaming/jellyfin/*
|
|
||||||
streaming/jellyseerr/*
|
|
||||||
streaming/sonarr/*
|
|
||||||
streaming/radarr/*
|
|
||||||
streaming/data/*
|
|
||||||
streaming/qbittorrent/*
|
|
||||||
streaming/prowlarr/*
|
|
||||||
|
|
||||||
# Homepage
|
|
||||||
homepages/forust_files/.well-known/*
|
|
||||||
|
|
||||||
# Traefik files
|
|
||||||
traefik/letsencrypt/acme.json
|
|
||||||
traefik/dynamic/fileservers.yml
|
|
||||||
traefik/dynamic/*.local.y*ml.*
|
|
||||||
traefik/dynamic/*.external.y*ml
|
|
||||||
|
|
||||||
|
|
||||||
traefik/logs/*
|
|
||||||
|
|
||||||
# SSL Certificates
|
|
||||||
adguardhome/certs/*
|
|
||||||
traefik/certs/*
|
|
||||||
certs/
|
|
||||||
|
|
||||||
# Monitoring
|
|
||||||
monitoring/prometheus.yml
|
|
||||||
|
|
||||||
# Python
|
|
||||||
.python-version
|
|
||||||
venv/
|
|
||||||
pyc
|
|
||||||
unknown_errors.txt
|
|
||||||
moonlogs.txt
|
|
||||||
thumb.jpg
|
|
||||||
antipm_pic.jpg
|
|
||||||
musicbot/
|
|
||||||
.trunk/
|
|
||||||
previous_profiles/
|
|
||||||
.python-version
|
|
||||||
/modules/__pycache__/
|
/modules/__pycache__/
|
||||||
__pycache__/
|
__pycache__/
|
||||||
*.session
|
*.session
|
||||||
@@ -73,37 +11,9 @@ __pycache__/
|
|||||||
*-journal
|
*-journal
|
||||||
/venv/
|
/venv/
|
||||||
.venv/
|
.venv/
|
||||||
|
/downloads/
|
||||||
|
/Downloads/
|
||||||
|
config.ini
|
||||||
|
|
||||||
# DataSecurity
|
k8s/*/*secret*.yaml
|
||||||
replacements.txt
|
!k8s/account-secrets.yaml.example
|
||||||
|
|
||||||
# Vscode
|
|
||||||
.vscode
|
|
||||||
|
|
||||||
# Git
|
|
||||||
.gitattributes
|
|
||||||
# Gitea/github Runners
|
|
||||||
.runner
|
|
||||||
|
|
||||||
# Misc
|
|
||||||
.DS_Store
|
|
||||||
.idea
|
|
||||||
|
|
||||||
# Temp files
|
|
||||||
edu_master/temp/
|
|
||||||
temp/*
|
|
||||||
|
|
||||||
# Environment
|
|
||||||
.env
|
|
||||||
.env.anna
|
|
||||||
.env.forust
|
|
||||||
.env.*
|
|
||||||
!*example
|
|
||||||
|
|
||||||
# kubernetes
|
|
||||||
*/k8s/*secret*
|
|
||||||
!*/k8s/*secret*.example
|
|
||||||
traefik/k8s/local-tls.yaml
|
|
||||||
converters/k8s/config.yaml
|
|
||||||
convertx/k8s/config.yaml
|
|
||||||
traefik/k8s/crowdsec-middleware.yaml
|
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
ignored:
|
|
||||||
- DL3008
|
|
||||||
- DL3042
|
|
||||||
- DL3018
|
|
||||||
- DL3059
|
|
||||||
trustedRegistries:
|
|
||||||
- docker.io
|
|
||||||
- ghcr.io
|
|
||||||
- quay.io
|
|
||||||
- gcr.forust.xyz
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
{
|
|
||||||
"default": true,
|
|
||||||
"MD013": false,
|
|
||||||
"MD024": false,
|
|
||||||
"MD033": false,
|
|
||||||
"MD041": false,
|
|
||||||
"MD046": false
|
|
||||||
}
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
bracketSameLine: true
|
|
||||||
htmlWhitespaceSensitivity: css
|
|
||||||
printWidth: 120
|
|
||||||
tabWidth: 2
|
|
||||||
trailingComma: all
|
|
||||||
proseWrap: preserve
|
|
||||||
endOfLine: lf
|
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
git
|
||||||
|
wget
|
||||||
|
ffmpeg
|
||||||
|
mediainfo
|
||||||
|
yt-dlp
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
FROM python:3.11
|
||||||
|
WORKDIR /app
|
||||||
|
COPY . /app
|
||||||
|
RUN apt-get -qq update && apt-get -qq install -y git wget ffmpeg mediainfo \
|
||||||
|
&& apt-get clean \
|
||||||
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
RUN python -m venv --copies /opt/venv
|
||||||
|
ENV PATH="/opt/venv/bin:$PATH"
|
||||||
|
RUN pip install --no-cache-dir -r requirements.txt
|
||||||
|
CMD ["bash", "cloud.sh"]
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
web: bash cloud.sh
|
||||||
@@ -0,0 +1,82 @@
|
|||||||
|
{
|
||||||
|
"name": "Moon-userbot",
|
||||||
|
"description": "A Simple, Fast, Customizable, Ai powered Userbot for Telegram with most easiest installation.",
|
||||||
|
"logo": "https://camo.githubusercontent.com/1efdfa6416b3cd08471d865ca9ebf0fbdd38602ea95425f18a9bec6aeeefe49b/68747470733a2f2f74656c656772612e70682f66696c652f3063333763326662306631393463633163303334342e6a7067",
|
||||||
|
"keywords": ["telegram", "Moon-userbot", "bot", "python", "pyrogram"],
|
||||||
|
"env": {
|
||||||
|
"API_ID": {
|
||||||
|
"description": "Get it from my.telegram.org",
|
||||||
|
"required": true
|
||||||
|
},
|
||||||
|
"API_HASH": {
|
||||||
|
"description": "Get it from my.telegram.org",
|
||||||
|
"required": true
|
||||||
|
},
|
||||||
|
"PM_LIMIT": {
|
||||||
|
"description": "set your pm permit warn limit, default is 4",
|
||||||
|
"value": "4",
|
||||||
|
"required": true
|
||||||
|
},
|
||||||
|
"SECOND_SESSION": {
|
||||||
|
"description": "Pyrorogram v2 session string for music bot, only fill this if you want to use music bot feature",
|
||||||
|
"required": false
|
||||||
|
},
|
||||||
|
"DATABASE_URL": {
|
||||||
|
"description": "ONLY for MongoDB, get it from https://cloud.mongodb.com",
|
||||||
|
"required": false
|
||||||
|
},
|
||||||
|
"DATABASE_NAME": {
|
||||||
|
"description": "set database name, if using sqlite then change it to `db.sqlite3`",
|
||||||
|
"value": "moonub",
|
||||||
|
"required": true
|
||||||
|
},
|
||||||
|
"DATABASE_TYPE": {
|
||||||
|
"description": "set to sqlite3 if want to use sqlite3 db",
|
||||||
|
"value": "mongodb",
|
||||||
|
"required": true
|
||||||
|
},
|
||||||
|
"STRINGSESSION": {
|
||||||
|
"description": "Pyrogram V2 Session String. Don't use bots or else you'll be responsible for your actions. Gen yourself https://github.com/The-MoonTg-project/Moon-Userbot?tab=readme-ov-file#-optional-vars.",
|
||||||
|
"required": true
|
||||||
|
},
|
||||||
|
"APIFLASH_KEY": {
|
||||||
|
"description": "ONLY, If you want to use web screenshot plugin You can get it from https://apiflash.com/dashboard/access_keys",
|
||||||
|
"value": "123456779:ABCDE",
|
||||||
|
"required": true
|
||||||
|
},
|
||||||
|
"RMBG_KEY": {
|
||||||
|
"description": "ONLY, If you want to use removbg plugin You can get it from https://www.remove.bg/dashboard#api-key",
|
||||||
|
"value": "123456779:ABCDE",
|
||||||
|
"required": true
|
||||||
|
},
|
||||||
|
"VT_KEY": {
|
||||||
|
"description": "ONLY, If you want to use VirusTotal plugin You can get it from https://www.virustotal.com/gui/",
|
||||||
|
"value": "123456779:ABCDE",
|
||||||
|
"required": true
|
||||||
|
},
|
||||||
|
"GEMINI_KEY": {
|
||||||
|
"description": "ONLY, If you want to use gemini ai plugin You can get it from https://makersuite.google.com/app/apikey",
|
||||||
|
"value": "123456779:ABCDE",
|
||||||
|
"required": true
|
||||||
|
},
|
||||||
|
"COHERE_KEY": {
|
||||||
|
"description": "ONLY, If you want to use cohere ai plugin You can get it from https://dashboard.cohere.com/api-keys",
|
||||||
|
"value": "123456779:ABCDE",
|
||||||
|
"required": true
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"buildpacks": [
|
||||||
|
{
|
||||||
|
"url": "heroku/python"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"url": "https://github.com/heroku/heroku-buildpack-apt"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"url": "https://github.com/heroku/heroku-buildpack-activestorage-preview"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"url": "https://github.com/The-MoonTg-project/heroku-buildpack-yt-dlp"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
from flask import Flask
|
||||||
|
|
||||||
|
app = Flask(__name__)
|
||||||
|
|
||||||
|
|
||||||
|
@app.route('/')
|
||||||
|
def hello_world():
|
||||||
|
return 'This is Moon'
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == '__main__':
|
||||||
|
app.run()
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
cat <<'EOF'
|
||||||
|
_ ____ ____ _
|
||||||
|
/ \__/|/ _ \/ _ \/ \ /|
|
||||||
|
| |\/||| / \|| / \|| |\ ||
|
||||||
|
| | ||| \_/|| \_/|| | \||
|
||||||
|
\_/ \|\____/\____/\_/ \|
|
||||||
|
|
||||||
|
Copyright (C) 2020-2023 by MoonTg-project@Github, < https://github.com/The-MoonTg-project >.
|
||||||
|
This file is part of < https://github.com/The-MoonTg-project/Moon-Userbot > project,
|
||||||
|
and is released under the "GNU v3.0 License Agreement".
|
||||||
|
Please see < https://github.com/The-MoonTg-project/Moon-Userbot/blob/main/LICENSE >
|
||||||
|
All rights reserved.
|
||||||
|
EOF
|
||||||
|
|
||||||
|
gunicorn app:app --daemon && python main.py
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
services:
|
||||||
|
- type: worker
|
||||||
|
name: Moon-Userbot
|
||||||
|
runtime: docker
|
||||||
|
repo: https://github.com/The-MoonTg-project/Moon-Userbot
|
||||||
|
plan: starter
|
||||||
|
envVars:
|
||||||
|
- key: STABILITY_KEY
|
||||||
|
sync: false
|
||||||
|
- key: CLARIFAI_PAT
|
||||||
|
sync: false
|
||||||
|
- key: .env
|
||||||
|
sync: false
|
||||||
|
region: oregon
|
||||||
|
dockerContext: .
|
||||||
|
dockerfilePath: ./Dockerfile
|
||||||
|
version: "1"
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
gunicorn app:app & python3 main.py
|
||||||
@@ -1,22 +0,0 @@
|
|||||||
extends: default
|
|
||||||
|
|
||||||
rules:
|
|
||||||
comments:
|
|
||||||
min-spaces-from-content: 1
|
|
||||||
comments-indentation: false
|
|
||||||
document-start: disable
|
|
||||||
line-length: disable
|
|
||||||
braces:
|
|
||||||
min-spaces-inside: 0
|
|
||||||
max-spaces-inside: 1
|
|
||||||
brackets:
|
|
||||||
min-spaces-inside: 0
|
|
||||||
max-spaces-inside: 1
|
|
||||||
indentation:
|
|
||||||
spaces: 2
|
|
||||||
indent-sequences: consistent
|
|
||||||
truthy:
|
|
||||||
allowed-values:
|
|
||||||
- "true"
|
|
||||||
- "false"
|
|
||||||
- "on"
|
|
||||||
@@ -1,39 +0,0 @@
|
|||||||
{
|
|
||||||
"tab_size": 2,
|
|
||||||
"soft_wrap": "prefer_line",
|
|
||||||
"preferred_line_length": 120,
|
|
||||||
"format_on_save": "on",
|
|
||||||
"languages": {
|
|
||||||
"YAML": {
|
|
||||||
"tab_size": 2,
|
|
||||||
"hard_tabs": false,
|
|
||||||
"format_on_save": "on",
|
|
||||||
"formatter": {
|
|
||||||
"language_server": { "name": "yaml-language-server" }
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Python": {
|
|
||||||
"tab_size": 4,
|
|
||||||
"format_on_save": "on",
|
|
||||||
"formatter": {
|
|
||||||
"language_server": { "name": "ruff" }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"lsp": {
|
|
||||||
"yaml-language-server": {
|
|
||||||
"settings": {
|
|
||||||
"yaml": {
|
|
||||||
"schemas": {
|
|
||||||
"kubernetes": ["**/k8s/*.yaml", "**/k8s/*.yml"]
|
|
||||||
},
|
|
||||||
"validate": true,
|
|
||||||
"completion": true,
|
|
||||||
"format": {
|
|
||||||
"enable": true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+28
@@ -0,0 +1,28 @@
|
|||||||
|
FROM python:3.11-slim AS builder
|
||||||
|
|
||||||
|
WORKDIR /src
|
||||||
|
COPY requirements.txt .
|
||||||
|
RUN pip install --no-cache-dir --user -r requirements.txt
|
||||||
|
|
||||||
|
FROM python:3.11-slim
|
||||||
|
|
||||||
|
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||||
|
git \
|
||||||
|
mediainfo \
|
||||||
|
wget \
|
||||||
|
xz-utils \
|
||||||
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
|
RUN wget -qO- https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-amd64-static.tar.xz | \
|
||||||
|
tar xJ && \
|
||||||
|
cp ffmpeg-*-static/ffmpeg /usr/local/bin/ && \
|
||||||
|
cp ffmpeg-*-static/ffprobe /usr/local/bin/ && \
|
||||||
|
rm -rf ffmpeg-*
|
||||||
|
|
||||||
|
COPY --from=builder /root/.local /usr/local
|
||||||
|
COPY . /app
|
||||||
|
WORKDIR /app
|
||||||
|
|
||||||
|
ENV PYTHONUNBUFFERED=1
|
||||||
|
|
||||||
|
CMD ["python", "-u", "main.py"]
|
||||||
@@ -1,48 +0,0 @@
|
|||||||
services:
|
|
||||||
adguard:
|
|
||||||
image: adguard/adguardhome:latest
|
|
||||||
container_name: adguardhome
|
|
||||||
restart: unless-stopped
|
|
||||||
ports:
|
|
||||||
- "53:53/tcp"
|
|
||||||
- "53:53/udp"
|
|
||||||
- "853:853/tcp" # DNS over TLS
|
|
||||||
# - "67:67/udp" # DHCP
|
|
||||||
# - "68:68/tcp" # DHCP
|
|
||||||
# - "3000:3000/tcp"
|
|
||||||
volumes:
|
|
||||||
- data:/opt/adguardhome/work
|
|
||||||
- ./conf:/opt/adguardhome/conf
|
|
||||||
- ./certs:/certs:ro
|
|
||||||
labels:
|
|
||||||
- "traefik.enable=true"
|
|
||||||
- "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.tls.certresolver=letsencrypt"
|
|
||||||
# Local Router
|
|
||||||
- "traefik.http.routers.adguard-local.rule=Host(`adguard.workstation.internal`) || Host(`dns.workstation.internal`)"
|
|
||||||
- "traefik.http.routers.adguard-local.entrypoints=websecure"
|
|
||||||
- "traefik.http.routers.adguard-local.tls=true"
|
|
||||||
# Dev Router
|
|
||||||
- "traefik.http.routers.adguard-dev.rule=Host(`adguard.gigaforust.internal`) || Host(`dns.gigaforust.internal`)"
|
|
||||||
- "traefik.http.routers.adguard-dev.entrypoints=websecure"
|
|
||||||
- "traefik.http.routers.adguard-dev.tls=true"
|
|
||||||
# DoH Router
|
|
||||||
- "traefik.http.routers.dns-over-https.rule=(Host(`dns.forust.xyz` || Host(`adguard.forust.xyz`)) && PathPrefix(`/dns-query`))"
|
|
||||||
- "traefik.http.routers.dns-over-https.entrypoints=websecure"
|
|
||||||
- "traefik.http.routers.dns-over-https.tls.certresolver=letsencrypt"
|
|
||||||
|
|
||||||
# Glance Metadata
|
|
||||||
- glance.name=adguard
|
|
||||||
- glance.url=https://adguard.forust.xyz/
|
|
||||||
- glance.description=AdGuard Home is a network-wide software for blocking ads.
|
|
||||||
networks:
|
|
||||||
- proxy
|
|
||||||
volumes:
|
|
||||||
data:
|
|
||||||
networks:
|
|
||||||
proxy:
|
|
||||||
external: true
|
|
||||||
@@ -1,116 +0,0 @@
|
|||||||
apiVersion: v1
|
|
||||||
kind: Service
|
|
||||||
metadata:
|
|
||||||
name: adguard-lb-service
|
|
||||||
namespace: adguard
|
|
||||||
annotations:
|
|
||||||
metallb.io/loadBalancerIPs: "192.168.80.3"
|
|
||||||
spec:
|
|
||||||
type: LoadBalancer
|
|
||||||
externalTrafficPolicy: Local
|
|
||||||
selector:
|
|
||||||
app: adguard
|
|
||||||
ports:
|
|
||||||
- name: dns-udp
|
|
||||||
port: 53
|
|
||||||
targetPort: 53
|
|
||||||
protocol: UDP
|
|
||||||
- name: dns-tcp
|
|
||||||
port: 53
|
|
||||||
targetPort: 53
|
|
||||||
protocol: TCP
|
|
||||||
- name: dot
|
|
||||||
port: 853
|
|
||||||
targetPort: 853
|
|
||||||
protocol: TCP
|
|
||||||
---
|
|
||||||
apiVersion: v1
|
|
||||||
kind: Service
|
|
||||||
metadata:
|
|
||||||
name: adguard-service
|
|
||||||
namespace: adguard
|
|
||||||
spec:
|
|
||||||
selector:
|
|
||||||
app: adguard
|
|
||||||
ports:
|
|
||||||
- port: 3000
|
|
||||||
name: webui
|
|
||||||
targetPort: 3000
|
|
||||||
- port: 53
|
|
||||||
name: dns
|
|
||||||
targetPort: 53
|
|
||||||
protocol: UDP
|
|
||||||
- port: 53
|
|
||||||
name: dns-tcp
|
|
||||||
targetPort: 53
|
|
||||||
protocol: TCP
|
|
||||||
- port: 853
|
|
||||||
name: dot
|
|
||||||
targetPort: 853
|
|
||||||
---
|
|
||||||
apiVersion: apps/v1
|
|
||||||
kind: Deployment
|
|
||||||
metadata:
|
|
||||||
name: adguard-deployment
|
|
||||||
namespace: adguard
|
|
||||||
spec:
|
|
||||||
replicas: 1
|
|
||||||
selector:
|
|
||||||
matchLabels:
|
|
||||||
app: adguard
|
|
||||||
template:
|
|
||||||
metadata:
|
|
||||||
labels:
|
|
||||||
app: adguard
|
|
||||||
spec:
|
|
||||||
containers:
|
|
||||||
- name: adguard
|
|
||||||
image: adguard/adguardhome:latest
|
|
||||||
resources:
|
|
||||||
limits:
|
|
||||||
memory: "1.5Gi"
|
|
||||||
cpu: "300m"
|
|
||||||
requests:
|
|
||||||
memory: "500Mi"
|
|
||||||
cpu: "50m"
|
|
||||||
ports:
|
|
||||||
- containerPort: 3000
|
|
||||||
name: webui
|
|
||||||
- containerPort: 53
|
|
||||||
name: dns
|
|
||||||
- containerPort: 853
|
|
||||||
name: dot
|
|
||||||
volumeMounts:
|
|
||||||
- name: adguard-data
|
|
||||||
mountPath: /opt/adguardhome/work
|
|
||||||
subPath: work
|
|
||||||
- name: adguard-data
|
|
||||||
mountPath: /opt/adguardhome/conf
|
|
||||||
subPath: conf
|
|
||||||
- name: adguard-certs
|
|
||||||
mountPath: /certs
|
|
||||||
readOnly: true
|
|
||||||
volumes:
|
|
||||||
- name: adguard-data
|
|
||||||
persistentVolumeClaim:
|
|
||||||
claimName: adguard-pvc
|
|
||||||
- name: adguard-certs
|
|
||||||
secret:
|
|
||||||
secretName: adguard-certs
|
|
||||||
items:
|
|
||||||
- key: tls.crt
|
|
||||||
path: fullchain.pem
|
|
||||||
- key: tls.key
|
|
||||||
path: privkey.pem
|
|
||||||
---
|
|
||||||
apiVersion: v1
|
|
||||||
kind: PersistentVolumeClaim
|
|
||||||
metadata:
|
|
||||||
name: adguard-pvc
|
|
||||||
namespace: adguard
|
|
||||||
spec:
|
|
||||||
accessModes:
|
|
||||||
- ReadWriteOnce
|
|
||||||
resources:
|
|
||||||
requests:
|
|
||||||
storage: 2Gi
|
|
||||||
@@ -1,52 +0,0 @@
|
|||||||
apiVersion: traefik.io/v1alpha1
|
|
||||||
kind: IngressRoute
|
|
||||||
metadata:
|
|
||||||
name: adguard-prod
|
|
||||||
namespace: adguard
|
|
||||||
spec:
|
|
||||||
entryPoints:
|
|
||||||
- websecure
|
|
||||||
routes:
|
|
||||||
- match: Host(`adguard.forust.xyz`) || Host(`dns.forust.xyz`)
|
|
||||||
kind: Rule
|
|
||||||
middlewares:
|
|
||||||
- name: "crowdsec-crowdsec-bouncer@kubernetescrd"
|
|
||||||
services:
|
|
||||||
- name: adguard-service
|
|
||||||
port: 3000
|
|
||||||
tls:
|
|
||||||
certResolver: letsencrypt
|
|
||||||
---
|
|
||||||
apiVersion: traefik.io/v1alpha1
|
|
||||||
kind: IngressRoute
|
|
||||||
metadata:
|
|
||||||
name: adguard-local
|
|
||||||
namespace: adguard
|
|
||||||
spec:
|
|
||||||
entryPoints:
|
|
||||||
- websecure
|
|
||||||
routes:
|
|
||||||
- match: Host(`adguard.workstation.internal`) || Host(`dns.workstation.internal`) || Host(`adguard.gigaforust.internal`) || Host(`dns.gigaforust.internal`)
|
|
||||||
kind: Rule
|
|
||||||
services:
|
|
||||||
- name: adguard-service
|
|
||||||
port: 3000
|
|
||||||
---
|
|
||||||
apiVersion: traefik.io/v1alpha1
|
|
||||||
kind: IngressRoute
|
|
||||||
metadata:
|
|
||||||
name: adguard-doh
|
|
||||||
namespace: adguard
|
|
||||||
spec:
|
|
||||||
entryPoints:
|
|
||||||
- websecure
|
|
||||||
routes:
|
|
||||||
- match: (Host(`adguard.forust.xyz`) || Host(`dns.forust.xyz`)) && PathPrefix(`/dns-query`)
|
|
||||||
kind: Rule
|
|
||||||
middlewares:
|
|
||||||
- name: "crowdsec-crowdsec-bouncer@kubernetescrd"
|
|
||||||
services:
|
|
||||||
- name: adguard-service
|
|
||||||
port: 3000
|
|
||||||
tls:
|
|
||||||
certResolver: letsencrypt
|
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
apiVersion: v1
|
|
||||||
kind: Namespace
|
|
||||||
metadata:
|
|
||||||
name: adguard
|
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
kubectl apply -f k8s/namespace.yaml && \
|
|
||||||
kubectl create secret tls adguard-certs -n adguard \
|
|
||||||
--cert=certs/fullchain.pem \
|
|
||||||
--key=certs/privkey.pem --dry-run=client -o yaml > \
|
|
||||||
k8s/secrets.yaml
|
|
||||||
|
|
||||||
# OR WITH NO FILE CREATION:
|
|
||||||
kubectl create secret tls adguard-certs -n adguard \
|
|
||||||
--cert=certs/fullchain.pem --key=certs/privkey.pem \
|
|
||||||
--save-config
|
|
||||||
@@ -1,20 +0,0 @@
|
|||||||
# ===================================
|
|
||||||
# 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
|
|
||||||
@@ -1,95 +0,0 @@
|
|||||||
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}
|
|
||||||
volumes:
|
|
||||||
- ./media:/media
|
|
||||||
- ./custom-templates:/templates
|
|
||||||
labels:
|
|
||||||
- "traefik.enable=true"
|
|
||||||
- "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.tls.certresolver=letsencrypt"
|
|
||||||
# Local Router
|
|
||||||
- "traefik.http.routers.authentik-server-local.rule=Host(`auth.workstation.internal`)"
|
|
||||||
- "traefik.http.routers.authentik-server-local.entrypoints=websecure"
|
|
||||||
- "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.tls=true"
|
|
||||||
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
|
|
||||||
@@ -1,93 +0,0 @@
|
|||||||
apiVersion: v1
|
|
||||||
kind: Service
|
|
||||||
metadata:
|
|
||||||
name: authentik-server-service
|
|
||||||
namespace: authentik
|
|
||||||
spec:
|
|
||||||
type: ClusterIP
|
|
||||||
selector:
|
|
||||||
app: authentik-server
|
|
||||||
ports:
|
|
||||||
- port: 9000
|
|
||||||
targetPort: 9000
|
|
||||||
---
|
|
||||||
apiVersion: v1
|
|
||||||
kind: Service
|
|
||||||
metadata:
|
|
||||||
name: authentik-worker-service
|
|
||||||
namespace: authentik
|
|
||||||
spec:
|
|
||||||
type: ClusterIP
|
|
||||||
selector:
|
|
||||||
app: authentik-worker
|
|
||||||
ports:
|
|
||||||
- port: 9000
|
|
||||||
targetPort: 9000
|
|
||||||
---
|
|
||||||
apiVersion: apps/v1
|
|
||||||
kind: Deployment
|
|
||||||
metadata:
|
|
||||||
name: authentik-server-deployment
|
|
||||||
namespace: authentik
|
|
||||||
spec:
|
|
||||||
replicas: 1
|
|
||||||
selector:
|
|
||||||
matchLabels:
|
|
||||||
app: authentik-server
|
|
||||||
template:
|
|
||||||
metadata:
|
|
||||||
labels:
|
|
||||||
app: authentik-server
|
|
||||||
spec:
|
|
||||||
containers:
|
|
||||||
- name: authentik-server
|
|
||||||
image: ghcr.io/goauthentik/server:2025.10.2
|
|
||||||
args: ["server"]
|
|
||||||
envFrom:
|
|
||||||
- configMapRef:
|
|
||||||
name: authentik-config
|
|
||||||
- secretRef:
|
|
||||||
name: authentik-secrets
|
|
||||||
ports:
|
|
||||||
- containerPort: 9000
|
|
||||||
resources:
|
|
||||||
requests:
|
|
||||||
memory: "700Mi"
|
|
||||||
cpu: "300m"
|
|
||||||
limits:
|
|
||||||
memory: "1.5Gi"
|
|
||||||
cpu: "1000m"
|
|
||||||
---
|
|
||||||
apiVersion: apps/v1
|
|
||||||
kind: Deployment
|
|
||||||
metadata:
|
|
||||||
name: authentik-worker-deployment
|
|
||||||
namespace: authentik
|
|
||||||
spec:
|
|
||||||
replicas: 1
|
|
||||||
selector:
|
|
||||||
matchLabels:
|
|
||||||
app: authentik-worker
|
|
||||||
template:
|
|
||||||
metadata:
|
|
||||||
labels:
|
|
||||||
app: authentik-worker
|
|
||||||
spec:
|
|
||||||
containers:
|
|
||||||
- name: authentik-worker
|
|
||||||
image: ghcr.io/goauthentik/server:2025.10.2
|
|
||||||
args: ["worker"]
|
|
||||||
securityContext:
|
|
||||||
runAsUser: 0
|
|
||||||
envFrom:
|
|
||||||
- configMapRef:
|
|
||||||
name: authentik-config
|
|
||||||
- secretRef:
|
|
||||||
name: authentik-secrets
|
|
||||||
resources:
|
|
||||||
requests:
|
|
||||||
memory: "512Mi"
|
|
||||||
cpu: "300m"
|
|
||||||
limits:
|
|
||||||
memory: "1Gi"
|
|
||||||
cpu: "700m"
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
apiVersion: v1
|
|
||||||
kind: ConfigMap
|
|
||||||
metadata:
|
|
||||||
name: authentik-config
|
|
||||||
namespace: authentik
|
|
||||||
data:
|
|
||||||
AUTHENTIK_IMAGE: ghcr.io/goauthentik/server
|
|
||||||
AUTHENTIK_TAG: "2025.10.2"
|
|
||||||
AUTHENTIK_POSTGRESQL__HOST: authentik-postgres-service
|
|
||||||
AUTHENTIK_POSTGRESQL__NAME: authentik
|
|
||||||
AUTHENTIK_ERROR_REPORTING__ENABLED: "true"
|
|
||||||
@@ -1,33 +0,0 @@
|
|||||||
apiVersion: traefik.io/v1alpha1
|
|
||||||
kind: IngressRoute
|
|
||||||
metadata:
|
|
||||||
name: authentik-prod
|
|
||||||
namespace: authentik
|
|
||||||
spec:
|
|
||||||
entryPoints:
|
|
||||||
- websecure
|
|
||||||
routes:
|
|
||||||
- match: Host(`auth.forust.xyz`)
|
|
||||||
kind: Rule
|
|
||||||
middlewares:
|
|
||||||
- name: "crowdsec-crowdsec-bouncer@kubernetescrd"
|
|
||||||
services:
|
|
||||||
- name: authentik-server-service
|
|
||||||
port: 9000
|
|
||||||
tls:
|
|
||||||
certResolver: letsencrypt
|
|
||||||
---
|
|
||||||
apiVersion: traefik.io/v1alpha1
|
|
||||||
kind: IngressRoute
|
|
||||||
metadata:
|
|
||||||
name: authentik-local
|
|
||||||
namespace: authentik
|
|
||||||
spec:
|
|
||||||
entryPoints:
|
|
||||||
- websecure
|
|
||||||
routes:
|
|
||||||
- match: Host(`auth.workstation.internal`) || Host(`auth.gigaforust.internal`)
|
|
||||||
kind: Rule
|
|
||||||
services:
|
|
||||||
- name: authentik-server-service
|
|
||||||
port: 9000
|
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
apiVersion: v1
|
|
||||||
kind: Namespace
|
|
||||||
metadata:
|
|
||||||
name: authentik
|
|
||||||
@@ -1,66 +0,0 @@
|
|||||||
apiVersion: v1
|
|
||||||
kind: Service
|
|
||||||
metadata:
|
|
||||||
name: authentik-postgres-service
|
|
||||||
namespace: authentik
|
|
||||||
spec:
|
|
||||||
clusterIP: None
|
|
||||||
selector:
|
|
||||||
app: authentik-postgres
|
|
||||||
ports:
|
|
||||||
- port: 5432
|
|
||||||
targetPort: 5432
|
|
||||||
---
|
|
||||||
apiVersion: apps/v1
|
|
||||||
kind: StatefulSet
|
|
||||||
metadata:
|
|
||||||
name: authentik-postgres-statefulset
|
|
||||||
namespace: authentik
|
|
||||||
spec:
|
|
||||||
selector:
|
|
||||||
matchLabels:
|
|
||||||
app: authentik-postgres
|
|
||||||
serviceName: authentik-postgres-service
|
|
||||||
replicas: 1
|
|
||||||
template:
|
|
||||||
metadata:
|
|
||||||
labels:
|
|
||||||
app: authentik-postgres
|
|
||||||
spec:
|
|
||||||
containers:
|
|
||||||
- name: postgres
|
|
||||||
image: docker.io/library/postgres:15-alpine
|
|
||||||
env:
|
|
||||||
- name: POSTGRES_DB
|
|
||||||
value: authentik
|
|
||||||
- name: POSTGRES_USER
|
|
||||||
valueFrom:
|
|
||||||
secretKeyRef:
|
|
||||||
name: authentik-secrets
|
|
||||||
key: AUTHENTIK_POSTGRESQL__USER
|
|
||||||
- name: POSTGRES_PASSWORD
|
|
||||||
valueFrom:
|
|
||||||
secretKeyRef:
|
|
||||||
name: authentik-secrets
|
|
||||||
key: AUTHENTIK_POSTGRESQL__PASSWORD
|
|
||||||
ports:
|
|
||||||
- containerPort: 5432
|
|
||||||
name: postgres
|
|
||||||
volumeMounts:
|
|
||||||
- name: postgres-data
|
|
||||||
mountPath: /var/lib/postgresql/data
|
|
||||||
resources:
|
|
||||||
requests:
|
|
||||||
memory: "256Mi"
|
|
||||||
cpu: "200m"
|
|
||||||
limits:
|
|
||||||
memory: "1Gi"
|
|
||||||
cpu: "500m"
|
|
||||||
volumeClaimTemplates:
|
|
||||||
- metadata:
|
|
||||||
name: postgres-data
|
|
||||||
spec:
|
|
||||||
accessModes: ["ReadWriteOnce"]
|
|
||||||
resources:
|
|
||||||
requests:
|
|
||||||
storage: 5Gi
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
apiVersion: v1
|
|
||||||
kind: Secret
|
|
||||||
metadata:
|
|
||||||
name: authentik-secrets
|
|
||||||
namespace: authentik
|
|
||||||
type: Opaque
|
|
||||||
stringData:
|
|
||||||
AUTHENTIK_SECRET_KEY: ""
|
|
||||||
AUTHENTIK_POSTGRESQL__PASSWORD: ""
|
|
||||||
AUTHENTIK_POSTGRESQL__USER: authentik
|
|
||||||
AUTHENTIK_BOOTSTRAP_PASSWORD: authentik
|
|
||||||
@@ -1,15 +0,0 @@
|
|||||||
CLOUDFLARE_API_TOKEN=YOUR_CLOUDFLARE_API_TOKEN
|
|
||||||
DOMAINS=example.com,dns.example.com,mc.example.com,auth.example.com,ssh.example.com
|
|
||||||
IP4_DOMAINS=
|
|
||||||
IP6_DOMAINS=
|
|
||||||
IP4_PROVIDER=cloudflare.trace
|
|
||||||
IP6_PROVIDER=none # change if you want to update AAAA
|
|
||||||
UPDATE_CRON=@every 5m
|
|
||||||
UPDATE_ON_START=true
|
|
||||||
DELETE_ON_STOP=false
|
|
||||||
DELETE_ON_FAILURE=true
|
|
||||||
TTL=1
|
|
||||||
PROXIED=!is(dns.example.com) && !is(mc.example.com) && !is(ssh.example.com)
|
|
||||||
EMOJI=true
|
|
||||||
UPTIMEKUMA=https://uptime-kuma.example.com/api/push/AsaSDFGFkfklaFALSKffkfFKfkfkfkFK?status=up&msg=OK&ping=
|
|
||||||
REJECT_CLOUDFLARE_IPS=true
|
|
||||||
@@ -1,30 +0,0 @@
|
|||||||
services:
|
|
||||||
cloudflare-ddns:
|
|
||||||
image: timothyjmiller/cloudflare-ddns:latest
|
|
||||||
container_name: cloudflare-ddns
|
|
||||||
restart: unless-stopped
|
|
||||||
security_opt:
|
|
||||||
- no-new-privileges:true
|
|
||||||
network_mode: "host"
|
|
||||||
# https://github.com/timothymiller/cloudflare-ddns#-quick-start
|
|
||||||
environment:
|
|
||||||
- CLOUDFLARE_API_TOKEN=${CLOUDFLARE_API_TOKEN:?Cloudflare API token is required}
|
|
||||||
- DOMAINS=${DOMAINS:-}
|
|
||||||
- IP4_DOMAINS=${IP4_DOMAINS:-}
|
|
||||||
- IP6_DOMAINS=${IP6_DOMAINS:-}
|
|
||||||
- IP4_PROVIDER=${IP4_PROVIDER:-cloudflare.trace}
|
|
||||||
- IP6_PROVIDER=${IP6_PROVIDER:-none}
|
|
||||||
- UPDATE_CRON=${UPDATE_CRON:-@every 5m}
|
|
||||||
- UPDATE_ON_START=${UPDATE_ON_START:-true}
|
|
||||||
- DELETE_ON_STOP=${DELETE_ON_STOP:-false}
|
|
||||||
- DELETE_ON_FAILURE=${DELETE_ON_FAILURE:-true}
|
|
||||||
- TTL=${TTL:-1} # 1=auto
|
|
||||||
# to proxy only "dns.example.com" and "wfs.example.com" use "!is(dns.domain.com) && !is (wfs.domain.com)"
|
|
||||||
- PROXIED=${PROXIED:-true}
|
|
||||||
- EMOJI=${EMOJI:-true}
|
|
||||||
- UPTIMEKUMA=${UPTIMEKUMA:-}
|
|
||||||
- HEALTHCHECKS=${HEALTHCHECKS:-}
|
|
||||||
- REJECT_CLOUDFLARE_IPS=${REJECT_CLOUDFLARE_IPS:-true}
|
|
||||||
# volumes:
|
|
||||||
# Prefer using environment variables for configuration, config.json legacy support
|
|
||||||
# - ./config.json:/config.json
|
|
||||||
@@ -1,22 +0,0 @@
|
|||||||
{
|
|
||||||
"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
|
|
||||||
}
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
secret.yaml
|
|
||||||
@@ -1,32 +0,0 @@
|
|||||||
apiVersion: apps/v1
|
|
||||||
kind: Deployment
|
|
||||||
metadata:
|
|
||||||
name: cfddns
|
|
||||||
labels:
|
|
||||||
app: cfddns
|
|
||||||
spec:
|
|
||||||
replicas: 1
|
|
||||||
selector:
|
|
||||||
matchLabels:
|
|
||||||
app: cfddns
|
|
||||||
template:
|
|
||||||
metadata:
|
|
||||||
labels:
|
|
||||||
app: cfddns
|
|
||||||
spec:
|
|
||||||
hostNetwork: true
|
|
||||||
dnsPolicy: ClusterFirstWithHostNet
|
|
||||||
containers:
|
|
||||||
- name: cloudflare-ddns
|
|
||||||
image: timothyjmiller/cloudflare-ddns:latest
|
|
||||||
imagePullPolicy: Always
|
|
||||||
resources:
|
|
||||||
requests:
|
|
||||||
memory: "20Mi"
|
|
||||||
cpu: "30m"
|
|
||||||
limits:
|
|
||||||
memory: "64Mi"
|
|
||||||
cpu: "50m"
|
|
||||||
envFrom:
|
|
||||||
- secretRef:
|
|
||||||
name: cfddns-secrets
|
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
apiVersion: v1
|
|
||||||
kind: Secret
|
|
||||||
metadata:
|
|
||||||
name: cfddns-secrets
|
|
||||||
type: Opaque
|
|
||||||
stringData:
|
|
||||||
CLOUDFLARE_API_TOKEN: your_token
|
|
||||||
DOMAINS: "example.com,www.example.com"
|
|
||||||
IP4_PROVIDER: cloudflare.trace
|
|
||||||
IP6_PROVIDER: none
|
|
||||||
UPDATE_CRON: "@every 5m"
|
|
||||||
UPDATE_ON_START: "true"
|
|
||||||
DELETE_ON_STOP: "false"
|
|
||||||
DELETE_ON_FAILURE: "true"
|
|
||||||
TTL: "1"
|
|
||||||
PROXIED: "true"
|
|
||||||
EMOJI: "true"
|
|
||||||
REJECT_CLOUDFLARE_IPS: "true"
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
CMK_PASSWORD=password
|
|
||||||
TZ=Europe/Berlin
|
|
||||||
@@ -1,39 +0,0 @@
|
|||||||
services:
|
|
||||||
checkmk:
|
|
||||||
image: "checkmk/check-mk-raw:2.4.0-latest"
|
|
||||||
container_name: "checkmk"
|
|
||||||
restart: unless-stopped
|
|
||||||
# ports:
|
|
||||||
# - 5000:5000
|
|
||||||
# - 6776:8000
|
|
||||||
volumes:
|
|
||||||
- sites:/omd/sites
|
|
||||||
tmpfs:
|
|
||||||
- /opt/omd/sites/cmk/tmp:uid=1000,gid=1000
|
|
||||||
environment:
|
|
||||||
- CMK_PASSWORD=${CMK_PASSWORD:-password}
|
|
||||||
- CMK_SITE_ID=cmk
|
|
||||||
- TZ=${TZ:-Etc/UTC}
|
|
||||||
labels:
|
|
||||||
- "traefik.enable=true"
|
|
||||||
- "traefik.http.services.checkmk.loadbalancer.server.port=5000"
|
|
||||||
|
|
||||||
# Prod Router
|
|
||||||
- "traefik.http.routers.checkmk.rule=Host(`cmk.forust.xyz`)"
|
|
||||||
- "traefik.http.routers.checkmk.entrypoints=websecure"
|
|
||||||
- "traefik.http.routers.checkmk.tls.certresolver=letsencrypt"
|
|
||||||
# Local Router
|
|
||||||
- "traefik.http.routers.checkmk-local.rule=Host(`cmk.workstation.internal`)"
|
|
||||||
- "traefik.http.routers.checkmk-local.entrypoints=websecure"
|
|
||||||
- "traefik.http.routers.checkmk-local.tls=true"
|
|
||||||
# Dev Router
|
|
||||||
- "traefik.http.routers.checkmk-dev.rule=Host(`cmk.gigaforust.internal`)"
|
|
||||||
- "traefik.http.routers.checkmk-dev.entrypoints=websecure"
|
|
||||||
- "traefik.http.routers.checkmk-dev.tls=true"
|
|
||||||
networks:
|
|
||||||
- proxy
|
|
||||||
networks:
|
|
||||||
proxy:
|
|
||||||
external: true
|
|
||||||
volumes:
|
|
||||||
sites:
|
|
||||||
@@ -1,68 +0,0 @@
|
|||||||
apiVersion: v1
|
|
||||||
kind: Service
|
|
||||||
metadata:
|
|
||||||
name: checkmk-service
|
|
||||||
namespace: checkmk
|
|
||||||
spec:
|
|
||||||
selector:
|
|
||||||
app: checkmk
|
|
||||||
ports:
|
|
||||||
- port: 5000
|
|
||||||
targetPort: 5000
|
|
||||||
---
|
|
||||||
apiVersion: apps/v1
|
|
||||||
kind: Deployment
|
|
||||||
metadata:
|
|
||||||
name: checkmk-deployment
|
|
||||||
namespace: checkmk
|
|
||||||
spec:
|
|
||||||
replicas: 1
|
|
||||||
selector:
|
|
||||||
matchLabels:
|
|
||||||
app: checkmk
|
|
||||||
template:
|
|
||||||
metadata:
|
|
||||||
labels:
|
|
||||||
app: checkmk
|
|
||||||
spec:
|
|
||||||
containers:
|
|
||||||
- name: checkmk
|
|
||||||
image: checkmk/check-mk-raw:2.4.0-latest
|
|
||||||
envFrom:
|
|
||||||
- secretRef:
|
|
||||||
name: checkmk-secrets
|
|
||||||
- configMapRef:
|
|
||||||
name: checkmk-config
|
|
||||||
ports:
|
|
||||||
- containerPort: 5000
|
|
||||||
volumeMounts:
|
|
||||||
- name: sites
|
|
||||||
mountPath: /omd/sites
|
|
||||||
- name: tmp
|
|
||||||
mountPath: /opt/omd/sites/cmk/tmp
|
|
||||||
resources:
|
|
||||||
requests:
|
|
||||||
memory: "2Gi"
|
|
||||||
cpu: "600m"
|
|
||||||
limits:
|
|
||||||
memory: "5Gi"
|
|
||||||
cpu: "4"
|
|
||||||
volumes:
|
|
||||||
- name: sites
|
|
||||||
persistentVolumeClaim:
|
|
||||||
claimName: checkmk-sites-pvc
|
|
||||||
- name: tmp
|
|
||||||
emptyDir:
|
|
||||||
medium: Memory
|
|
||||||
---
|
|
||||||
apiVersion: v1
|
|
||||||
kind: PersistentVolumeClaim
|
|
||||||
metadata:
|
|
||||||
name: checkmk-sites-pvc
|
|
||||||
namespace: checkmk
|
|
||||||
spec:
|
|
||||||
accessModes:
|
|
||||||
- ReadWriteOnce
|
|
||||||
resources:
|
|
||||||
requests:
|
|
||||||
storage: 5Gi
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
apiVersion: v1
|
|
||||||
kind: ConfigMap
|
|
||||||
metadata:
|
|
||||||
name: checkmk-config
|
|
||||||
namespace: checkmk
|
|
||||||
data:
|
|
||||||
TZ: Europe/Bratislava
|
|
||||||
CMK_SITE_ID: cmk
|
|
||||||
@@ -1,33 +0,0 @@
|
|||||||
apiVersion: traefik.io/v1alpha1
|
|
||||||
kind: IngressRoute
|
|
||||||
metadata:
|
|
||||||
name: checkmk-prod
|
|
||||||
namespace: checkmk
|
|
||||||
spec:
|
|
||||||
entryPoints:
|
|
||||||
- websecure
|
|
||||||
routes:
|
|
||||||
- match: Host(`cmk.forust.xyz`)
|
|
||||||
kind: Rule
|
|
||||||
middlewares:
|
|
||||||
- name: crowdsec-crowdsec-bouncer@kubernetescrd
|
|
||||||
services:
|
|
||||||
- name: checkmk-service
|
|
||||||
port: 5000
|
|
||||||
tls:
|
|
||||||
certResolver: letsencrypt
|
|
||||||
---
|
|
||||||
apiVersion: traefik.io/v1alpha1
|
|
||||||
kind: IngressRoute
|
|
||||||
metadata:
|
|
||||||
name: checkmk-local
|
|
||||||
namespace: checkmk
|
|
||||||
spec:
|
|
||||||
entryPoints:
|
|
||||||
- websecure
|
|
||||||
routes:
|
|
||||||
- match: Host(`cmk.workstation.internal`) || Host(`cmk.gigaforust.internal`)
|
|
||||||
kind: Rule
|
|
||||||
services:
|
|
||||||
- name: checkmk-service
|
|
||||||
port: 5000
|
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
apiVersion: v1
|
|
||||||
kind: Namespace
|
|
||||||
metadata:
|
|
||||||
name: checkmk
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
apiVersion: v1
|
|
||||||
kind: Secret
|
|
||||||
metadata:
|
|
||||||
name: checkmk-secrets
|
|
||||||
namespace: checkmk
|
|
||||||
type: Opaque
|
|
||||||
stringData:
|
|
||||||
CMK_PASSWORD: "password"
|
|
||||||
@@ -0,0 +1,35 @@
|
|||||||
|
services:
|
||||||
|
forust:
|
||||||
|
build:
|
||||||
|
context: .
|
||||||
|
dockerfile: Dockerfile
|
||||||
|
image: gcr.forust.xyz/forust/userbot:latest
|
||||||
|
pull_policy: build
|
||||||
|
restart: unless-stopped
|
||||||
|
env_file:
|
||||||
|
- .env
|
||||||
|
- .env.forust
|
||||||
|
volumes:
|
||||||
|
- ./volumes/data_forust:/app/data
|
||||||
|
- ./Downloads:/app/downloads
|
||||||
|
- ./volumes/logs_forust:/app/logs
|
||||||
|
dns:
|
||||||
|
- 8.8.8.8
|
||||||
|
- 1.1.1.1
|
||||||
|
|
||||||
|
anna:
|
||||||
|
image: gcr.forust.xyz/forust/userbot:latest
|
||||||
|
pull_policy: build
|
||||||
|
depends_on:
|
||||||
|
- forust
|
||||||
|
restart: unless-stopped
|
||||||
|
env_file:
|
||||||
|
- .env
|
||||||
|
- .env.anna
|
||||||
|
volumes:
|
||||||
|
- ./volumes/data_anna:/app/data
|
||||||
|
- ./Downloads:/app/downloads
|
||||||
|
- ./volumes/logs_anna:/app/logs
|
||||||
|
dns:
|
||||||
|
- 8.8.8.8
|
||||||
|
- 1.1.1.1
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
ACCOUNT_REGISTRATION=false
|
|
||||||
HTTP_ALLOWED=false
|
|
||||||
ALLOW_UNAUTHENTICAED=false
|
|
||||||
AUTO_DELETE_EVERY_N_HOURS=24
|
|
||||||
WEBROOT=/convert
|
|
||||||
HIDE_HISTORY=false
|
|
||||||
LANGUAGE=en
|
|
||||||
UNAUTHED_USER_SHARING=false
|
|
||||||
MAX_CONVERT_PROCESS=0
|
|
||||||
@@ -1,70 +0,0 @@
|
|||||||
services:
|
|
||||||
convertx:
|
|
||||||
container_name: convertx
|
|
||||||
image: ghcr.io/c4illin/convertx:latest
|
|
||||||
restart: unless-stopped
|
|
||||||
ports:
|
|
||||||
- "9992:3000"
|
|
||||||
# https://github.com/C4illin/ConvertX#environment-variables
|
|
||||||
environment:
|
|
||||||
- JWT_SECRET=$(JWT_SECRET)
|
|
||||||
- ACCOUNT_REGISTRATION=$(ACCOUNT_REGISTRATION:-false)
|
|
||||||
- HTTP_ALLOWED=$(HTTP_ALLOWED:-false)
|
|
||||||
- ALLOW_UNAUTHENTICATED=$(ALLOW_UNAUTHENTICATED:-false)
|
|
||||||
- AUTO_DELETE_EVERY_N_HOURS=$(AUTO_DELETE_EVERY_N_HOURS:-24)
|
|
||||||
- WEBROOT=$(WEBROOT)
|
|
||||||
- HIDE_HISTORY=$(HIDE_HISTORY:-false)
|
|
||||||
- LANGUAGE=$(LANGUAGE:-en)
|
|
||||||
- UNAUTHENTICATED_USER_SHARING=$(UNAUTHENTICATED_USER_SHARING:-false)
|
|
||||||
- MAX_CONVERT_PROCESS=$(MAX_CONVERT_PROCESS:-0)
|
|
||||||
labels:
|
|
||||||
- "traefik.enable=true"
|
|
||||||
- "traefik.http.services.convertx.loadbalancer.server.port=3000"
|
|
||||||
# Prod Router
|
|
||||||
- "traefik.http.routers.convertx.rule=(Host(`forust.xyz`) || Host(`www.forust.xyz`)) && PathPrefix(`/convert`)"
|
|
||||||
- "traefik.http.routers.convertx.entrypoints=websecure"
|
|
||||||
- "traefik.http.routers.convertx.priority=50"
|
|
||||||
- "traefik.http.routers.convertx.tls.certresolver=letsencrypt"
|
|
||||||
# Local Router
|
|
||||||
- "traefik.http.routers.convertx-local.rule=Host(`workstation.internal`) && PathPrefix(`/convert`)"
|
|
||||||
- "traefik.http.routers.convertx-local.entrypoints=websecure"
|
|
||||||
- "traefik.http.routers.convertx-local.priority=50"
|
|
||||||
- "traefik.http.routers.convertx-local.tls=true"
|
|
||||||
# Dev Router
|
|
||||||
- "traefik.http.routers.convertx-dev.rule=Host(`gigaforust.internal`) && PathPrefix(`/convert`)"
|
|
||||||
- "traefik.http.routers.convertx-dev.entrypoints=websecure"
|
|
||||||
- "traefik.http.routers.convertx-dev.priority=50"
|
|
||||||
- "traefik.http.routers.convertx-dev.tls=true"
|
|
||||||
networks:
|
|
||||||
- proxy
|
|
||||||
volumes:
|
|
||||||
- data:/app/data
|
|
||||||
|
|
||||||
bentopdf:
|
|
||||||
container_name: bentopdf
|
|
||||||
image: bentopdf/bentopdf:latest
|
|
||||||
restart: unless-stopped
|
|
||||||
labels:
|
|
||||||
- "traefik.enable=true"
|
|
||||||
- "traefik.http.services.bentopdf.loadbalancer.server.port=8080"
|
|
||||||
|
|
||||||
# Prod router
|
|
||||||
- "traefik.http.routers.bentopdf.rule=Host(`pdf.forust.xyz`)"
|
|
||||||
- "traefik.http.routers.bentopdf.entrypoints=websecure"
|
|
||||||
- "traefik.http.routers.bentopdf.tls.certresolver=letsencrypt"
|
|
||||||
- "traefik.http.routers.bentopdf.tls=true"
|
|
||||||
# Local router
|
|
||||||
- "traefik.http.routers.bentopdf-local.rule=Host(`pdf.wokstation.internal`)"
|
|
||||||
- "traefik.http.routers.bentopdf-local.entrypoints=websecure"
|
|
||||||
- "traefik.http.routers.bentopdf-local.tls=true"
|
|
||||||
# Dev router
|
|
||||||
- "traefik.http.routers.bentopdf-dev.rule=Host(`pdf.gigaforust.internal`)"
|
|
||||||
- "traefik.http.routers.bentopdf-dev.entrypoints=websecure"
|
|
||||||
- "traefik.http.routers.bentopdf-dev.tls=true"
|
|
||||||
networks:
|
|
||||||
- proxy
|
|
||||||
networks:
|
|
||||||
proxy:
|
|
||||||
external: true
|
|
||||||
volumes:
|
|
||||||
data:
|
|
||||||
@@ -1,42 +0,0 @@
|
|||||||
kind: Service
|
|
||||||
apiVersion: v1
|
|
||||||
metadata:
|
|
||||||
name: bentopdf-service
|
|
||||||
namespace: converters
|
|
||||||
spec:
|
|
||||||
selector:
|
|
||||||
app: bentopdf
|
|
||||||
ports:
|
|
||||||
- port: 8080
|
|
||||||
targetPort: 8080
|
|
||||||
---
|
|
||||||
apiVersion: apps/v1
|
|
||||||
kind: Deployment
|
|
||||||
metadata:
|
|
||||||
name: bentopdf-deployment
|
|
||||||
namespace: converters
|
|
||||||
spec:
|
|
||||||
replicas: 2
|
|
||||||
selector:
|
|
||||||
matchLabels:
|
|
||||||
app: bentopdf
|
|
||||||
template:
|
|
||||||
metadata:
|
|
||||||
labels:
|
|
||||||
app: bentopdf
|
|
||||||
spec:
|
|
||||||
containers:
|
|
||||||
- image: bentopdf/bentopdf:latest
|
|
||||||
imagePullPolicy: Always
|
|
||||||
name: bentopdf
|
|
||||||
ports:
|
|
||||||
- containerPort: 8080
|
|
||||||
resources:
|
|
||||||
requests:
|
|
||||||
memory: "50Mi"
|
|
||||||
cpu: "50m"
|
|
||||||
ephemeral-storage: "100Mi"
|
|
||||||
limits:
|
|
||||||
memory: "700Mi"
|
|
||||||
cpu: "700m"
|
|
||||||
ephemeral-storage: "5Gi"
|
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
# test manifest with docker and k8s config keys mismatch
|
|
||||||
apiVersion: v1
|
|
||||||
kind: ConfigMap
|
|
||||||
metadata:
|
|
||||||
name: convertx-config
|
|
||||||
namespace: converters
|
|
||||||
data:
|
|
||||||
ACCOUNT_REGISTRATION: "false"
|
|
||||||
HTTP_ALLOWED: "false"
|
|
||||||
ALLOW_UNAUTHENTICAED: "false"
|
|
||||||
AUTO_DELETE_EVERY_N_HOURS: "24"
|
|
||||||
WEBROOT: "/convert"
|
|
||||||
HIDE_HISTORY: "false"
|
|
||||||
LANGUAGE: "en"
|
|
||||||
UNAUTHED_USER_SHARING: "false"
|
|
||||||
MAX_CONVERT_PROCESS: "0"
|
|
||||||
@@ -1,63 +0,0 @@
|
|||||||
apiVersion: v1
|
|
||||||
kind: Service
|
|
||||||
metadata:
|
|
||||||
name: convertx-service
|
|
||||||
namespace: converters
|
|
||||||
spec:
|
|
||||||
selector:
|
|
||||||
app: convertx
|
|
||||||
ports:
|
|
||||||
- port: 3000
|
|
||||||
targetPort: 3000
|
|
||||||
---
|
|
||||||
apiVersion: apps/v1
|
|
||||||
kind: Deployment
|
|
||||||
metadata:
|
|
||||||
name: convertx-deployment
|
|
||||||
namespace: converters
|
|
||||||
spec:
|
|
||||||
replicas: 1
|
|
||||||
selector:
|
|
||||||
matchLabels:
|
|
||||||
app: convertx
|
|
||||||
template:
|
|
||||||
metadata:
|
|
||||||
labels:
|
|
||||||
app: convertx
|
|
||||||
spec:
|
|
||||||
containers:
|
|
||||||
- image: ghcr.io/c4illin/convertx:latest
|
|
||||||
name: convertx
|
|
||||||
envFrom:
|
|
||||||
- configMapRef:
|
|
||||||
name: convertx-config
|
|
||||||
- secretRef:
|
|
||||||
name: convertx-secrets
|
|
||||||
ports:
|
|
||||||
- containerPort: 3000
|
|
||||||
volumeMounts:
|
|
||||||
- mountPath: /data
|
|
||||||
name: data
|
|
||||||
resources:
|
|
||||||
requests:
|
|
||||||
memory: "250Mi"
|
|
||||||
cpu: "100m"
|
|
||||||
limits:
|
|
||||||
cpu: "1500m"
|
|
||||||
memory: "1.5Gi"
|
|
||||||
volumes:
|
|
||||||
- name: data
|
|
||||||
persistentVolumeClaim:
|
|
||||||
claimName: convertx-pvc
|
|
||||||
---
|
|
||||||
apiVersion: v1
|
|
||||||
kind: PersistentVolumeClaim
|
|
||||||
metadata:
|
|
||||||
name: convertx-pvc
|
|
||||||
namespace: converters
|
|
||||||
spec:
|
|
||||||
accessModes:
|
|
||||||
- ReadWriteOnce
|
|
||||||
resources:
|
|
||||||
requests:
|
|
||||||
storage: 2Gi
|
|
||||||
@@ -1,65 +0,0 @@
|
|||||||
apiVersion: traefik.io/v1alpha1
|
|
||||||
kind: IngressRoute
|
|
||||||
metadata:
|
|
||||||
name: convertx-prod
|
|
||||||
namespace: converters
|
|
||||||
spec:
|
|
||||||
entryPoints:
|
|
||||||
- websecure
|
|
||||||
routes:
|
|
||||||
- match: (Host(`forust.xyz`) || Host(`www.forust.xyz`)) && PathPrefix(`/convert`)
|
|
||||||
kind: Rule
|
|
||||||
priority: 50
|
|
||||||
services:
|
|
||||||
- name: convertx-service
|
|
||||||
port: 3000
|
|
||||||
tls:
|
|
||||||
certResolver: letsencrypt
|
|
||||||
---
|
|
||||||
apiVersion: traefik.io/v1alpha1
|
|
||||||
kind: IngressRoute
|
|
||||||
metadata:
|
|
||||||
name: convertx-local
|
|
||||||
namespace: converters
|
|
||||||
spec:
|
|
||||||
entryPoints:
|
|
||||||
- websecure
|
|
||||||
routes:
|
|
||||||
- match: (Host(`workstation.internal`) || Host(`gigaforust.internal`)) && PathPrefix(`/convert`)
|
|
||||||
kind: Rule
|
|
||||||
priority: 50
|
|
||||||
services:
|
|
||||||
- name: convertx-service
|
|
||||||
port: 3000
|
|
||||||
---
|
|
||||||
apiVersion: traefik.io/v1alpha1
|
|
||||||
kind: IngressRoute
|
|
||||||
metadata:
|
|
||||||
name: bentopdf-prod
|
|
||||||
namespace: converters
|
|
||||||
spec:
|
|
||||||
entryPoints:
|
|
||||||
- websecure
|
|
||||||
routes:
|
|
||||||
- match: Host(`pdf.forust.xyz`)
|
|
||||||
kind: Rule
|
|
||||||
services:
|
|
||||||
- name: bentopdf-service
|
|
||||||
port: 8080
|
|
||||||
tls:
|
|
||||||
certResolver: letsencrypt
|
|
||||||
---
|
|
||||||
apiVersion: traefik.io/v1alpha1
|
|
||||||
kind: IngressRoute
|
|
||||||
metadata:
|
|
||||||
name: bentopdf-local
|
|
||||||
namespace: converters
|
|
||||||
spec:
|
|
||||||
entryPoints:
|
|
||||||
- websecure
|
|
||||||
routes:
|
|
||||||
- match: Host(`pdf.workstation.internal`) || Host(`pdf.gigaforust.internal`)
|
|
||||||
kind: Rule
|
|
||||||
services:
|
|
||||||
- name: bentopdf-service
|
|
||||||
port: 8080
|
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
apiVersion: v1
|
|
||||||
kind: Namespace
|
|
||||||
metadata:
|
|
||||||
name: converters
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
apiVersion: v1
|
|
||||||
kind: Secret
|
|
||||||
metadata:
|
|
||||||
name: convertx-secrets
|
|
||||||
namespace: converters
|
|
||||||
type: Opaque
|
|
||||||
stringData:
|
|
||||||
jwt-secret: ""
|
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
apiVersion: traefik.io/v1alpha1
|
|
||||||
kind: Middleware
|
|
||||||
metadata:
|
|
||||||
name: crowdsec-bouncer
|
|
||||||
namespace: crowdsec
|
|
||||||
spec:
|
|
||||||
plugin:
|
|
||||||
crowdsec-bouncer:
|
|
||||||
enabled: true
|
|
||||||
LogLevel: INFO
|
|
||||||
CrowdsecMode: live
|
|
||||||
CrowdsecLapiScheme: http
|
|
||||||
CrowdsecLapiHost: crowdsec-service.crowdsec.svc.cluster.local:8080
|
|
||||||
CrowdsecLapiKeyFile: "/etc/traefik/secrets/traefik-api-key"
|
|
||||||
@@ -1,57 +0,0 @@
|
|||||||
container_runtime: containerd
|
|
||||||
agent:
|
|
||||||
env:
|
|
||||||
- name: COLLECTIONS
|
|
||||||
value: "crowdsecurity/traefik crowdsecurity/base-http-scenarios crowdsecurity/sshd"
|
|
||||||
extraVolumes:
|
|
||||||
- name: journal-dir
|
|
||||||
hostPath:
|
|
||||||
path: /var/log/journal
|
|
||||||
type: DirectoryOrCreate
|
|
||||||
- name: run-journal-dir
|
|
||||||
hostPath:
|
|
||||||
path: /run/log/journal
|
|
||||||
type: DirectoryOrCreate
|
|
||||||
extraVolumeMounts:
|
|
||||||
- name: journal-dir
|
|
||||||
mountPath: /var/log/journal
|
|
||||||
readOnly: true
|
|
||||||
- name: run-journal-dir
|
|
||||||
mountPath: /run/log/journal
|
|
||||||
readOnly: true
|
|
||||||
|
|
||||||
acquisition:
|
|
||||||
- namespace: traefik
|
|
||||||
podName: "*traefik*"
|
|
||||||
program: traefik
|
|
||||||
poll_without_inotify: true
|
|
||||||
|
|
||||||
acquisitionCustom: |
|
|
||||||
- source: journalctl
|
|
||||||
journalctl_filter:
|
|
||||||
- _SYSTEMD_UNIT=sshd.service
|
|
||||||
labels:
|
|
||||||
type: syslog
|
|
||||||
|
|
||||||
resources:
|
|
||||||
requests:
|
|
||||||
cpu: 50m
|
|
||||||
memory: 100Mi
|
|
||||||
limits:
|
|
||||||
cpu: 200m
|
|
||||||
memory: 500Mi
|
|
||||||
|
|
||||||
lapi:
|
|
||||||
env:
|
|
||||||
- name: COLLECTIONS
|
|
||||||
value: "crowdsecurity/traefik crowdsecurity/base-http-scenarios crowdsecurity/sshd"
|
|
||||||
service:
|
|
||||||
type: NodePort
|
|
||||||
nodePort: 30011
|
|
||||||
resources:
|
|
||||||
requests:
|
|
||||||
cpu: 50m
|
|
||||||
memory: 150Mi
|
|
||||||
limits:
|
|
||||||
cpu: 200m
|
|
||||||
memory: 500Mi
|
|
||||||
@@ -1,46 +0,0 @@
|
|||||||
services:
|
|
||||||
dockmon:
|
|
||||||
image: darthnorse/dockmon:latest
|
|
||||||
container_name: dockmon
|
|
||||||
restart: unless-stopped
|
|
||||||
# ports:
|
|
||||||
# - 8000:443
|
|
||||||
volumes:
|
|
||||||
- data:/app/data
|
|
||||||
- /var/run/docker.sock:/var/run/docker.sock
|
|
||||||
healthcheck:
|
|
||||||
test: ["CMD", "curl", "-k", "-f", "https://localhost:443/health"]
|
|
||||||
interval: 30s
|
|
||||||
timeout: 10s
|
|
||||||
retries: 3
|
|
||||||
labels:
|
|
||||||
- "traefik.enable=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"
|
|
||||||
|
|
||||||
# Prod Router
|
|
||||||
- "traefik.http.routers.dockmon.rule=Host(`dockmon.forust.xyz`)"
|
|
||||||
- "traefik.http.routers.dockmon.entrypoints=websecure"
|
|
||||||
- "traefik.http.routers.dockmon.middlewares=security-headers@file"
|
|
||||||
- "traefik.http.routers.dockmon.tls.certresolver=letsencrypt"
|
|
||||||
# Local Router
|
|
||||||
- "traefik.http.routers.dockmon-local.rule=Host(`dockmon.workstation.internal`)"
|
|
||||||
- "traefik.http.routers.dockmon-local.entrypoints=websecure"
|
|
||||||
- "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.tls=true"
|
|
||||||
|
|
||||||
# Glance Metadata
|
|
||||||
- glance.name=dockmon
|
|
||||||
- glance.url=https://dockmon.forust.xyz/
|
|
||||||
- glance.description=Dockmon is a lightweight Docker container monitoring and management tool with a user-friendly web interface.
|
|
||||||
networks:
|
|
||||||
- proxy
|
|
||||||
volumes:
|
|
||||||
data:
|
|
||||||
networks:
|
|
||||||
proxy:
|
|
||||||
external: true
|
|
||||||
@@ -1,68 +0,0 @@
|
|||||||
apiVersion: v1
|
|
||||||
kind: Service
|
|
||||||
metadata:
|
|
||||||
name: dockmon-service
|
|
||||||
namespace: dockmon
|
|
||||||
spec:
|
|
||||||
clusterIP: None
|
|
||||||
selector:
|
|
||||||
app: dockmon
|
|
||||||
ports:
|
|
||||||
- port: 443
|
|
||||||
targetPort: 443
|
|
||||||
---
|
|
||||||
apiVersion: apps/v1
|
|
||||||
kind: StatefulSet
|
|
||||||
metadata:
|
|
||||||
name: dockmon-statefulset
|
|
||||||
namespace: dockmon
|
|
||||||
spec:
|
|
||||||
serviceName: dockmon-service
|
|
||||||
replicas: 1
|
|
||||||
selector:
|
|
||||||
matchLabels:
|
|
||||||
app: dockmon
|
|
||||||
template:
|
|
||||||
metadata:
|
|
||||||
labels:
|
|
||||||
app: dockmon
|
|
||||||
spec:
|
|
||||||
containers:
|
|
||||||
- name: dockmon
|
|
||||||
image: darthnorse/dockmon:latest
|
|
||||||
ports:
|
|
||||||
- containerPort: 443
|
|
||||||
volumeMounts:
|
|
||||||
- name: data
|
|
||||||
mountPath: /app/data
|
|
||||||
- name: docker-sock
|
|
||||||
mountPath: /var/run/docker.sock
|
|
||||||
livenessProbe:
|
|
||||||
httpGet:
|
|
||||||
path: /health
|
|
||||||
port: 443
|
|
||||||
scheme: HTTPS
|
|
||||||
initialDelaySeconds: 30
|
|
||||||
periodSeconds: 30
|
|
||||||
timeoutSeconds: 10
|
|
||||||
failureThreshold: 3
|
|
||||||
resources:
|
|
||||||
requests:
|
|
||||||
memory: "512Mi"
|
|
||||||
cpu: "200m"
|
|
||||||
limits:
|
|
||||||
memory: "1.5Gi"
|
|
||||||
cpu: "700m "
|
|
||||||
volumes:
|
|
||||||
- name: docker-sock
|
|
||||||
hostPath:
|
|
||||||
path: /var/run/docker.sock
|
|
||||||
type: Socket
|
|
||||||
volumeClaimTemplates:
|
|
||||||
- metadata:
|
|
||||||
name: data
|
|
||||||
spec:
|
|
||||||
accessModes: ["ReadWriteOnce"]
|
|
||||||
resources:
|
|
||||||
requests:
|
|
||||||
storage: 1Gi
|
|
||||||
@@ -1,44 +0,0 @@
|
|||||||
apiVersion: traefik.io/v1alpha1
|
|
||||||
kind: ServersTransport
|
|
||||||
metadata:
|
|
||||||
name: dockmon-transport
|
|
||||||
namespace: dockmon
|
|
||||||
spec:
|
|
||||||
insecureSkipVerify: true
|
|
||||||
---
|
|
||||||
apiVersion: traefik.io/v1alpha1
|
|
||||||
kind: IngressRoute
|
|
||||||
metadata:
|
|
||||||
name: dockmon-prod
|
|
||||||
namespace: dockmon
|
|
||||||
spec:
|
|
||||||
entryPoints:
|
|
||||||
- websecure
|
|
||||||
routes:
|
|
||||||
- match: Host(`dockmon.forust.xyz`)
|
|
||||||
kind: Rule
|
|
||||||
middlewares:
|
|
||||||
- name: crowdsec-crowdsec-bouncer@kubernetescrd
|
|
||||||
- name: security-headers@file
|
|
||||||
services:
|
|
||||||
- name: dockmon-service
|
|
||||||
port: 443
|
|
||||||
serversTransport: dockmon-transport
|
|
||||||
tls:
|
|
||||||
certResolver: letsencrypt
|
|
||||||
---
|
|
||||||
apiVersion: traefik.io/v1alpha1
|
|
||||||
kind: IngressRoute
|
|
||||||
metadata:
|
|
||||||
name: dockmon-local
|
|
||||||
namespace: dockmon
|
|
||||||
spec:
|
|
||||||
entryPoints:
|
|
||||||
- websecure
|
|
||||||
routes:
|
|
||||||
- match: Host(`dockmon.workstation.internal`) || Host(`dockmon.gigaforust.internal`)
|
|
||||||
kind: Rule
|
|
||||||
services:
|
|
||||||
- name: dockmon-service
|
|
||||||
port: 443
|
|
||||||
serversTransport: dockmon-transport
|
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
apiVersion: v1
|
|
||||||
kind: Namespace
|
|
||||||
metadata:
|
|
||||||
name: dockmon
|
|
||||||
@@ -1,31 +0,0 @@
|
|||||||
services:
|
|
||||||
downtify:
|
|
||||||
container_name: downtify
|
|
||||||
image: ghcr.io/henriquesebastiao/downtify:latest
|
|
||||||
restart: unless-stopped
|
|
||||||
# ports:
|
|
||||||
# - '7077:8000'
|
|
||||||
volumes:
|
|
||||||
- ./Downtify_downloads:/downloads
|
|
||||||
labels:
|
|
||||||
- "traefik.enable=true"
|
|
||||||
- "traefik.http.services.downtify.loadbalancer.server.port=8000"
|
|
||||||
|
|
||||||
# Prod Router
|
|
||||||
- "traefik.http.routers.downtify.rule=Host(`downtify.forust.xyz`)"
|
|
||||||
- "traefik.http.routers.downtify.entrypoints=websecure"
|
|
||||||
- "traefik.http.routers.downtify.middlewares=security-chain@file"
|
|
||||||
- "traefik.http.routers.downtify.tls.certresolver=letsencrypt"
|
|
||||||
# Local Router
|
|
||||||
- "traefik.http.routers.downtify-local.rule=Host(`downtify.workstation.internal`)"
|
|
||||||
- "traefik.http.routers.downtify-local.entrypoints=websecure"
|
|
||||||
- "traefik.http.routers.downtify-local.tls=true"
|
|
||||||
# Dev Router
|
|
||||||
- "traefik.http.routers.downtify-dev.rule=Host(`downtify.gigaforust.internal`)"
|
|
||||||
- "traefik.http.routers.downtify-dev.entrypoints=websecure"
|
|
||||||
- "traefik.http.routers.downtify-dev.tls=true"
|
|
||||||
networks:
|
|
||||||
- proxy
|
|
||||||
networks:
|
|
||||||
proxy:
|
|
||||||
external: true
|
|
||||||
@@ -1,58 +0,0 @@
|
|||||||
apiVersion: v1
|
|
||||||
kind: Service
|
|
||||||
metadata:
|
|
||||||
name: downtify-service
|
|
||||||
namespace: downtify
|
|
||||||
spec:
|
|
||||||
selector:
|
|
||||||
app: downtify
|
|
||||||
ports:
|
|
||||||
- port: 8000
|
|
||||||
targetPort: 8000
|
|
||||||
---
|
|
||||||
apiVersion: apps/v1
|
|
||||||
kind: Deployment
|
|
||||||
metadata:
|
|
||||||
name: downtify-deployment
|
|
||||||
namespace: downtify
|
|
||||||
spec:
|
|
||||||
replicas: 1
|
|
||||||
selector:
|
|
||||||
matchLabels:
|
|
||||||
app: downtify
|
|
||||||
template:
|
|
||||||
metadata:
|
|
||||||
labels:
|
|
||||||
app: downtify
|
|
||||||
spec:
|
|
||||||
containers:
|
|
||||||
- name: downtify
|
|
||||||
image: ghcr.io/henriquesebastiao/downtify:latest
|
|
||||||
ports:
|
|
||||||
- containerPort: 8000
|
|
||||||
volumeMounts:
|
|
||||||
- name: downloads
|
|
||||||
mountPath: /downloads
|
|
||||||
resources:
|
|
||||||
requests:
|
|
||||||
memory: "128Mi"
|
|
||||||
cpu: "200m"
|
|
||||||
limits:
|
|
||||||
memory: "1Gi"
|
|
||||||
cpu: "1"
|
|
||||||
volumes:
|
|
||||||
- name: downloads
|
|
||||||
persistentVolumeClaim:
|
|
||||||
claimName: downtify-downloads-pvc
|
|
||||||
---
|
|
||||||
apiVersion: v1
|
|
||||||
kind: PersistentVolumeClaim
|
|
||||||
metadata:
|
|
||||||
name: downtify-downloads-pvc
|
|
||||||
namespace: downtify
|
|
||||||
spec:
|
|
||||||
accessModes:
|
|
||||||
- ReadWriteOnce
|
|
||||||
resources:
|
|
||||||
requests:
|
|
||||||
storage: 10Gi
|
|
||||||
@@ -1,34 +0,0 @@
|
|||||||
apiVersion: traefik.io/v1alpha1
|
|
||||||
kind: IngressRoute
|
|
||||||
metadata:
|
|
||||||
name: downtify-prod
|
|
||||||
namespace: downtify
|
|
||||||
spec:
|
|
||||||
entryPoints:
|
|
||||||
- websecure
|
|
||||||
routes:
|
|
||||||
- match: Host(`downtify.forust.xyz`)
|
|
||||||
kind: Rule
|
|
||||||
middlewares:
|
|
||||||
- name: crowdsec-crowdsec-bouncer@kubernetescrd
|
|
||||||
- name: security-chain@file
|
|
||||||
services:
|
|
||||||
- name: downtify-service
|
|
||||||
port: 8000
|
|
||||||
tls:
|
|
||||||
certResolver: letsencrypt
|
|
||||||
---
|
|
||||||
apiVersion: traefik.io/v1alpha1
|
|
||||||
kind: IngressRoute
|
|
||||||
metadata:
|
|
||||||
name: downtify-local
|
|
||||||
namespace: downtify
|
|
||||||
spec:
|
|
||||||
entryPoints:
|
|
||||||
- websecure
|
|
||||||
routes:
|
|
||||||
- match: Host(`downtify.workstation.internal`) || Host(`downtify.gigaforust.internal`)
|
|
||||||
kind: Rule
|
|
||||||
services:
|
|
||||||
- name: downtify-service
|
|
||||||
port: 8000
|
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
apiVersion: v1
|
|
||||||
kind: Namespace
|
|
||||||
metadata:
|
|
||||||
name: downtify
|
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
FROM python:3.9-alpine
|
|
||||||
|
|
||||||
WORKDIR /app
|
|
||||||
|
|
||||||
# Установка зависимостей
|
|
||||||
COPY requirements.txt .
|
|
||||||
RUN pip install --no-cache-dir -r requirements.txt
|
|
||||||
|
|
||||||
# Копирование кода
|
|
||||||
COPY main.py .
|
|
||||||
COPY .env .
|
|
||||||
# Запуск бота
|
|
||||||
CMD ["python", "-u", "main.py"]
|
|
||||||
@@ -1,373 +0,0 @@
|
|||||||
Mozilla Public License Version 2.0
|
|
||||||
==================================
|
|
||||||
|
|
||||||
1. Definitions
|
|
||||||
--------------
|
|
||||||
|
|
||||||
1.1. "Contributor"
|
|
||||||
means each individual or legal entity that creates, contributes to
|
|
||||||
the creation of, or owns Covered Software.
|
|
||||||
|
|
||||||
1.2. "Contributor Version"
|
|
||||||
means the combination of the Contributions of others (if any) used
|
|
||||||
by a Contributor and that particular Contributor's Contribution.
|
|
||||||
|
|
||||||
1.3. "Contribution"
|
|
||||||
means Covered Software of a particular Contributor.
|
|
||||||
|
|
||||||
1.4. "Covered Software"
|
|
||||||
means Source Code Form to which the initial Contributor has attached
|
|
||||||
the notice in Exhibit A, the Executable Form of such Source Code
|
|
||||||
Form, and Modifications of such Source Code Form, in each case
|
|
||||||
including portions thereof.
|
|
||||||
|
|
||||||
1.5. "Incompatible With Secondary Licenses"
|
|
||||||
means
|
|
||||||
|
|
||||||
(a) that the initial Contributor has attached the notice described
|
|
||||||
in Exhibit B to the Covered Software; or
|
|
||||||
|
|
||||||
(b) that the Covered Software was made available under the terms of
|
|
||||||
version 1.1 or earlier of the License, but not also under the
|
|
||||||
terms of a Secondary License.
|
|
||||||
|
|
||||||
1.6. "Executable Form"
|
|
||||||
means any form of the work other than Source Code Form.
|
|
||||||
|
|
||||||
1.7. "Larger Work"
|
|
||||||
means a work that combines Covered Software with other material, in
|
|
||||||
a separate file or files, that is not Covered Software.
|
|
||||||
|
|
||||||
1.8. "License"
|
|
||||||
means this document.
|
|
||||||
|
|
||||||
1.9. "Licensable"
|
|
||||||
means having the right to grant, to the maximum extent possible,
|
|
||||||
whether at the time of the initial grant or subsequently, any and
|
|
||||||
all of the rights conveyed by this License.
|
|
||||||
|
|
||||||
1.10. "Modifications"
|
|
||||||
means any of the following:
|
|
||||||
|
|
||||||
(a) any file in Source Code Form that results from an addition to,
|
|
||||||
deletion from, or modification of the contents of Covered
|
|
||||||
Software; or
|
|
||||||
|
|
||||||
(b) any new file in Source Code Form that contains any Covered
|
|
||||||
Software.
|
|
||||||
|
|
||||||
1.11. "Patent Claims" of a Contributor
|
|
||||||
means any patent claim(s), including without limitation, method,
|
|
||||||
process, and apparatus claims, in any patent Licensable by such
|
|
||||||
Contributor that would be infringed, but for the grant of the
|
|
||||||
License, by the making, using, selling, offering for sale, having
|
|
||||||
made, import, or transfer of either its Contributions or its
|
|
||||||
Contributor Version.
|
|
||||||
|
|
||||||
1.12. "Secondary License"
|
|
||||||
means either the GNU General Public License, Version 2.0, the GNU
|
|
||||||
Lesser General Public License, Version 2.1, the GNU Affero General
|
|
||||||
Public License, Version 3.0, or any later versions of those
|
|
||||||
licenses.
|
|
||||||
|
|
||||||
1.13. "Source Code Form"
|
|
||||||
means the form of the work preferred for making modifications.
|
|
||||||
|
|
||||||
1.14. "You" (or "Your")
|
|
||||||
means an individual or a legal entity exercising rights under this
|
|
||||||
License. For legal entities, "You" includes any entity that
|
|
||||||
controls, is controlled by, or is under common control with You. For
|
|
||||||
purposes of this definition, "control" means (a) the power, direct
|
|
||||||
or indirect, to cause the direction or management of such entity,
|
|
||||||
whether by contract or otherwise, or (b) ownership of more than
|
|
||||||
fifty percent (50%) of the outstanding shares or beneficial
|
|
||||||
ownership of such entity.
|
|
||||||
|
|
||||||
2. License Grants and Conditions
|
|
||||||
--------------------------------
|
|
||||||
|
|
||||||
2.1. Grants
|
|
||||||
|
|
||||||
Each Contributor hereby grants You a world-wide, royalty-free,
|
|
||||||
non-exclusive license:
|
|
||||||
|
|
||||||
(a) under intellectual property rights (other than patent or trademark)
|
|
||||||
Licensable by such Contributor to use, reproduce, make available,
|
|
||||||
modify, display, perform, distribute, and otherwise exploit its
|
|
||||||
Contributions, either on an unmodified basis, with Modifications, or
|
|
||||||
as part of a Larger Work; and
|
|
||||||
|
|
||||||
(b) under Patent Claims of such Contributor to make, use, sell, offer
|
|
||||||
for sale, have made, import, and otherwise transfer either its
|
|
||||||
Contributions or its Contributor Version.
|
|
||||||
|
|
||||||
2.2. Effective Date
|
|
||||||
|
|
||||||
The licenses granted in Section 2.1 with respect to any Contribution
|
|
||||||
become effective for each Contribution on the date the Contributor first
|
|
||||||
distributes such Contribution.
|
|
||||||
|
|
||||||
2.3. Limitations on Grant Scope
|
|
||||||
|
|
||||||
The licenses granted in this Section 2 are the only rights granted under
|
|
||||||
this License. No additional rights or licenses will be implied from the
|
|
||||||
distribution or licensing of Covered Software under this License.
|
|
||||||
Notwithstanding Section 2.1(b) above, no patent license is granted by a
|
|
||||||
Contributor:
|
|
||||||
|
|
||||||
(a) for any code that a Contributor has removed from Covered Software;
|
|
||||||
or
|
|
||||||
|
|
||||||
(b) for infringements caused by: (i) Your and any other third party's
|
|
||||||
modifications of Covered Software, or (ii) the combination of its
|
|
||||||
Contributions with other software (except as part of its Contributor
|
|
||||||
Version); or
|
|
||||||
|
|
||||||
(c) under Patent Claims infringed by Covered Software in the absence of
|
|
||||||
its Contributions.
|
|
||||||
|
|
||||||
This License does not grant any rights in the trademarks, service marks,
|
|
||||||
or logos of any Contributor (except as may be necessary to comply with
|
|
||||||
the notice requirements in Section 3.4).
|
|
||||||
|
|
||||||
2.4. Subsequent Licenses
|
|
||||||
|
|
||||||
No Contributor makes additional grants as a result of Your choice to
|
|
||||||
distribute the Covered Software under a subsequent version of this
|
|
||||||
License (see Section 10.2) or under the terms of a Secondary License (if
|
|
||||||
permitted under the terms of Section 3.3).
|
|
||||||
|
|
||||||
2.5. Representation
|
|
||||||
|
|
||||||
Each Contributor represents that the Contributor believes its
|
|
||||||
Contributions are its original creation(s) or it has sufficient rights
|
|
||||||
to grant the rights to its Contributions conveyed by this License.
|
|
||||||
|
|
||||||
2.6. Fair Use
|
|
||||||
|
|
||||||
This License is not intended to limit any rights You have under
|
|
||||||
applicable copyright doctrines of fair use, fair dealing, or other
|
|
||||||
equivalents.
|
|
||||||
|
|
||||||
2.7. Conditions
|
|
||||||
|
|
||||||
Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
|
|
||||||
in Section 2.1.
|
|
||||||
|
|
||||||
3. Responsibilities
|
|
||||||
-------------------
|
|
||||||
|
|
||||||
3.1. Distribution of Source Form
|
|
||||||
|
|
||||||
All distribution of Covered Software in Source Code Form, including any
|
|
||||||
Modifications that You create or to which You contribute, must be under
|
|
||||||
the terms of this License. You must inform recipients that the Source
|
|
||||||
Code Form of the Covered Software is governed by the terms of this
|
|
||||||
License, and how they can obtain a copy of this License. You may not
|
|
||||||
attempt to alter or restrict the recipients' rights in the Source Code
|
|
||||||
Form.
|
|
||||||
|
|
||||||
3.2. Distribution of Executable Form
|
|
||||||
|
|
||||||
If You distribute Covered Software in Executable Form then:
|
|
||||||
|
|
||||||
(a) such Covered Software must also be made available in Source Code
|
|
||||||
Form, as described in Section 3.1, and You must inform recipients of
|
|
||||||
the Executable Form how they can obtain a copy of such Source Code
|
|
||||||
Form by reasonable means in a timely manner, at a charge no more
|
|
||||||
than the cost of distribution to the recipient; and
|
|
||||||
|
|
||||||
(b) You may distribute such Executable Form under the terms of this
|
|
||||||
License, or sublicense it under different terms, provided that the
|
|
||||||
license for the Executable Form does not attempt to limit or alter
|
|
||||||
the recipients' rights in the Source Code Form under this License.
|
|
||||||
|
|
||||||
3.3. Distribution of a Larger Work
|
|
||||||
|
|
||||||
You may create and distribute a Larger Work under terms of Your choice,
|
|
||||||
provided that You also comply with the requirements of this License for
|
|
||||||
the Covered Software. If the Larger Work is a combination of Covered
|
|
||||||
Software with a work governed by one or more Secondary Licenses, and the
|
|
||||||
Covered Software is not Incompatible With Secondary Licenses, this
|
|
||||||
License permits You to additionally distribute such Covered Software
|
|
||||||
under the terms of such Secondary License(s), so that the recipient of
|
|
||||||
the Larger Work may, at their option, further distribute the Covered
|
|
||||||
Software under the terms of either this License or such Secondary
|
|
||||||
License(s).
|
|
||||||
|
|
||||||
3.4. Notices
|
|
||||||
|
|
||||||
You may not remove or alter the substance of any license notices
|
|
||||||
(including copyright notices, patent notices, disclaimers of warranty,
|
|
||||||
or limitations of liability) contained within the Source Code Form of
|
|
||||||
the Covered Software, except that You may alter any license notices to
|
|
||||||
the extent required to remedy known factual inaccuracies.
|
|
||||||
|
|
||||||
3.5. Application of Additional Terms
|
|
||||||
|
|
||||||
You may choose to offer, and to charge a fee for, warranty, support,
|
|
||||||
indemnity or liability obligations to one or more recipients of Covered
|
|
||||||
Software. However, You may do so only on Your own behalf, and not on
|
|
||||||
behalf of any Contributor. You must make it absolutely clear that any
|
|
||||||
such warranty, support, indemnity, or liability obligation is offered by
|
|
||||||
You alone, and You hereby agree to indemnify every Contributor for any
|
|
||||||
liability incurred by such Contributor as a result of warranty, support,
|
|
||||||
indemnity or liability terms You offer. You may include additional
|
|
||||||
disclaimers of warranty and limitations of liability specific to any
|
|
||||||
jurisdiction.
|
|
||||||
|
|
||||||
4. Inability to Comply Due to Statute or Regulation
|
|
||||||
---------------------------------------------------
|
|
||||||
|
|
||||||
If it is impossible for You to comply with any of the terms of this
|
|
||||||
License with respect to some or all of the Covered Software due to
|
|
||||||
statute, judicial order, or regulation then You must: (a) comply with
|
|
||||||
the terms of this License to the maximum extent possible; and (b)
|
|
||||||
describe the limitations and the code they affect. Such description must
|
|
||||||
be placed in a text file included with all distributions of the Covered
|
|
||||||
Software under this License. Except to the extent prohibited by statute
|
|
||||||
or regulation, such description must be sufficiently detailed for a
|
|
||||||
recipient of ordinary skill to be able to understand it.
|
|
||||||
|
|
||||||
5. Termination
|
|
||||||
--------------
|
|
||||||
|
|
||||||
5.1. The rights granted under this License will terminate automatically
|
|
||||||
if You fail to comply with any of its terms. However, if You become
|
|
||||||
compliant, then the rights granted under this License from a particular
|
|
||||||
Contributor are reinstated (a) provisionally, unless and until such
|
|
||||||
Contributor explicitly and finally terminates Your grants, and (b) on an
|
|
||||||
ongoing basis, if such Contributor fails to notify You of the
|
|
||||||
non-compliance by some reasonable means prior to 60 days after You have
|
|
||||||
come back into compliance. Moreover, Your grants from a particular
|
|
||||||
Contributor are reinstated on an ongoing basis if such Contributor
|
|
||||||
notifies You of the non-compliance by some reasonable means, this is the
|
|
||||||
first time You have received notice of non-compliance with this License
|
|
||||||
from such Contributor, and You become compliant prior to 30 days after
|
|
||||||
Your receipt of the notice.
|
|
||||||
|
|
||||||
5.2. If You initiate litigation against any entity by asserting a patent
|
|
||||||
infringement claim (excluding declaratory judgment actions,
|
|
||||||
counter-claims, and cross-claims) alleging that a Contributor Version
|
|
||||||
directly or indirectly infringes any patent, then the rights granted to
|
|
||||||
You by any and all Contributors for the Covered Software under Section
|
|
||||||
2.1 of this License shall terminate.
|
|
||||||
|
|
||||||
5.3. In the event of termination under Sections 5.1 or 5.2 above, all
|
|
||||||
end user license agreements (excluding distributors and resellers) which
|
|
||||||
have been validly granted by You or Your distributors under this License
|
|
||||||
prior to termination shall survive termination.
|
|
||||||
|
|
||||||
************************************************************************
|
|
||||||
* *
|
|
||||||
* 6. Disclaimer of Warranty *
|
|
||||||
* ------------------------- *
|
|
||||||
* *
|
|
||||||
* Covered Software is provided under this License on an "as is" *
|
|
||||||
* basis, without warranty of any kind, either expressed, implied, or *
|
|
||||||
* statutory, including, without limitation, warranties that the *
|
|
||||||
* Covered Software is free of defects, merchantable, fit for a *
|
|
||||||
* particular purpose or non-infringing. The entire risk as to the *
|
|
||||||
* quality and performance of the Covered Software is with You. *
|
|
||||||
* Should any Covered Software prove defective in any respect, You *
|
|
||||||
* (not any Contributor) assume the cost of any necessary servicing, *
|
|
||||||
* repair, or correction. This disclaimer of warranty constitutes an *
|
|
||||||
* essential part of this License. No use of any Covered Software is *
|
|
||||||
* authorized under this License except under this disclaimer. *
|
|
||||||
* *
|
|
||||||
************************************************************************
|
|
||||||
|
|
||||||
************************************************************************
|
|
||||||
* *
|
|
||||||
* 7. Limitation of Liability *
|
|
||||||
* -------------------------- *
|
|
||||||
* *
|
|
||||||
* Under no circumstances and under no legal theory, whether tort *
|
|
||||||
* (including negligence), contract, or otherwise, shall any *
|
|
||||||
* Contributor, or anyone who distributes Covered Software as *
|
|
||||||
* permitted above, be liable to You for any direct, indirect, *
|
|
||||||
* special, incidental, or consequential damages of any character *
|
|
||||||
* including, without limitation, damages for lost profits, loss of *
|
|
||||||
* goodwill, work stoppage, computer failure or malfunction, or any *
|
|
||||||
* and all other commercial damages or losses, even if such party *
|
|
||||||
* shall have been informed of the possibility of such damages. This *
|
|
||||||
* limitation of liability shall not apply to liability for death or *
|
|
||||||
* personal injury resulting from such party's negligence to the *
|
|
||||||
* extent applicable law prohibits such limitation. Some *
|
|
||||||
* jurisdictions do not allow the exclusion or limitation of *
|
|
||||||
* incidental or consequential damages, so this exclusion and *
|
|
||||||
* limitation may not apply to You. *
|
|
||||||
* *
|
|
||||||
************************************************************************
|
|
||||||
|
|
||||||
8. Litigation
|
|
||||||
-------------
|
|
||||||
|
|
||||||
Any litigation relating to this License may be brought only in the
|
|
||||||
courts of a jurisdiction where the defendant maintains its principal
|
|
||||||
place of business and such litigation shall be governed by laws of that
|
|
||||||
jurisdiction, without reference to its conflict-of-law provisions.
|
|
||||||
Nothing in this Section shall prevent a party's ability to bring
|
|
||||||
cross-claims or counter-claims.
|
|
||||||
|
|
||||||
9. Miscellaneous
|
|
||||||
----------------
|
|
||||||
|
|
||||||
This License represents the complete agreement concerning the subject
|
|
||||||
matter hereof. If any provision of this License is held to be
|
|
||||||
unenforceable, such provision shall be reformed only to the extent
|
|
||||||
necessary to make it enforceable. Any law or regulation which provides
|
|
||||||
that the language of a contract shall be construed against the drafter
|
|
||||||
shall not be used to construe this License against a Contributor.
|
|
||||||
|
|
||||||
10. Versions of the License
|
|
||||||
---------------------------
|
|
||||||
|
|
||||||
10.1. New Versions
|
|
||||||
|
|
||||||
Mozilla Foundation is the license steward. Except as provided in Section
|
|
||||||
10.3, no one other than the license steward has the right to modify or
|
|
||||||
publish new versions of this License. Each version will be given a
|
|
||||||
distinguishing version number.
|
|
||||||
|
|
||||||
10.2. Effect of New Versions
|
|
||||||
|
|
||||||
You may distribute the Covered Software under the terms of the version
|
|
||||||
of the License under which You originally received the Covered Software,
|
|
||||||
or under the terms of any subsequent version published by the license
|
|
||||||
steward.
|
|
||||||
|
|
||||||
10.3. Modified Versions
|
|
||||||
|
|
||||||
If you create software not governed by this License, and you want to
|
|
||||||
create a new license for such software, you may create and use a
|
|
||||||
modified version of this License if you rename the license and remove
|
|
||||||
any references to the name of the license steward (except to note that
|
|
||||||
such modified license differs from this License).
|
|
||||||
|
|
||||||
10.4. Distributing Source Code Form that is Incompatible With Secondary
|
|
||||||
Licenses
|
|
||||||
|
|
||||||
If You choose to distribute Source Code Form that is Incompatible With
|
|
||||||
Secondary Licenses under the terms of this version of the License, the
|
|
||||||
notice described in Exhibit B of this License must be attached.
|
|
||||||
|
|
||||||
Exhibit A - Source Code Form License Notice
|
|
||||||
-------------------------------------------
|
|
||||||
|
|
||||||
This Source Code Form is subject to the terms of the Mozilla Public
|
|
||||||
License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
||||||
file, You can obtain one at https://mozilla.org/MPL/2.0/.
|
|
||||||
|
|
||||||
If it is not possible or desirable to put the notice in a particular
|
|
||||||
file, then You may include the notice in a location (such as a LICENSE
|
|
||||||
file in a relevant directory) where a recipient would be likely to look
|
|
||||||
for such a notice.
|
|
||||||
|
|
||||||
You may add additional accurate notices of copyright ownership.
|
|
||||||
|
|
||||||
Exhibit B - "Incompatible With Secondary Licenses" Notice
|
|
||||||
---------------------------------------------------------
|
|
||||||
|
|
||||||
This Source Code Form is "Incompatible With Secondary Licenses", as
|
|
||||||
defined by the Mozilla Public License, v. 2.0.
|
|
||||||
@@ -1,15 +0,0 @@
|
|||||||
services:
|
|
||||||
dtek_notif:
|
|
||||||
build:
|
|
||||||
context: .
|
|
||||||
dockerfile: Dockerfile
|
|
||||||
image: gcr.forust.xyz/forust/dtek-notif:latest
|
|
||||||
pull_policy: build
|
|
||||||
restart: unless-stopped
|
|
||||||
environment:
|
|
||||||
- TZ=Europe/Kyiv
|
|
||||||
dns:
|
|
||||||
- 1.1.1.1
|
|
||||||
- 8.8.8.8
|
|
||||||
networks:
|
|
||||||
- default
|
|
||||||
@@ -1,778 +0,0 @@
|
|||||||
import requests
|
|
||||||
import json
|
|
||||||
import asyncio
|
|
||||||
from bs4 import BeautifulSoup
|
|
||||||
from datetime import datetime, timedelta
|
|
||||||
from aiogram import Bot, Dispatcher, types
|
|
||||||
from aiogram.filters import Command
|
|
||||||
from aiogram.types import Message, KeyboardButton
|
|
||||||
from aiogram.utils.keyboard import ReplyKeyboardBuilder
|
|
||||||
import logging
|
|
||||||
import os
|
|
||||||
from dotenv import load_dotenv
|
|
||||||
from typing import Optional, List, Dict
|
|
||||||
|
|
||||||
# Загрузка переменных окружения
|
|
||||||
load_dotenv()
|
|
||||||
|
|
||||||
# Настройки
|
|
||||||
TELEGRAM_TOKEN = os.getenv("TELEGRAM_TOKEN", "YOUR_TOKEN_HERE")
|
|
||||||
ALLOWED_CHAT_IDS = list(map(int, os.getenv("ALLOWED_CHAT_IDS", "").split(","))) if os.getenv("ALLOWED_CHAT_IDS") else []
|
|
||||||
CHECK_INTERVAL = int(os.getenv("CHECK_INTERVAL", "120"))
|
|
||||||
|
|
||||||
# Параметры для запроса
|
|
||||||
VOE_CITY_ID = int(os.getenv("VOE_CITY_ID", "VOE_CITY_ID"))
|
|
||||||
VOE_STREET_ID = int(os.getenv("VOE_STREET_ID", "VOE_STREET_ID"))
|
|
||||||
VOE_HOUSE_ID = int(os.getenv("VOE_HOUSE_ID", "VOE_HOUSE_ID"))
|
|
||||||
|
|
||||||
# Настройка логирования
|
|
||||||
logging.basicConfig(
|
|
||||||
level=logging.INFO,
|
|
||||||
format='%(asctime)s - %(name)s - %(levelname)s - %(message)s'
|
|
||||||
)
|
|
||||||
logger = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
# Глобальные переменные
|
|
||||||
bot = Bot(token=TELEGRAM_TOKEN)
|
|
||||||
dp = Dispatcher()
|
|
||||||
last_schedule: Optional[List[Dict]] = None
|
|
||||||
last_notification_time: Dict[str, datetime] = {}
|
|
||||||
|
|
||||||
|
|
||||||
# ============================================================================
|
|
||||||
# УТИЛИТЫ
|
|
||||||
# ============================================================================
|
|
||||||
|
|
||||||
def format_time_duration(minutes: int) -> str:
|
|
||||||
"""Форматирует время из минут в часы и минуты"""
|
|
||||||
hours = minutes // 60
|
|
||||||
mins = minutes % 60
|
|
||||||
|
|
||||||
if hours == 0:
|
|
||||||
return f"{mins}м"
|
|
||||||
elif mins == 0:
|
|
||||||
return f"{hours}ч"
|
|
||||||
return f"{hours}ч {mins}м"
|
|
||||||
|
|
||||||
|
|
||||||
def get_day_statistics(day_blocks: List[Dict]) -> Dict[str, int]:
|
|
||||||
"""Получает статистику по дню"""
|
|
||||||
total_minutes = 0
|
|
||||||
confirmed_minutes = 0
|
|
||||||
possible_minutes = 0
|
|
||||||
|
|
||||||
for block in day_blocks:
|
|
||||||
for half in [block["first_half"], block["second_half"]]:
|
|
||||||
if half["status"] == "off":
|
|
||||||
total_minutes += 30
|
|
||||||
if half["confirmed"]:
|
|
||||||
confirmed_minutes += 30
|
|
||||||
else:
|
|
||||||
possible_minutes += 30
|
|
||||||
|
|
||||||
return {
|
|
||||||
"total": total_minutes,
|
|
||||||
"confirmed": confirmed_minutes,
|
|
||||||
"possible": possible_minutes
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
# ============================================================================
|
|
||||||
# ПАРСИНГ ДАННЫХ
|
|
||||||
# ============================================================================
|
|
||||||
|
|
||||||
def parse_html(html: str) -> List[Dict]:
|
|
||||||
"""Парсит HTML с графиком отключений (логика от 15.11.2024)"""
|
|
||||||
soup = BeautifulSoup(html, "html.parser")
|
|
||||||
cells = soup.select(".disconnection-detailed-table-cell.cell")
|
|
||||||
|
|
||||||
schedule = []
|
|
||||||
current_hour = 0
|
|
||||||
current_day = 0
|
|
||||||
|
|
||||||
for cell in cells:
|
|
||||||
if 'legend' in cell.get('class', []) or 'head' in cell.get('class', []):
|
|
||||||
continue
|
|
||||||
|
|
||||||
cell_classes = cell.get('class', [])
|
|
||||||
|
|
||||||
# ПРоверка статуса отключения на весь час
|
|
||||||
full_hour_off = 'has_disconnection' in cell_classes and 'full_hour' in cell_classes
|
|
||||||
no_disconnection_cell = 'no_disconnection' in cell_classes
|
|
||||||
|
|
||||||
hour_block = cell.select_one(".hour_block")
|
|
||||||
if not hour_block:
|
|
||||||
continue
|
|
||||||
|
|
||||||
# Проверка подтверждённости отключения для всего часа
|
|
||||||
cell_confirmed = None
|
|
||||||
if 'confirm_1' in cell_classes:
|
|
||||||
cell_confirmed = True
|
|
||||||
elif 'confirm_0' in cell_classes:
|
|
||||||
cell_confirmed = False
|
|
||||||
|
|
||||||
# Проверка половин часа
|
|
||||||
left = hour_block.select_one(".half.left")
|
|
||||||
right = hour_block.select_one(".half.right")
|
|
||||||
|
|
||||||
def parse_half(half, is_full_hour_off: bool) -> Dict:
|
|
||||||
"""Парсит половину часа"""
|
|
||||||
if not half:
|
|
||||||
return {"status": "on", "queue": None, "confirmed": None}
|
|
||||||
|
|
||||||
half_classes = half.get('class', [])
|
|
||||||
|
|
||||||
# Если вся ячейка full_hour - используем статус ячейки
|
|
||||||
if is_full_hour_off:
|
|
||||||
return {"status": "off", "queue": None, "confirmed": cell_confirmed}
|
|
||||||
|
|
||||||
# Определяем статус половины
|
|
||||||
if 'has_disconnection' in half_classes:
|
|
||||||
status = "off"
|
|
||||||
elif 'no_disconnection' in half_classes:
|
|
||||||
status = "on"
|
|
||||||
else:
|
|
||||||
status = "on" # По умолчанию считаем включенным
|
|
||||||
|
|
||||||
# Если выключено - ищем подробности
|
|
||||||
queue = None
|
|
||||||
confirmed = None
|
|
||||||
|
|
||||||
if status == "off":
|
|
||||||
disconnection_div = half.select_one(".disconnection")
|
|
||||||
if disconnection_div:
|
|
||||||
# Ищем номер черги в title
|
|
||||||
if disconnection_div.has_attr("title"):
|
|
||||||
title = disconnection_div["title"]
|
|
||||||
if "Номер черги" in title or "Номер черги:" in title:
|
|
||||||
try:
|
|
||||||
queue = title.split(":")[-1].strip()
|
|
||||||
except:
|
|
||||||
pass
|
|
||||||
|
|
||||||
# Определяем подтверждение
|
|
||||||
disc_classes = disconnection_div.get('class', [])
|
|
||||||
if 'disconnection_confirm_1' in disc_classes:
|
|
||||||
confirmed = True
|
|
||||||
elif 'disconnection_confirm_0' in disc_classes:
|
|
||||||
confirmed = False
|
|
||||||
|
|
||||||
return {"status": status, "queue": queue, "confirmed": confirmed}
|
|
||||||
|
|
||||||
first_half_data = parse_half(left, full_hour_off)
|
|
||||||
second_half_data = parse_half(right, full_hour_off)
|
|
||||||
|
|
||||||
schedule.append({
|
|
||||||
"hour": current_hour,
|
|
||||||
"day": current_day,
|
|
||||||
"first_half": first_half_data,
|
|
||||||
"second_half": second_half_data,
|
|
||||||
})
|
|
||||||
|
|
||||||
current_hour += 1
|
|
||||||
if current_hour >= 24:
|
|
||||||
current_hour = 0
|
|
||||||
current_day += 1
|
|
||||||
|
|
||||||
return schedule
|
|
||||||
|
|
||||||
|
|
||||||
def get_voe_html(city_id: int, street_id: int, house_id: int) -> str:
|
|
||||||
"""Получает HTML с сайта VOE"""
|
|
||||||
url = "https://www.voe.com.ua/disconnection/detailed?ajax_form=1&_wrapper_format=drupal_ajax"
|
|
||||||
headers = {
|
|
||||||
"Content-Type": "application/x-www-form-urlencoded; charset=UTF-8",
|
|
||||||
"X-Requested-With": "XMLHttpRequest",
|
|
||||||
"User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36"
|
|
||||||
}
|
|
||||||
data = {
|
|
||||||
"search_type": 0,
|
|
||||||
"city_id": city_id,
|
|
||||||
"street_id": street_id,
|
|
||||||
"house_id": house_id,
|
|
||||||
"form_build_id": "form-Irv5aHw1R2FT_Ik2apyHOZ47hTH5xPNH_LQnBrmpSTc",
|
|
||||||
"form_id": "disconnection_detailed_search_form",
|
|
||||||
"_triggering_element_name": "search",
|
|
||||||
"_triggering_element_value": "Показати",
|
|
||||||
"_drupal_ajax": 1,
|
|
||||||
}
|
|
||||||
|
|
||||||
try:
|
|
||||||
response = requests.post(url, headers=headers, data=data, timeout=10)
|
|
||||||
response.raise_for_status()
|
|
||||||
resp_json = response.json()
|
|
||||||
|
|
||||||
insert_html = next(
|
|
||||||
(item["data"] for item in resp_json if item.get("command") == "insert"),
|
|
||||||
None
|
|
||||||
)
|
|
||||||
|
|
||||||
if not insert_html:
|
|
||||||
raise ValueError("HTML не найден в ответе")
|
|
||||||
|
|
||||||
return insert_html
|
|
||||||
except requests.exceptions.RequestException as e:
|
|
||||||
logger.error(f"Ошибка запроса VOE: {e}")
|
|
||||||
raise
|
|
||||||
|
|
||||||
|
|
||||||
# ============================================================================
|
|
||||||
# ФОРМАТИРОВАНИЕ СООБЩЕНИЙ
|
|
||||||
# ============================================================================
|
|
||||||
|
|
||||||
def get_main_keyboard():
|
|
||||||
"""Создает главную клавиатуру"""
|
|
||||||
builder = ReplyKeyboardBuilder()
|
|
||||||
builder.row(
|
|
||||||
KeyboardButton(text="📊 Графік"),
|
|
||||||
KeyboardButton(text="🔄 Оновити")
|
|
||||||
)
|
|
||||||
builder.row(
|
|
||||||
KeyboardButton(text="📅 Сьогодні"),
|
|
||||||
KeyboardButton(text="📅 Завтра")
|
|
||||||
)
|
|
||||||
builder.row(KeyboardButton(text="ℹ️ Про бота"))
|
|
||||||
return builder.as_markup(resize_keyboard=True)
|
|
||||||
|
|
||||||
|
|
||||||
def format_schedule_message(schedule: List[Dict], days_to_show: int = 2) -> str:
|
|
||||||
"""Форматирует полный график на несколько дней"""
|
|
||||||
lines = [
|
|
||||||
"⚡️ <b>Графік відключень світла</b>",
|
|
||||||
f"🕐 Оновлено: {datetime.now().strftime('%d.%m.%Y %H:%M:%S')}",
|
|
||||||
"─" * 30,
|
|
||||||
""
|
|
||||||
]
|
|
||||||
|
|
||||||
start_date = datetime.now()
|
|
||||||
|
|
||||||
for day in range(min(days_to_show, 2)):
|
|
||||||
day_blocks = [b for b in schedule if b["day"] == day]
|
|
||||||
if not day_blocks:
|
|
||||||
continue
|
|
||||||
|
|
||||||
date_str = (start_date + timedelta(days=day)).strftime('%d.%m.%Y')
|
|
||||||
day_name = "🌅 <b>Сьогодні</b>" if day == 0 else "🌄 <b>Завтра</b>"
|
|
||||||
|
|
||||||
lines.append(f"{day_name} ({date_str})")
|
|
||||||
|
|
||||||
# Статистика
|
|
||||||
stats = get_day_statistics(day_blocks)
|
|
||||||
if stats["total"] > 0:
|
|
||||||
lines.append(f"⏱ Всього: <code>{format_time_duration(stats['total'])}</code>")
|
|
||||||
if stats["confirmed"] > 0:
|
|
||||||
lines.append(f"🔴 Підтверджено: <code>{format_time_duration(stats['confirmed'])}</code>")
|
|
||||||
if stats["possible"] > 0:
|
|
||||||
lines.append(f"🟠 Можливо: <code>{format_time_duration(stats['possible'])}</code>")
|
|
||||||
else:
|
|
||||||
lines.append("🟢 <b>Відключень немає!</b>")
|
|
||||||
|
|
||||||
lines.append("")
|
|
||||||
|
|
||||||
# Детальный список отключений
|
|
||||||
disconnections = []
|
|
||||||
current_status = None
|
|
||||||
start_time = None
|
|
||||||
current_confirmed = None
|
|
||||||
current_queue = None
|
|
||||||
|
|
||||||
for block in day_blocks:
|
|
||||||
hour = block["hour"]
|
|
||||||
|
|
||||||
for half_idx, half in enumerate([block["first_half"], block["second_half"]]):
|
|
||||||
time_str = f"{hour:02d}:00" if half_idx == 0 else f"{hour:02d}:30"
|
|
||||||
|
|
||||||
if half["status"] == "off":
|
|
||||||
if current_status != "off":
|
|
||||||
start_time = time_str
|
|
||||||
current_confirmed = half["confirmed"]
|
|
||||||
current_queue = half["queue"]
|
|
||||||
current_status = "off"
|
|
||||||
else:
|
|
||||||
if current_status == "off":
|
|
||||||
icon = "🔴" if current_confirmed else "🟠"
|
|
||||||
queue_text = f" (Ч{current_queue})" if current_queue else ""
|
|
||||||
disconnections.append(f"{icon} <code>{start_time} - {time_str}</code>{queue_text}")
|
|
||||||
current_status = half["status"]
|
|
||||||
|
|
||||||
# Если день закончился на отключении
|
|
||||||
if current_status == "off":
|
|
||||||
icon = "🔴" if current_confirmed else "🟠"
|
|
||||||
queue_text = f" (Ч{current_queue})" if current_queue else ""
|
|
||||||
next_hour = (day_blocks[-1]["hour"] + 1) % 24
|
|
||||||
end_time = f"{next_hour:02d}:00"
|
|
||||||
disconnections.append(f"{icon} <code>{start_time} - {end_time}</code>{queue_text}")
|
|
||||||
|
|
||||||
if disconnections:
|
|
||||||
for idx, disc in enumerate(disconnections, 1):
|
|
||||||
lines.append(f"{idx}. {disc}")
|
|
||||||
|
|
||||||
lines.append("")
|
|
||||||
|
|
||||||
lines.append("<i>🔴 = підтверджено • 🟠 = можливо • 🟢 = світло</i>")
|
|
||||||
|
|
||||||
return "\n".join(lines)
|
|
||||||
|
|
||||||
|
|
||||||
def format_single_day_schedule(schedule: List[Dict], day: int) -> str:
|
|
||||||
"""Форматирует график на один день"""
|
|
||||||
day_blocks = [b for b in schedule if b["day"] == day]
|
|
||||||
if not day_blocks:
|
|
||||||
return "❌ Немає даних для цього дня"
|
|
||||||
|
|
||||||
start_date = datetime.now()
|
|
||||||
date_str = (start_date + timedelta(days=day)).strftime('%d.%m.%Y')
|
|
||||||
day_name = "🟠 <b>Сьогодні</b>" if day == 0 else "🔶 <b>Завтра</b>"
|
|
||||||
|
|
||||||
lines = [
|
|
||||||
f"{day_name} • {date_str}",
|
|
||||||
""
|
|
||||||
]
|
|
||||||
|
|
||||||
# Статистика
|
|
||||||
lines.append("<b>📊 Статистика</b>")
|
|
||||||
stats = get_day_statistics(day_blocks)
|
|
||||||
|
|
||||||
if stats["total"] == 0:
|
|
||||||
lines.append("└ 🟢 <b>Відключень немає!</b>")
|
|
||||||
else:
|
|
||||||
total_time = format_time_duration(stats["total"])
|
|
||||||
lines.append(f"├ ⏱ Всього: <code>{total_time}</code>")
|
|
||||||
|
|
||||||
if stats["confirmed"] > 0:
|
|
||||||
confirmed_time = format_time_duration(stats["confirmed"])
|
|
||||||
lines.append(f"├ 🔴 Підтверджено: <code>{confirmed_time}</code>")
|
|
||||||
|
|
||||||
if stats["possible"] > 0:
|
|
||||||
possible_time = format_time_duration(stats["possible"])
|
|
||||||
lines.append(f"└ 🟠 Можливо: <code>{possible_time}</code>")
|
|
||||||
else:
|
|
||||||
lines.append(f"└ 🟢 Решта часу світло")
|
|
||||||
|
|
||||||
lines.append("")
|
|
||||||
|
|
||||||
# Детальный список отключений
|
|
||||||
disconnections = []
|
|
||||||
current_status = None
|
|
||||||
start_time = None
|
|
||||||
current_confirmed = None
|
|
||||||
current_queue = None
|
|
||||||
|
|
||||||
for block in day_blocks:
|
|
||||||
hour = block["hour"]
|
|
||||||
|
|
||||||
for half_idx, half in enumerate([block["first_half"], block["second_half"]]):
|
|
||||||
time_str = f"{hour:02d}:00" if half_idx == 0 else f"{hour:02d}:30"
|
|
||||||
|
|
||||||
if half["status"] == "off":
|
|
||||||
if current_status != "off":
|
|
||||||
start_time = time_str
|
|
||||||
current_confirmed = half["confirmed"]
|
|
||||||
current_queue = half["queue"]
|
|
||||||
current_status = "off"
|
|
||||||
else:
|
|
||||||
if current_status == "off":
|
|
||||||
icon = "🔴" if current_confirmed else "🟠"
|
|
||||||
queue_text = f" (Ч.{current_queue})" if current_queue else ""
|
|
||||||
disconnections.append(f"{icon} <code>{start_time} - {time_str}</code>{queue_text}")
|
|
||||||
current_status = half["status"]
|
|
||||||
|
|
||||||
# Если день закончился на отключении
|
|
||||||
if current_status == "off":
|
|
||||||
icon = "🔴" if current_confirmed else "🟠"
|
|
||||||
queue_text = f" (Ч.{current_queue})" if current_queue else ""
|
|
||||||
next_hour = (day_blocks[-1]["hour"] + 1) % 24
|
|
||||||
end_time = f"{next_hour:02d}:00"
|
|
||||||
disconnections.append(f"{icon} <code>{start_time} - {end_time}</code>{queue_text}")
|
|
||||||
|
|
||||||
if disconnections:
|
|
||||||
lines.append("<b>⚡️ Розклад відключень</b>")
|
|
||||||
for idx, disc in enumerate(disconnections, 1):
|
|
||||||
lines.append(f"{idx}. {disc}")
|
|
||||||
|
|
||||||
lines.append("")
|
|
||||||
lines.append("<i>🔴 підтверджено • 🟠 можливо • 🟢 світло</i>")
|
|
||||||
|
|
||||||
return "\n".join(lines)
|
|
||||||
|
|
||||||
|
|
||||||
def schedules_differ(old_schedule: Optional[List[Dict]], new_schedule: Optional[List[Dict]]) -> bool:
|
|
||||||
"""Проверяет отличия между графиками"""
|
|
||||||
if old_schedule is None or new_schedule is None:
|
|
||||||
return True
|
|
||||||
|
|
||||||
if len(old_schedule) != len(new_schedule):
|
|
||||||
return True
|
|
||||||
|
|
||||||
for old, new in zip(old_schedule, new_schedule):
|
|
||||||
if old["day"] >= 2:
|
|
||||||
break
|
|
||||||
|
|
||||||
if (old["first_half"] != new["first_half"] or
|
|
||||||
old["second_half"] != new["second_half"]):
|
|
||||||
return True
|
|
||||||
|
|
||||||
return False
|
|
||||||
|
|
||||||
|
|
||||||
# ============================================================================
|
|
||||||
# УВЕДОМЛЕНИЯ
|
|
||||||
# ============================================================================
|
|
||||||
|
|
||||||
async def send_to_all_users(message_text: str, parse_mode: str = "HTML"):
|
|
||||||
"""Отправляет сообщение всем пользователям"""
|
|
||||||
if not ALLOWED_CHAT_IDS:
|
|
||||||
logger.warning("Нет допущенных ID чатов для отправки уведомлений")
|
|
||||||
return
|
|
||||||
|
|
||||||
for chat_id in ALLOWED_CHAT_IDS:
|
|
||||||
try:
|
|
||||||
await bot.send_message(chat_id, message_text, parse_mode=parse_mode)
|
|
||||||
logger.info(f"✅ Сообщение отправлено пользователю {chat_id}")
|
|
||||||
except Exception as e:
|
|
||||||
logger.error(f"❌ Ошибка отправки пользователю {chat_id}: {e}")
|
|
||||||
await asyncio.sleep(0.5)
|
|
||||||
|
|
||||||
|
|
||||||
async def check_schedule():
|
|
||||||
"""Проверяет график и отправляет уведомления"""
|
|
||||||
global last_schedule
|
|
||||||
|
|
||||||
try:
|
|
||||||
logger.info("🔍 Проверка графика...")
|
|
||||||
html = get_voe_html(VOE_CITY_ID, VOE_STREET_ID, VOE_HOUSE_ID)
|
|
||||||
new_schedule = parse_html(html)
|
|
||||||
|
|
||||||
if schedules_differ(last_schedule, new_schedule):
|
|
||||||
logger.info("✨ Обнаружены изменения!")
|
|
||||||
message = format_schedule_message(new_schedule, days_to_show=2)
|
|
||||||
|
|
||||||
if last_schedule is not None:
|
|
||||||
await send_to_all_users(f"🔄 <b>Графік оновлено!</b>\n\n{message}")
|
|
||||||
|
|
||||||
last_schedule = new_schedule
|
|
||||||
else:
|
|
||||||
logger.info("✓ Графік без змін")
|
|
||||||
|
|
||||||
except Exception as e:
|
|
||||||
logger.error(f"❌ Ошибка при проверке графика: {e}")
|
|
||||||
|
|
||||||
|
|
||||||
async def check_upcoming_disconnections():
|
|
||||||
"""Проверяет предстоящие события и отправляет предупреждения за 5 минут"""
|
|
||||||
global last_notification_time
|
|
||||||
|
|
||||||
if last_schedule is None:
|
|
||||||
return
|
|
||||||
|
|
||||||
now = datetime.now()
|
|
||||||
today_blocks = [b for b in last_schedule if b["day"] == 0]
|
|
||||||
|
|
||||||
# Создаем список всех переходов (off -> on или on -> off)
|
|
||||||
transitions = []
|
|
||||||
prev_status = None
|
|
||||||
|
|
||||||
for block in today_blocks:
|
|
||||||
hour = block["hour"]
|
|
||||||
|
|
||||||
for half_idx, half in enumerate([block["first_half"], block["second_half"]]):
|
|
||||||
minute = 0 if half_idx == 0 else 30
|
|
||||||
time_str = f"{hour:02d}:{minute:02d}"
|
|
||||||
|
|
||||||
current_status = half["status"]
|
|
||||||
|
|
||||||
# Если статус изменился - это переход
|
|
||||||
if prev_status is not None and prev_status != current_status:
|
|
||||||
transitions.append({
|
|
||||||
"hour": hour,
|
|
||||||
"minute": minute,
|
|
||||||
"time_str": time_str,
|
|
||||||
"from_status": prev_status,
|
|
||||||
"to_status": current_status,
|
|
||||||
"confirmed": half.get("confirmed"),
|
|
||||||
"queue": half.get("queue")
|
|
||||||
})
|
|
||||||
|
|
||||||
prev_status = current_status
|
|
||||||
|
|
||||||
# Проверяем переходы
|
|
||||||
for transition in transitions:
|
|
||||||
event_time = now.replace(
|
|
||||||
hour=transition["hour"],
|
|
||||||
minute=transition["minute"],
|
|
||||||
second=0,
|
|
||||||
microsecond=0
|
|
||||||
)
|
|
||||||
|
|
||||||
time_until = (event_time - now).total_seconds() / 60
|
|
||||||
notification_key = f"{transition['hour']}:{transition['minute']}_{transition['to_status']}"
|
|
||||||
|
|
||||||
# Если за 5 минут до события (±1 минута) и еще не отправляли
|
|
||||||
if 4 <= time_until <= 6:
|
|
||||||
# Проверяем, не отправляли ли уже уведомление сегодня
|
|
||||||
if notification_key in last_notification_time:
|
|
||||||
last_notif_time = last_notification_time[notification_key]
|
|
||||||
if last_notif_time.date() == now.date():
|
|
||||||
continue # Уже отправляли сегодня
|
|
||||||
|
|
||||||
# Переход на ОТКЛЮЧЕНИЕ (on -> off)
|
|
||||||
if transition["from_status"] == "on" and transition["to_status"] == "off":
|
|
||||||
icon = "🔴" if transition["confirmed"] else "🟠"
|
|
||||||
status = "підтверджено" if transition["confirmed"] else "можливе"
|
|
||||||
queue_info = f" (Черга {transition['queue']})" if transition['queue'] else ""
|
|
||||||
|
|
||||||
warning = (
|
|
||||||
f"⚠️ <b>УВАГА! ВІДКЛЮЧЕННЯ</b>\n\n"
|
|
||||||
f"Через ~5 хвилин\n"
|
|
||||||
f"Час: <code>{transition['time_str']}</code>\n"
|
|
||||||
f"Статус: {icon} {status}{queue_info}"
|
|
||||||
)
|
|
||||||
|
|
||||||
await send_to_all_users(warning)
|
|
||||||
last_notification_time[notification_key] = now
|
|
||||||
logger.info(f"📢 Відправлено попередження про ВІДКЛЮЧЕННЯ в {transition['time_str']}")
|
|
||||||
|
|
||||||
# Переход на ВКЛЮЧЕНИЕ (off -> on)
|
|
||||||
elif transition["from_status"] == "off" and transition["to_status"] == "on":
|
|
||||||
warning = (
|
|
||||||
f"✅ <b>УВАГА! ВКЛЮЧЕННЯ</b>\n\n"
|
|
||||||
f"Через ~5 хвилин буде світло\n"
|
|
||||||
f"Час: <code>{transition['time_str']}</code>"
|
|
||||||
)
|
|
||||||
|
|
||||||
await send_to_all_users(warning)
|
|
||||||
last_notification_time[notification_key] = now
|
|
||||||
logger.info(f"📢 Відправлено попередження про ВКЛЮЧЕННЯ в {transition['time_str']}")
|
|
||||||
|
|
||||||
|
|
||||||
async def monitoring_loop():
|
|
||||||
"""Основной цикл мониторинга"""
|
|
||||||
await check_schedule()
|
|
||||||
|
|
||||||
while True:
|
|
||||||
try:
|
|
||||||
await asyncio.sleep(CHECK_INTERVAL)
|
|
||||||
await check_schedule()
|
|
||||||
await check_upcoming_disconnections()
|
|
||||||
except Exception as e:
|
|
||||||
logger.error(f"Ошибка в цикле мониторинга: {e}")
|
|
||||||
await asyncio.sleep(5)
|
|
||||||
|
|
||||||
|
|
||||||
# ============================================================================
|
|
||||||
# ОБРАБОТЧИКИ КОМАНД
|
|
||||||
# ============================================================================
|
|
||||||
|
|
||||||
@dp.message(Command("start"))
|
|
||||||
async def cmd_start(message: Message):
|
|
||||||
"""Обработчик /start"""
|
|
||||||
if message.chat.id not in ALLOWED_CHAT_IDS:
|
|
||||||
await message.answer("❌ У вас немає доступу до цього бота.")
|
|
||||||
return
|
|
||||||
|
|
||||||
await message.answer(
|
|
||||||
"👋 <b>Ласкаво просимо!</b>\n\n"
|
|
||||||
"🤖 <b>Бот для моніторингу графіку відключень світла</b>\n\n"
|
|
||||||
"✨ <b>Можливості:</b>\n"
|
|
||||||
"• 📊 Перегляд графіку на сьогодні і завтра\n"
|
|
||||||
"• 🔔 Автоматичні сповіщення за 5 хвилин до подій\n"
|
|
||||||
"• 🔄 Моніторинг змін графіку\n\n"
|
|
||||||
"Використовуйте кнопки нижче 👇",
|
|
||||||
parse_mode="HTML",
|
|
||||||
reply_markup=get_main_keyboard()
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
@dp.message(lambda msg: msg.text == "ℹ️ Про бота")
|
|
||||||
async def cmd_info(message: Message):
|
|
||||||
"""Показывает информацию о боте"""
|
|
||||||
if message.chat.id not in ALLOWED_CHAT_IDS:
|
|
||||||
return
|
|
||||||
|
|
||||||
await message.answer(
|
|
||||||
"<b>ℹ️ Про бота</b>\n\n"
|
|
||||||
"🚀 <b>Версія:</b> 2.2 (Стабільна)\n\n"
|
|
||||||
"📝 <b>Реліз-ноути:</b>\n"
|
|
||||||
"├ 15.11.2024: Адаптація під оновлену логіку сайту VOE\n"
|
|
||||||
"├ Виправлено парсинг half.left та half.right\n"
|
|
||||||
"├ Покращено визначення підтвердження відключень\n"
|
|
||||||
"└ Оптимізовано обробку статусу для всієї години\n\n"
|
|
||||||
"⚡ <b>Функціональність:</b>\n"
|
|
||||||
"├ Моніторинг графіку 24/7\n"
|
|
||||||
"├ Сповіщення за 5 хвилин\n"
|
|
||||||
"├ Детальна статистика дня\n"
|
|
||||||
"└ Красива візуалізація\n\n"
|
|
||||||
"🔐 <b>Безпека:</b> Використовуються .env файли\n"
|
|
||||||
"💾 <b>Джерело:</b> voe.com.ua",
|
|
||||||
parse_mode="HTML",
|
|
||||||
reply_markup=get_main_keyboard()
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
@dp.message(Command("schedule"))
|
|
||||||
async def cmd_schedule(message: Message):
|
|
||||||
"""Показывает полный график"""
|
|
||||||
if message.chat.id not in ALLOWED_CHAT_IDS:
|
|
||||||
await message.answer("❌ У вас немає доступу.")
|
|
||||||
return
|
|
||||||
|
|
||||||
try:
|
|
||||||
await message.answer("⏳ Завантаження графіку...")
|
|
||||||
html = get_voe_html(VOE_CITY_ID, VOE_STREET_ID, VOE_HOUSE_ID)
|
|
||||||
schedule = parse_html(html)
|
|
||||||
text = format_schedule_message(schedule, days_to_show=2)
|
|
||||||
await message.answer(text, parse_mode="HTML", reply_markup=get_main_keyboard())
|
|
||||||
except Exception as e:
|
|
||||||
await message.answer(
|
|
||||||
f"❌ <b>Помилка:</b> {str(e)}",
|
|
||||||
parse_mode="HTML",
|
|
||||||
reply_markup=get_main_keyboard()
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
@dp.message(Command("today"))
|
|
||||||
async def cmd_today(message: Message):
|
|
||||||
"""Показывает график на сегодня"""
|
|
||||||
if message.chat.id not in ALLOWED_CHAT_IDS:
|
|
||||||
await message.answer("❌ У вас немає доступу.")
|
|
||||||
return
|
|
||||||
|
|
||||||
try:
|
|
||||||
await message.answer("⏳ Завантаження графіку сьогодні...")
|
|
||||||
html = get_voe_html(VOE_CITY_ID, VOE_STREET_ID, VOE_HOUSE_ID)
|
|
||||||
schedule = parse_html(html)
|
|
||||||
text = format_single_day_schedule(schedule, 0)
|
|
||||||
await message.answer(text, parse_mode="HTML", reply_markup=get_main_keyboard())
|
|
||||||
except Exception as e:
|
|
||||||
await message.answer(
|
|
||||||
f"❌ <b>Помилка:</b> {str(e)}",
|
|
||||||
parse_mode="HTML",
|
|
||||||
reply_markup=get_main_keyboard()
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
@dp.message(Command("tomorrow"))
|
|
||||||
async def cmd_tomorrow(message: Message):
|
|
||||||
"""Показывает график на завтра"""
|
|
||||||
if message.chat.id not in ALLOWED_CHAT_IDS:
|
|
||||||
await message.answer("❌ У вас немає доступу.")
|
|
||||||
return
|
|
||||||
|
|
||||||
try:
|
|
||||||
await message.answer("⏳ Завантаження графіку завтра...")
|
|
||||||
html = get_voe_html(VOE_CITY_ID, VOE_STREET_ID, VOE_HOUSE_ID)
|
|
||||||
schedule = parse_html(html)
|
|
||||||
text = format_single_day_schedule(schedule, 1)
|
|
||||||
await message.answer(text, parse_mode="HTML", reply_markup=get_main_keyboard())
|
|
||||||
# await message.answer("❌ Функція тимчасово недоступна. Чекаємо на оновлення сайту", parse_mode="HTML", reply_markup=get_main_keyboard())
|
|
||||||
except Exception as e:
|
|
||||||
await message.answer(
|
|
||||||
f"❌ <b>Помилка:</b> {str(e)}",
|
|
||||||
parse_mode="HTML",
|
|
||||||
reply_markup=get_main_keyboard()
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
@dp.message(Command("check"))
|
|
||||||
async def cmd_check(message: Message):
|
|
||||||
"""Принудительная проверка графика"""
|
|
||||||
if message.chat.id not in ALLOWED_CHAT_IDS:
|
|
||||||
await message.answer("❌ У вас немає доступу.")
|
|
||||||
return
|
|
||||||
|
|
||||||
try:
|
|
||||||
await message.answer("🔄 <b>Перевіряю графік...</b>", parse_mode="HTML")
|
|
||||||
html = get_voe_html(VOE_CITY_ID, VOE_STREET_ID, VOE_HOUSE_ID)
|
|
||||||
new_schedule = parse_html(html)
|
|
||||||
|
|
||||||
prefix = "✅ <b>Знайдено зміни!</b>\n\n" if schedules_differ(last_schedule, new_schedule) else "✓ <b>Графік без змін</b>\n\n"
|
|
||||||
result = prefix + format_schedule_message(new_schedule, days_to_show=2)
|
|
||||||
|
|
||||||
await message.answer(result, parse_mode="HTML", reply_markup=get_main_keyboard())
|
|
||||||
except Exception as e:
|
|
||||||
await message.answer(
|
|
||||||
f"❌ <b>Помилка:</b> {str(e)}",
|
|
||||||
parse_mode="HTML",
|
|
||||||
reply_markup=get_main_keyboard()
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
@dp.message()
|
|
||||||
async def handle_text(message: Message):
|
|
||||||
"""Обработчик текстовых сообщений и кнопок"""
|
|
||||||
if message.chat.id not in ALLOWED_CHAT_IDS:
|
|
||||||
return
|
|
||||||
|
|
||||||
text = message.text
|
|
||||||
|
|
||||||
# Кнопка "Графік"
|
|
||||||
if text == "📊 Графік":
|
|
||||||
await cmd_schedule(message)
|
|
||||||
|
|
||||||
# Кнопка "Сьогодні"
|
|
||||||
elif text == "📅 Сьогодні":
|
|
||||||
await cmd_today(message)
|
|
||||||
|
|
||||||
# Кнопка "Завтра"
|
|
||||||
elif text == "📅 Завтра":
|
|
||||||
await cmd_tomorrow(message)
|
|
||||||
|
|
||||||
# Кнопка "Оновити"
|
|
||||||
elif text == "🔄 Оновити":
|
|
||||||
await cmd_check(message)
|
|
||||||
|
|
||||||
# Кнопка "Про бота"
|
|
||||||
elif text == "ℹ️ Про бота":
|
|
||||||
await cmd_info(message)
|
|
||||||
|
|
||||||
# Неизвестная команда
|
|
||||||
else:
|
|
||||||
await message.answer(
|
|
||||||
"❓ <b>Команда не розпізнана</b>\n\n"
|
|
||||||
"Використовуйте кнопки на клавіатурі або команди:\n"
|
|
||||||
"/start • /today • /tomorrow • /schedule • /check",
|
|
||||||
parse_mode="HTML",
|
|
||||||
reply_markup=get_main_keyboard()
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
# ============================================================================
|
|
||||||
# ГЛАВНАЯ ФУНКЦИЯ
|
|
||||||
# ============================================================================
|
|
||||||
|
|
||||||
async def main():
|
|
||||||
"""Главная функция"""
|
|
||||||
logger.info("=" * 50)
|
|
||||||
logger.info("ЗАПУСК БОТА V2.2 (stable 2.2, 15.11.2025)")
|
|
||||||
logger.info("=" * 50)
|
|
||||||
|
|
||||||
if not TELEGRAM_TOKEN or TELEGRAM_TOKEN = os.getenv("TELEGRAM_TOKEN", "YOUR_TOKEN_HERE")
|
|
||||||
logger.error("❌ TELEGRAM_TOKEN не конфігурований! Напишіть токен в .env файл")
|
|
||||||
return
|
|
||||||
|
|
||||||
if not ALLOWED_CHAT_IDS:
|
|
||||||
logger.error("❌ ALLOWED_CHAT_IDS не конфігуровані! Напишіть ID в .env файл")
|
|
||||||
return
|
|
||||||
|
|
||||||
logger.info(f"📌 Allowed chat ids: {ALLOWED_CHAT_IDS}")
|
|
||||||
logger.info(f"⏱ Інтервал перевірки: {CHECK_INTERVAL} сек")
|
|
||||||
logger.info("=" * 50)
|
|
||||||
|
|
||||||
# Запускаем мониторинг
|
|
||||||
monitoring_task = asyncio.create_task(monitoring_loop())
|
|
||||||
|
|
||||||
try:
|
|
||||||
await dp.start_polling(bot)
|
|
||||||
except KeyboardInterrupt:
|
|
||||||
logger.info("⏹ Бот зупинений користувачем")
|
|
||||||
finally:
|
|
||||||
monitoring_task.cancel()
|
|
||||||
await bot.session.close()
|
|
||||||
logger.info("✓ Підключення закрито")
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
try:
|
|
||||||
asyncio.run(main())
|
|
||||||
except KeyboardInterrupt:
|
|
||||||
logger.info("⏹ Завершено")
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
[project]
|
|
||||||
name = "dtek-notif"
|
|
||||||
version = "0.1.0"
|
|
||||||
description = "Add your description here"
|
|
||||||
readme = "README.md"
|
|
||||||
requires-python = ">=3.13"
|
|
||||||
dependencies = []
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
requests>=2.31.0
|
|
||||||
beautifulsoup4>=4.12.0
|
|
||||||
aiogram>=3.3.0
|
|
||||||
python-dotenv>=1.0.0
|
|
||||||
aiohttp>=3.9.0
|
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
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
|
|
||||||
@@ -1,49 +0,0 @@
|
|||||||
services:
|
|
||||||
redis:
|
|
||||||
image: redis:alpine
|
|
||||||
restart: unless-stopped
|
|
||||||
volumes:
|
|
||||||
- redis-data:/data
|
|
||||||
healthcheck:
|
|
||||||
test: ["CMD", "redis-cli", "ping"]
|
|
||||||
interval: 5s
|
|
||||||
timeout: 3s
|
|
||||||
retries: 5
|
|
||||||
|
|
||||||
playwright-service:
|
|
||||||
image: mcr.microsoft.com/playwright:v1.56.0-jammy
|
|
||||||
restart: unless-stopped
|
|
||||||
command: npx -y playwright@1.56.0 run-server --port 3000 --path /ws
|
|
||||||
|
|
||||||
session-keeper:
|
|
||||||
build: ./phpsessid-bot
|
|
||||||
image: gcr.forust.xyz/forust/session-keeper:latest
|
|
||||||
pull_policy: build
|
|
||||||
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
|
|
||||||
|
|
||||||
webinar-checker:
|
|
||||||
build: ./webinar-checker
|
|
||||||
image: gcr.forust.xyz/forust/webinar-checker:latest
|
|
||||||
pull_policy: build
|
|
||||||
env_file: .env
|
|
||||||
restart: unless-stopped
|
|
||||||
depends_on:
|
|
||||||
redis:
|
|
||||||
condition: service_healthy
|
|
||||||
session-keeper:
|
|
||||||
condition: service_healthy
|
|
||||||
playwright-service:
|
|
||||||
condition: service_started
|
|
||||||
|
|
||||||
volumes:
|
|
||||||
redis-data:
|
|
||||||
@@ -1,15 +0,0 @@
|
|||||||
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"]
|
|
||||||
@@ -1,130 +0,0 @@
|
|||||||
import logging
|
|
||||||
import os
|
|
||||||
import time
|
|
||||||
from datetime import datetime
|
|
||||||
|
|
||||||
import redis
|
|
||||||
import requests
|
|
||||||
|
|
||||||
# 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' # noqa: S108
|
|
||||||
|
|
||||||
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()
|
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
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"]
|
|
||||||
@@ -1,927 +0,0 @@
|
|||||||
import contextlib
|
|
||||||
import json
|
|
||||||
import logging
|
|
||||||
import os
|
|
||||||
import re
|
|
||||||
import time
|
|
||||||
from datetime import datetime, timedelta
|
|
||||||
|
|
||||||
import redis
|
|
||||||
from playwright.async_api import async_playwright
|
|
||||||
from telegram import ChatMember, InlineKeyboardButton, InlineKeyboardMarkup, Update
|
|
||||||
from telegram.constants import ChatType
|
|
||||||
from telegram.ext import Application, CallbackQueryHandler, CommandHandler, ContextTypes
|
|
||||||
|
|
||||||
# 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('/')}"
|
|
||||||
DIARY_URL = f"{EDU_BASE.rstrip('/')}/user/diary"
|
|
||||||
|
|
||||||
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👑 <b>Режим администратора активен</b>",
|
|
||||||
'access_denied': "⛔ Доступ запрещен. Вас нет в белом списке.",
|
|
||||||
'help_title': "🤖 <b>Помощь по боту</b>\n\n",
|
|
||||||
'help_commands': "/start - Подписаться на уведомления\n/stop - Отписаться от уведомлений\n/help - Показать это сообщение\n/language - Сменить язык",
|
|
||||||
'help_admin': "\n<b>Команды администратора:</b>\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': "📋 <b>Белый список:</b>\n",
|
|
||||||
'subscribers_title': "👥 <b>Подписчики:</b>\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': "🎓 <b>Новый вебинар!</b>\n\n",
|
|
||||||
'webinar_item': "📌 <b>{name}</b>\n🔗 https://edu.edu.vn.ua{url}",
|
|
||||||
'select_language': "🌐 <b>Выберите язык / Оберіть мову / Select language:</b>",
|
|
||||||
'language_changed': "✅ Язык изменен на русский",
|
|
||||||
'flag_ru': "🇷🇺 Русский",
|
|
||||||
'flag_uk': "🇺🇦 Українська",
|
|
||||||
'flag_en': "🇬🇧 English",
|
|
||||||
'history_cleared': "✅ История вебинаров очищена",
|
|
||||||
'history_clear_failed': "❌ Ошибка при очистке истории",
|
|
||||||
},
|
|
||||||
'uk': {
|
|
||||||
'welcome': "👋 Привіт, {name}!\n\nЯ бот-сповіщувач про вебінари. Я повідомлятиму вас, коли з'явиться новий вебінар.\nВи підписані на сповіщення.",
|
|
||||||
'welcome_admin': "\n\n👑 <b>Режим адміністратора активний</b>",
|
|
||||||
'access_denied': "⛔ Доступ заборонено. Вас немає в білому списку.",
|
|
||||||
'help_title': "🤖 <b>Довідка по боту</b>\n\n",
|
|
||||||
'help_commands': "/start - Підписатися на сповіщення\n/stop - Відписатися від сповіщень\n/help - Показати це повідомлення\n/language - Змінити мову",
|
|
||||||
'help_admin': "\n<b>Команди адміністратора:</b>\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': "📋 <b>Білий список:</b>\n",
|
|
||||||
'subscribers_title': "👥 <b>Підписники:</b>\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': "🎓 <b>Новий вебінар!</b>\n\n",
|
|
||||||
'webinar_item': "📌 <b>{name}</b>\n🔗 https://edu.edu.vn.ua{url}",
|
|
||||||
'select_language': "🌐 <b>Виберіть мову / Выберите язык / Select language:</b>",
|
|
||||||
'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👑 <b>Admin Mode Active</b>",
|
|
||||||
'access_denied': "⛔ Access denied. You are not on the whitelist.",
|
|
||||||
'help_title': "🤖 <b>Bot Help</b>\n\n",
|
|
||||||
'help_commands': "/start - Subscribe to notifications\n/stop - Unsubscribe from notifications\n/help - Show this message\n/language - Change language",
|
|
||||||
'help_admin': "\n<b>Admin Commands:</b>\n/adduser [user_id] - Add user to whitelist\n/removeuser [user_id] - Remove user from whitelist\nOr use the panel below to manage settings.",
|
|
||||||
'admin_only': "⛔ Admin only!",
|
|
||||||
'user_added': "✅ User {user_id} added to whitelist",
|
|
||||||
'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': "📋 <b>Whitelist:</b>\n",
|
|
||||||
'subscribers_title': "👥 <b>Subscribers:</b>\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': "🎓 <b>New webinar found!</b>\n\n",
|
|
||||||
'webinar_item': "📌 <b>{name}</b>\n🔗 https://edu.edu.vn.ua{url}",
|
|
||||||
'select_language': "🌐 <b>Select language / Виберіть мову / Выберите язык:</b>",
|
|
||||||
'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)
|
|
||||||
|
|
||||||
# --- Diary Functions ---
|
|
||||||
|
|
||||||
DIARY_MONTH_NAMES = ['', 'Січня', 'Лютого', 'Березня', 'Квітня', 'Травня', 'Червня',
|
|
||||||
'Липня', 'Серпня', 'Вересня', 'Жовтня', 'Листопада', 'Грудня']
|
|
||||||
|
|
||||||
DIARY_WEEKDAYS_SHORT = ['Пн', 'Вт', 'Ср', 'Чт', 'Пт', 'Сб', 'Нд']
|
|
||||||
|
|
||||||
def get_diary_keyboard():
|
|
||||||
today = datetime.now()
|
|
||||||
keyboard = [
|
|
||||||
[
|
|
||||||
InlineKeyboardButton(f"📌 Сьогодні ({today.day}.{today.month:02d})", callback_data="diary_today"),
|
|
||||||
InlineKeyboardButton("📌 Завтра", callback_data="diary_tomorrow"),
|
|
||||||
],
|
|
||||||
[
|
|
||||||
InlineKeyboardButton("📅 Цей тиждень", callback_data="diary_week"),
|
|
||||||
InlineKeyboardButton("📅 Весь місяць", callback_data="diary_month"),
|
|
||||||
],
|
|
||||||
]
|
|
||||||
return InlineKeyboardMarkup(keyboard)
|
|
||||||
|
|
||||||
def _parse_calendar_html(table_html: str) -> tuple:
|
|
||||||
"""Parse calendar HTML table into (month_text, {day_num: {weekday, events}})."""
|
|
||||||
days = {}
|
|
||||||
weekdays = []
|
|
||||||
rows = re.findall(r'<tr[^>]*>(.*?)</tr>', table_html, re.DOTALL)
|
|
||||||
|
|
||||||
month_text = ''
|
|
||||||
for r_idx, row in enumerate(rows):
|
|
||||||
cells = re.findall(r'<t[dh][^>]*>(.*?)</t[dh]>', row, re.DOTALL)
|
|
||||||
|
|
||||||
if r_idx == 0:
|
|
||||||
# Month navigation row: extract "Травень 2026" from nav text
|
|
||||||
raw = re.sub(r'<[^>]+>', ' ', row).strip()
|
|
||||||
raw = re.sub(r'\s+', ' ', raw)
|
|
||||||
m = re.search(r'([А-Яа-яіїєґ\']+\s*:?\s*\d{4})', raw)
|
|
||||||
month_text = m.group(1).replace(' : ', ' ').strip() if m else raw
|
|
||||||
elif r_idx == 1:
|
|
||||||
# Day names row
|
|
||||||
for cell in cells:
|
|
||||||
name = re.sub(r'<[^>]+>', '', cell).strip()
|
|
||||||
if name:
|
|
||||||
weekdays.append(name)
|
|
||||||
else:
|
|
||||||
# Data rows: each cell = a day
|
|
||||||
for col_idx, cell in enumerate(cells):
|
|
||||||
# Extract day number — first number in the cell text
|
|
||||||
text = re.sub(r'<[^>]+>', ' ', cell).strip()
|
|
||||||
text = re.sub(r'\s+', ' ', text)
|
|
||||||
dm = re.match(r'(\d+)', text)
|
|
||||||
if not dm:
|
|
||||||
continue
|
|
||||||
day_num = dm.group(1)
|
|
||||||
|
|
||||||
# Extract events: title attribute (full name) of ALL <a> tags inside the cell
|
|
||||||
events = []
|
|
||||||
for a_match in re.finditer(r'<a[^>]*>(.*?)</a>', cell, re.DOTALL):
|
|
||||||
a_tag = a_match.group(0)
|
|
||||||
# Prefer the title attribute (contains full name, not truncated)
|
|
||||||
title_m = re.search(r'title\s*=\s*"([^"]*)"', a_tag)
|
|
||||||
et = title_m.group(1).strip() if title_m else re.sub(r'<[^>]+>', '', a_match.group(1)).strip()
|
|
||||||
if et:
|
|
||||||
events.append(et)
|
|
||||||
|
|
||||||
weekday = weekdays[col_idx] if col_idx < len(weekdays) else ''
|
|
||||||
days[day_num] = {'weekday': weekday, 'events': events}
|
|
||||||
|
|
||||||
return month_text, days
|
|
||||||
|
|
||||||
|
|
||||||
async def fetch_diary_data(phpsessid: str) -> dict | None:
|
|
||||||
logger.info("Fetching diary data via Playwright...")
|
|
||||||
try:
|
|
||||||
async with async_playwright() as p:
|
|
||||||
browser = await p.chromium.connect(PLAYWRIGHT_WS)
|
|
||||||
try:
|
|
||||||
context_browser = await browser.new_context(user_agent=USER_AGENT)
|
|
||||||
await context_browser.add_cookies([{
|
|
||||||
'name': 'PHPSESSID',
|
|
||||||
'value': phpsessid,
|
|
||||||
'domain': 'edu.edu.vn.ua',
|
|
||||||
'path': '/'
|
|
||||||
}])
|
|
||||||
page = await context_browser.new_page()
|
|
||||||
|
|
||||||
try:
|
|
||||||
await page.goto(DIARY_URL, wait_until='domcontentloaded')
|
|
||||||
await page.wait_for_selector('table.calendar', timeout=10000)
|
|
||||||
await page.wait_for_timeout(1500)
|
|
||||||
|
|
||||||
table_html = await page.evaluate("""
|
|
||||||
() => {
|
|
||||||
const t = document.querySelector('table.calendar');
|
|
||||||
return t ? t.outerHTML : null;
|
|
||||||
}
|
|
||||||
""")
|
|
||||||
if not table_html:
|
|
||||||
logger.error("table.calendar not found in DOM")
|
|
||||||
return None
|
|
||||||
|
|
||||||
# Debug: save HTML for troubleshooting
|
|
||||||
with contextlib.suppress(Exception), \
|
|
||||||
open('/tmp/diary_debug.html', 'w', encoding='utf-8') as f: # noqa: S108
|
|
||||||
f.write(table_html)
|
|
||||||
|
|
||||||
month_text, days = _parse_calendar_html(table_html)
|
|
||||||
logger.info(f"Diary parsed: month={month_text!r}, days_with_events={sum(1 for d in days.values() if d['events'])}/{len(days)}")
|
|
||||||
|
|
||||||
return {'monthFullText': month_text, 'days': days}
|
|
||||||
|
|
||||||
except Exception as e:
|
|
||||||
logger.error(f"Error parsing diary: {e}")
|
|
||||||
return None
|
|
||||||
finally:
|
|
||||||
await page.close()
|
|
||||||
await context_browser.close()
|
|
||||||
finally:
|
|
||||||
await browser.close()
|
|
||||||
except Exception as e:
|
|
||||||
logger.error(f"Playwright error in diary fetch: {e}")
|
|
||||||
return None
|
|
||||||
|
|
||||||
def _parse_diary_month(text: str) -> str:
|
|
||||||
match = re.search(r'([А-Яа-яіїєґ\']+\s*:\s*\d{4})', text)
|
|
||||||
if match:
|
|
||||||
return match.group(1).replace(' : ', ' ').strip()
|
|
||||||
return text.strip()
|
|
||||||
|
|
||||||
def format_diary_day(data: dict, day_num: int) -> str:
|
|
||||||
days = data.get('days', {})
|
|
||||||
month_str = _parse_diary_month(data.get('monthFullText', ''))
|
|
||||||
day_data = days.get(str(day_num))
|
|
||||||
lines = [f"📅 <b>{day_num} {month_str}</b>", "─" * 18]
|
|
||||||
if not day_data or not day_data.get('events'):
|
|
||||||
lines.append("Немає подій")
|
|
||||||
else:
|
|
||||||
for e in day_data['events']:
|
|
||||||
lines.append(f"📌 {e}")
|
|
||||||
lines.append(f"\n🔗 {DIARY_URL}")
|
|
||||||
return "\n".join(lines)
|
|
||||||
|
|
||||||
def format_diary_week(data: dict, today: datetime) -> str:
|
|
||||||
days = data.get('days', {})
|
|
||||||
_parse_diary_month(data.get('monthFullText', ''))
|
|
||||||
monday = today - timedelta(days=today.weekday())
|
|
||||||
sunday = monday + timedelta(days=6)
|
|
||||||
lines = [f"📅 <b>Тиждень {monday.day}.{monday.month} – {sunday.day}.{sunday.month}</b>\n"]
|
|
||||||
for i in range(7):
|
|
||||||
d = monday + timedelta(days=i)
|
|
||||||
day_data = days.get(str(d.day))
|
|
||||||
lines.append(f"─ <b>{DIARY_WEEKDAYS_SHORT[i]} {d.day}.{d.month}</b> ─")
|
|
||||||
if not day_data or not day_data.get('events'):
|
|
||||||
lines.append("Немає подій\n")
|
|
||||||
else:
|
|
||||||
for e in day_data['events']:
|
|
||||||
lines.append(f"📌 {e}")
|
|
||||||
lines.append("")
|
|
||||||
lines.append(f"🔗 {DIARY_URL}")
|
|
||||||
return "\n".join(lines)
|
|
||||||
|
|
||||||
def format_diary_month(data: dict) -> str:
|
|
||||||
days = data.get('days', {})
|
|
||||||
month_str = _parse_diary_month(data.get('monthFullText', ''))
|
|
||||||
lines = [f"📅 <b>{month_str}</b>\n"]
|
|
||||||
for day_num in sorted(days.keys(), key=int):
|
|
||||||
day_data = days[day_num]
|
|
||||||
events = day_data.get('events', [])
|
|
||||||
weekday = day_data.get('weekday', '')
|
|
||||||
lines.append(f"─ <b>{weekday} {day_num}</b> ─")
|
|
||||||
if not events:
|
|
||||||
lines.append("Немає подій\n")
|
|
||||||
else:
|
|
||||||
for e in events:
|
|
||||||
lines.append(f"📌 {e}")
|
|
||||||
lines.append("")
|
|
||||||
lines.append(f"🔗 {DIARY_URL}")
|
|
||||||
return "\n".join(lines)
|
|
||||||
|
|
||||||
async def _get_diary_data(context: ContextTypes.DEFAULT_TYPE) -> dict | None:
|
|
||||||
cached = context.user_data.get('diary_cache')
|
|
||||||
now_ts = time.time()
|
|
||||||
if cached and (now_ts - cached.get('timestamp', 0)) < 300:
|
|
||||||
return cached['data']
|
|
||||||
phpsessid = redis_client.get(KEY_PHPSESSID)
|
|
||||||
if not phpsessid:
|
|
||||||
return None
|
|
||||||
data = await fetch_diary_data(phpsessid)
|
|
||||||
if data:
|
|
||||||
context.user_data['diary_cache'] = {'data': data, 'timestamp': now_ts}
|
|
||||||
return data
|
|
||||||
|
|
||||||
# --- 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'))
|
|
||||||
|
|
||||||
async def diary_command(update: Update, _context: ContextTypes.DEFAULT_TYPE):
|
|
||||||
user = update.effective_user
|
|
||||||
if not is_whitelisted(user.id):
|
|
||||||
await update.message.reply_text(t(user.id, 'access_denied'))
|
|
||||||
return
|
|
||||||
await update.message.reply_text(
|
|
||||||
"📅 <b>Щоденник</b> — виберіть період:",
|
|
||||||
parse_mode='HTML',
|
|
||||||
reply_markup=get_diary_keyboard()
|
|
||||||
)
|
|
||||||
|
|
||||||
async def diary_callback(update: Update, context: ContextTypes.DEFAULT_TYPE):
|
|
||||||
query = update.callback_query
|
|
||||||
user_id = query.from_user.id
|
|
||||||
await query.answer()
|
|
||||||
|
|
||||||
if user_id != ADMIN_ID and not is_whitelisted(user_id):
|
|
||||||
await query.edit_message_text("⛔ Доступ заборонено.")
|
|
||||||
return
|
|
||||||
|
|
||||||
data = query.data
|
|
||||||
if data == "diary_refresh":
|
|
||||||
context.user_data.pop('diary_cache', None)
|
|
||||||
await query.edit_message_text("🔄 Завантажую щоденник...")
|
|
||||||
diary_data = await _get_diary_data(context)
|
|
||||||
if not diary_data:
|
|
||||||
await query.edit_message_text("❌ Не вдалося завантажити щоденник. Немає сесії або помилка.")
|
|
||||||
return
|
|
||||||
await query.edit_message_text(
|
|
||||||
"📅 <b>Щоденник</b> — виберіть період:",
|
|
||||||
parse_mode='HTML',
|
|
||||||
reply_markup=get_diary_keyboard()
|
|
||||||
)
|
|
||||||
return
|
|
||||||
|
|
||||||
await query.edit_message_text("🔄 Завантажую щоденник...")
|
|
||||||
diary_data = await _get_diary_data(context)
|
|
||||||
if not diary_data:
|
|
||||||
await query.edit_message_text("❌ Не вдалося завантажити щоденник.")
|
|
||||||
return
|
|
||||||
|
|
||||||
today = datetime.now()
|
|
||||||
if data == "diary_today":
|
|
||||||
text = format_diary_day(diary_data, today.day)
|
|
||||||
elif data == "diary_tomorrow":
|
|
||||||
tomorrow = today + timedelta(days=1)
|
|
||||||
if tomorrow.day < today.day:
|
|
||||||
text = "❌ Дані за наступний місяць недоступні. Перейдіть на сайт."
|
|
||||||
else:
|
|
||||||
text = format_diary_day(diary_data, tomorrow.day)
|
|
||||||
elif data == "diary_week":
|
|
||||||
text = format_diary_week(diary_data, today)
|
|
||||||
elif data == "diary_month":
|
|
||||||
text = format_diary_month(diary_data)
|
|
||||||
else:
|
|
||||||
return
|
|
||||||
|
|
||||||
if len(text) > 4096:
|
|
||||||
text = text[:4090] + "\n\n✂️ ...(обрізано)"
|
|
||||||
|
|
||||||
await query.edit_message_text(
|
|
||||||
text,
|
|
||||||
parse_mode='HTML',
|
|
||||||
reply_markup=get_diary_keyboard()
|
|
||||||
)
|
|
||||||
|
|
||||||
# --- 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
|
|
||||||
with contextlib.suppress(Exception):
|
|
||||||
if page and not content:
|
|
||||||
content = await page.content()
|
|
||||||
|
|
||||||
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))
|
|
||||||
app.add_handler(CommandHandler("diary", diary_command))
|
|
||||||
|
|
||||||
# Callback handlers - diary first, then language selection, then admin panel
|
|
||||||
app.add_handler(CallbackQueryHandler(diary_callback, pattern="^diary_"))
|
|
||||||
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()
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
FROM nginx:alpine
|
|
||||||
RUN rm -rf /usr/share/nginx/html/*
|
|
||||||
COPY html /usr/share/nginx/html
|
|
||||||
EXPOSE 80
|
|
||||||
CMD ["nginx", "-g", "daemon off;"]
|
|
||||||
@@ -1,21 +0,0 @@
|
|||||||
services:
|
|
||||||
errorpage:
|
|
||||||
build: .
|
|
||||||
image: gcr.forust.xyz/forust/error-pages:latest
|
|
||||||
pull_policy: build
|
|
||||||
container_name: error-pages
|
|
||||||
restart: unless-stopped
|
|
||||||
# ports:
|
|
||||||
# - 1234:80
|
|
||||||
networks:
|
|
||||||
- proxy
|
|
||||||
labels:
|
|
||||||
- "traefik.enable=true"
|
|
||||||
- "traefik.http.services.error-pages.loadbalancer.server.port=80"
|
|
||||||
# Error handler middleware
|
|
||||||
- "traefik.http.middlewares.error-pages.errors.status=400,402-599"
|
|
||||||
- "traefik.http.middlewares.error-pages.errors.service=error-pages"
|
|
||||||
- "traefik.http.middlewares.error-pages.errors.query=/{status}.html"
|
|
||||||
networks:
|
|
||||||
proxy:
|
|
||||||
external: true
|
|
||||||
@@ -1,208 +0,0 @@
|
|||||||
<!DOCTYPE html>
|
|
||||||
<html lang="en">
|
|
||||||
|
|
||||||
<head>
|
|
||||||
<meta charset="UTF-8">
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
|
||||||
<title>403 // Forbidden</title>
|
|
||||||
<script src="https://kit.fontawesome.com/a076d05399.js" crossorigin="anonymous"></script>
|
|
||||||
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css">
|
|
||||||
<style>
|
|
||||||
/* hidden in a plain sight? */
|
|
||||||
:root {
|
|
||||||
--bg-color: #050505;
|
|
||||||
--text-color: #e0e0e0;
|
|
||||||
--accent: #ffffff;
|
|
||||||
--dim: #666666;
|
|
||||||
--font-mono: 'Courier New', Courier, monospace;
|
|
||||||
}
|
|
||||||
|
|
||||||
* {
|
|
||||||
box-sizing: border-box;
|
|
||||||
margin: 0;
|
|
||||||
padding: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
body {
|
|
||||||
background-color: var(--bg-color);
|
|
||||||
color: var(--text-color);
|
|
||||||
font-family: var(--font-mono);
|
|
||||||
line-height: 1.6;
|
|
||||||
font-size: 16px;
|
|
||||||
padding: 2rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
a {
|
|
||||||
color: var(--text-color);
|
|
||||||
text-decoration: none;
|
|
||||||
border-bottom: 1px solid var(--dim);
|
|
||||||
transition: all 0.2s;
|
|
||||||
}
|
|
||||||
|
|
||||||
a:hover {
|
|
||||||
background-color: var(--text-color);
|
|
||||||
color: var(--bg-color);
|
|
||||||
border-color: var(--text-color);
|
|
||||||
}
|
|
||||||
|
|
||||||
.container {
|
|
||||||
max-width: 800px;
|
|
||||||
margin: 0 auto;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* TEXT */
|
|
||||||
h1 {
|
|
||||||
font-size: 2.5rem;
|
|
||||||
text-transform: uppercase;
|
|
||||||
letter-spacing: -2px;
|
|
||||||
margin-bottom: 0.5rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
h2 {
|
|
||||||
font-size: 1.2rem;
|
|
||||||
margin-bottom: 1.5rem;
|
|
||||||
border-bottom: 1px solid var(--dim);
|
|
||||||
display: inline-block;
|
|
||||||
padding-right: 20px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.subtitle {
|
|
||||||
color: var(--dim);
|
|
||||||
margin-bottom: 2rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
hr {
|
|
||||||
border: 0;
|
|
||||||
border-top: 1px dashed var(--dim);
|
|
||||||
margin: 2rem 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.comment {
|
|
||||||
color: var(--dim);
|
|
||||||
font-size: 0.9rem;
|
|
||||||
margin-left: 10px;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* SECTIONS */
|
|
||||||
section {
|
|
||||||
margin-bottom: 3rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* LISTS */
|
|
||||||
ul {
|
|
||||||
list-style: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.link-list li {
|
|
||||||
margin-bottom: 0.8rem;
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: 15px;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* STACK GRID */
|
|
||||||
.grid-2 {
|
|
||||||
display: grid;
|
|
||||||
grid-template-columns: 1fr 1fr;
|
|
||||||
gap: 2rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.skill-item {
|
|
||||||
display: flex;
|
|
||||||
justify-content: space-between;
|
|
||||||
margin-bottom: 0.5rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.level {
|
|
||||||
font-weight: bold;
|
|
||||||
}
|
|
||||||
|
|
||||||
.special .level {
|
|
||||||
color: var(--text-color);
|
|
||||||
text-shadow: 1px 0 0 red, -1px 0 0 blue;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* my dudes */
|
|
||||||
.team-grid {
|
|
||||||
display: flex;
|
|
||||||
gap: 2rem;
|
|
||||||
flex-wrap: wrap;
|
|
||||||
margin-top: 1rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.member {
|
|
||||||
text-align: center;
|
|
||||||
width: 100px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.avatar {
|
|
||||||
width: 80px;
|
|
||||||
height: 80px;
|
|
||||||
background-color: #222;
|
|
||||||
border: 2px solid var(--text-color);
|
|
||||||
margin: 0 auto 10px auto;
|
|
||||||
background-size: cover;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* if no avatar added: */
|
|
||||||
.placeholder::before {
|
|
||||||
content: "?";
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: center;
|
|
||||||
height: 100%;
|
|
||||||
font-size: 2rem;
|
|
||||||
color: var(--dim);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* REPOS */
|
|
||||||
.repo-list li {
|
|
||||||
margin-bottom: 1rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* FOOTER */
|
|
||||||
footer {
|
|
||||||
text-align: center;
|
|
||||||
color: var(--dim);
|
|
||||||
font-size: 0.8rem;
|
|
||||||
/* flag{why-are-you-here?} */
|
|
||||||
margin-top: 4rem;
|
|
||||||
}
|
|
||||||
/* SMTH RESPONSIVE */
|
|
||||||
@media (max-width: 600px) {
|
|
||||||
.grid-2 {
|
|
||||||
grid-template-columns: 1fr;
|
|
||||||
gap: 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
</head>
|
|
||||||
|
|
||||||
<body>
|
|
||||||
|
|
||||||
<div class="container">
|
|
||||||
<header>
|
|
||||||
<h1 class="glitch" data-text="403">403</h1>
|
|
||||||
<p class="subtitle">> Forbidden / Access Denied.</p>
|
|
||||||
</header>
|
|
||||||
|
|
||||||
<hr>
|
|
||||||
|
|
||||||
<section id="message">
|
|
||||||
<h2>./error_message</h2>
|
|
||||||
<p>You do not have permission to access this resource.</p>
|
|
||||||
<br>
|
|
||||||
<p>Check the <a href="https://status.forust.xyz">System Status</a> if you believe this is an
|
|
||||||
error.</p>
|
|
||||||
</section>
|
|
||||||
|
|
||||||
<footer>
|
|
||||||
<p>root@error:~$ sudo access_resource</p>
|
|
||||||
<p>User is not in the sudoers file. This incident will be reported.</p>
|
|
||||||
<p>© XRock - Just Signal.</p>
|
|
||||||
</footer>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
</body>
|
|
||||||
|
|
||||||
</html>
|
|
||||||
@@ -1,207 +0,0 @@
|
|||||||
<!DOCTYPE html>
|
|
||||||
<html lang="en">
|
|
||||||
|
|
||||||
<head>
|
|
||||||
<meta charset="UTF-8">
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
|
||||||
<title>404 // Not Found</title>
|
|
||||||
<script src="https://kit.fontawesome.com/a076d05399.js" crossorigin="anonymous"></script>
|
|
||||||
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css">
|
|
||||||
<style>
|
|
||||||
/* hidden in a plain sight? */
|
|
||||||
:root {
|
|
||||||
--bg-color: #050505;
|
|
||||||
--text-color: #e0e0e0;
|
|
||||||
--accent: #ffffff;
|
|
||||||
--dim: #666666;
|
|
||||||
--font-mono: 'Courier New', Courier, monospace;
|
|
||||||
}
|
|
||||||
|
|
||||||
* {
|
|
||||||
box-sizing: border-box;
|
|
||||||
margin: 0;
|
|
||||||
padding: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
body {
|
|
||||||
background-color: var(--bg-color);
|
|
||||||
color: var(--text-color);
|
|
||||||
font-family: var(--font-mono);
|
|
||||||
line-height: 1.6;
|
|
||||||
font-size: 16px;
|
|
||||||
padding: 2rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
a {
|
|
||||||
color: var(--text-color);
|
|
||||||
text-decoration: none;
|
|
||||||
border-bottom: 1px solid var(--dim);
|
|
||||||
transition: all 0.2s;
|
|
||||||
}
|
|
||||||
|
|
||||||
a:hover {
|
|
||||||
background-color: var(--text-color);
|
|
||||||
color: var(--bg-color);
|
|
||||||
border-color: var(--text-color);
|
|
||||||
}
|
|
||||||
|
|
||||||
.container {
|
|
||||||
max-width: 800px;
|
|
||||||
margin: 0 auto;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* TEXT */
|
|
||||||
h1 {
|
|
||||||
font-size: 2.5rem;
|
|
||||||
text-transform: uppercase;
|
|
||||||
letter-spacing: -2px;
|
|
||||||
margin-bottom: 0.5rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
h2 {
|
|
||||||
font-size: 1.2rem;
|
|
||||||
margin-bottom: 1.5rem;
|
|
||||||
border-bottom: 1px solid var(--dim);
|
|
||||||
display: inline-block;
|
|
||||||
padding-right: 20px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.subtitle {
|
|
||||||
color: var(--dim);
|
|
||||||
margin-bottom: 2rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
hr {
|
|
||||||
border: 0;
|
|
||||||
border-top: 1px dashed var(--dim);
|
|
||||||
margin: 2rem 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.comment {
|
|
||||||
color: var(--dim);
|
|
||||||
font-size: 0.9rem;
|
|
||||||
margin-left: 10px;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* SECTIONS */
|
|
||||||
section {
|
|
||||||
margin-bottom: 3rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* LISTS */
|
|
||||||
ul {
|
|
||||||
list-style: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.link-list li {
|
|
||||||
margin-bottom: 0.8rem;
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: 15px;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* STACK GRID */
|
|
||||||
.grid-2 {
|
|
||||||
display: grid;
|
|
||||||
grid-template-columns: 1fr 1fr;
|
|
||||||
gap: 2rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.skill-item {
|
|
||||||
display: flex;
|
|
||||||
justify-content: space-between;
|
|
||||||
margin-bottom: 0.5rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.level {
|
|
||||||
font-weight: bold;
|
|
||||||
}
|
|
||||||
|
|
||||||
.special .level {
|
|
||||||
color: var(--text-color);
|
|
||||||
text-shadow: 1px 0 0 red, -1px 0 0 blue;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* my dudes */
|
|
||||||
.team-grid {
|
|
||||||
display: flex;
|
|
||||||
gap: 2rem;
|
|
||||||
flex-wrap: wrap;
|
|
||||||
margin-top: 1rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.member {
|
|
||||||
text-align: center;
|
|
||||||
width: 100px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.avatar {
|
|
||||||
width: 80px;
|
|
||||||
height: 80px;
|
|
||||||
background-color: #222;
|
|
||||||
border: 2px solid var(--text-color);
|
|
||||||
margin: 0 auto 10px auto;
|
|
||||||
background-size: cover;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* if no avatar added: */
|
|
||||||
.placeholder::before {
|
|
||||||
content: "?";
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: center;
|
|
||||||
height: 100%;
|
|
||||||
font-size: 2rem;
|
|
||||||
color: var(--dim);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* REPOS */
|
|
||||||
.repo-list li {
|
|
||||||
margin-bottom: 1rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* FOOTER */
|
|
||||||
footer {
|
|
||||||
text-align: center;
|
|
||||||
color: var(--dim);
|
|
||||||
font-size: 0.8rem;
|
|
||||||
/* flag{why-are-you-here?} */
|
|
||||||
margin-top: 4rem;
|
|
||||||
}
|
|
||||||
/* SMTH RESPONSIVE */
|
|
||||||
@media (max-width: 600px) {
|
|
||||||
.grid-2 {
|
|
||||||
grid-template-columns: 1fr;
|
|
||||||
gap: 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
</head>
|
|
||||||
|
|
||||||
<body>
|
|
||||||
|
|
||||||
<div class="container">
|
|
||||||
<header>
|
|
||||||
<h1 class="glitch" data-text="404">404</h1>
|
|
||||||
<p class="subtitle">> Page Not Found / Lost in the Void.</p>
|
|
||||||
</header>
|
|
||||||
|
|
||||||
<hr>
|
|
||||||
|
|
||||||
<section id="message">
|
|
||||||
<h2>./error_message</h2>
|
|
||||||
<p>The page you are looking for does not exist or has been moved.</p>
|
|
||||||
<br>
|
|
||||||
<p>Check the <a href="https://status.forust.xyz">System Status</a> if you believe this is an error.</p>
|
|
||||||
</section>
|
|
||||||
|
|
||||||
<footer>
|
|
||||||
<p>root@error:~$ ping target</p>
|
|
||||||
<p>Destination Host Unreachable</p>
|
|
||||||
<p>© XRock - Just Signal.</p>
|
|
||||||
</footer>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
</body>
|
|
||||||
|
|
||||||
</html>
|
|
||||||
@@ -1,207 +0,0 @@
|
|||||||
<!DOCTYPE html>
|
|
||||||
<html lang="en">
|
|
||||||
|
|
||||||
<head>
|
|
||||||
<meta charset="UTF-8">
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
|
||||||
<title>500 // Server Error</title>
|
|
||||||
<script src="https://kit.fontawesome.com/a076d05399.js" crossorigin="anonymous"></script>
|
|
||||||
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css">
|
|
||||||
<style>
|
|
||||||
/* hidden in a plain sight? */
|
|
||||||
:root {
|
|
||||||
--bg-color: #050505;
|
|
||||||
--text-color: #e0e0e0;
|
|
||||||
--accent: #ffffff;
|
|
||||||
--dim: #666666;
|
|
||||||
--font-mono: 'Courier New', Courier, monospace;
|
|
||||||
}
|
|
||||||
|
|
||||||
* {
|
|
||||||
box-sizing: border-box;
|
|
||||||
margin: 0;
|
|
||||||
padding: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
body {
|
|
||||||
background-color: var(--bg-color);
|
|
||||||
color: var(--text-color);
|
|
||||||
font-family: var(--font-mono);
|
|
||||||
line-height: 1.6;
|
|
||||||
font-size: 16px;
|
|
||||||
padding: 2rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
a {
|
|
||||||
color: var(--text-color);
|
|
||||||
text-decoration: none;
|
|
||||||
border-bottom: 1px solid var(--dim);
|
|
||||||
transition: all 0.2s;
|
|
||||||
}
|
|
||||||
|
|
||||||
a:hover {
|
|
||||||
background-color: var(--text-color);
|
|
||||||
color: var(--bg-color);
|
|
||||||
border-color: var(--text-color);
|
|
||||||
}
|
|
||||||
|
|
||||||
.container {
|
|
||||||
max-width: 800px;
|
|
||||||
margin: 0 auto;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* TEXT */
|
|
||||||
h1 {
|
|
||||||
font-size: 2.5rem;
|
|
||||||
text-transform: uppercase;
|
|
||||||
letter-spacing: -2px;
|
|
||||||
margin-bottom: 0.5rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
h2 {
|
|
||||||
font-size: 1.2rem;
|
|
||||||
margin-bottom: 1.5rem;
|
|
||||||
border-bottom: 1px solid var(--dim);
|
|
||||||
display: inline-block;
|
|
||||||
padding-right: 20px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.subtitle {
|
|
||||||
color: var(--dim);
|
|
||||||
margin-bottom: 2rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
hr {
|
|
||||||
border: 0;
|
|
||||||
border-top: 1px dashed var(--dim);
|
|
||||||
margin: 2rem 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.comment {
|
|
||||||
color: var(--dim);
|
|
||||||
font-size: 0.9rem;
|
|
||||||
margin-left: 10px;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* SECTIONS */
|
|
||||||
section {
|
|
||||||
margin-bottom: 3rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* LISTS */
|
|
||||||
ul {
|
|
||||||
list-style: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.link-list li {
|
|
||||||
margin-bottom: 0.8rem;
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: 15px;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* STACK GRID */
|
|
||||||
.grid-2 {
|
|
||||||
display: grid;
|
|
||||||
grid-template-columns: 1fr 1fr;
|
|
||||||
gap: 2rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.skill-item {
|
|
||||||
display: flex;
|
|
||||||
justify-content: space-between;
|
|
||||||
margin-bottom: 0.5rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.level {
|
|
||||||
font-weight: bold;
|
|
||||||
}
|
|
||||||
|
|
||||||
.special .level {
|
|
||||||
color: var(--text-color);
|
|
||||||
text-shadow: 1px 0 0 red, -1px 0 0 blue;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* my dudes */
|
|
||||||
.team-grid {
|
|
||||||
display: flex;
|
|
||||||
gap: 2rem;
|
|
||||||
flex-wrap: wrap;
|
|
||||||
margin-top: 1rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.member {
|
|
||||||
text-align: center;
|
|
||||||
width: 100px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.avatar {
|
|
||||||
width: 80px;
|
|
||||||
height: 80px;
|
|
||||||
background-color: #222;
|
|
||||||
border: 2px solid var(--text-color);
|
|
||||||
margin: 0 auto 10px auto;
|
|
||||||
background-size: cover;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* if no avatar added: */
|
|
||||||
.placeholder::before {
|
|
||||||
content: "?";
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: center;
|
|
||||||
height: 100%;
|
|
||||||
font-size: 2rem;
|
|
||||||
color: var(--dim);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* REPOS */
|
|
||||||
.repo-list li {
|
|
||||||
margin-bottom: 1rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* FOOTER */
|
|
||||||
footer {
|
|
||||||
text-align: center;
|
|
||||||
color: var(--dim);
|
|
||||||
font-size: 0.8rem;
|
|
||||||
/* flag{why-are-you-here?} */
|
|
||||||
margin-top: 4rem;
|
|
||||||
}
|
|
||||||
/* SMTH RESPONSIVE */
|
|
||||||
@media (max-width: 600px) {
|
|
||||||
.grid-2 {
|
|
||||||
grid-template-columns: 1fr;
|
|
||||||
gap: 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
</head>
|
|
||||||
|
|
||||||
<body>
|
|
||||||
|
|
||||||
<div class="container">
|
|
||||||
<header>
|
|
||||||
<h1 class="glitch" data-text="500">500</h1>
|
|
||||||
<p class="subtitle">> Internal Server Error / System Failure.</p>
|
|
||||||
</header>
|
|
||||||
|
|
||||||
<hr>
|
|
||||||
|
|
||||||
<section id="message">
|
|
||||||
<h2>./error_message</h2>
|
|
||||||
<p>Something went wrong on our end. We are working to fix it.</p>
|
|
||||||
<br>
|
|
||||||
<p>Check the <a href="https://status.forust.xyz">System Status</a> for more information.</p>
|
|
||||||
</section>
|
|
||||||
|
|
||||||
<footer>
|
|
||||||
<p>root@error:~$ systemctl status service</p>
|
|
||||||
<p>Active: failed (Result: core-dump)</p>
|
|
||||||
<p>© XRock - Just Signal.</p>
|
|
||||||
</footer>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
</body>
|
|
||||||
|
|
||||||
</html>
|
|
||||||
@@ -1,207 +0,0 @@
|
|||||||
<!DOCTYPE html>
|
|
||||||
<html lang="en">
|
|
||||||
|
|
||||||
<head>
|
|
||||||
<meta charset="UTF-8">
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
|
||||||
<title>502 // Bad Gateway</title>
|
|
||||||
<script src="https://kit.fontawesome.com/a076d05399.js" crossorigin="anonymous"></script>
|
|
||||||
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css">
|
|
||||||
<style>
|
|
||||||
/* hidden in a plain sight? */
|
|
||||||
:root {
|
|
||||||
--bg-color: #050505;
|
|
||||||
--text-color: #e0e0e0;
|
|
||||||
--accent: #ffffff;
|
|
||||||
--dim: #666666;
|
|
||||||
--font-mono: 'Courier New', Courier, monospace;
|
|
||||||
}
|
|
||||||
|
|
||||||
* {
|
|
||||||
box-sizing: border-box;
|
|
||||||
margin: 0;
|
|
||||||
padding: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
body {
|
|
||||||
background-color: var(--bg-color);
|
|
||||||
color: var(--text-color);
|
|
||||||
font-family: var(--font-mono);
|
|
||||||
line-height: 1.6;
|
|
||||||
font-size: 16px;
|
|
||||||
padding: 2rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
a {
|
|
||||||
color: var(--text-color);
|
|
||||||
text-decoration: none;
|
|
||||||
border-bottom: 1px solid var(--dim);
|
|
||||||
transition: all 0.2s;
|
|
||||||
}
|
|
||||||
|
|
||||||
a:hover {
|
|
||||||
background-color: var(--text-color);
|
|
||||||
color: var(--bg-color);
|
|
||||||
border-color: var(--text-color);
|
|
||||||
}
|
|
||||||
|
|
||||||
.container {
|
|
||||||
max-width: 800px;
|
|
||||||
margin: 0 auto;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* TEXT */
|
|
||||||
h1 {
|
|
||||||
font-size: 2.5rem;
|
|
||||||
text-transform: uppercase;
|
|
||||||
letter-spacing: -2px;
|
|
||||||
margin-bottom: 0.5rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
h2 {
|
|
||||||
font-size: 1.2rem;
|
|
||||||
margin-bottom: 1.5rem;
|
|
||||||
border-bottom: 1px solid var(--dim);
|
|
||||||
display: inline-block;
|
|
||||||
padding-right: 20px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.subtitle {
|
|
||||||
color: var(--dim);
|
|
||||||
margin-bottom: 2rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
hr {
|
|
||||||
border: 0;
|
|
||||||
border-top: 1px dashed var(--dim);
|
|
||||||
margin: 2rem 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.comment {
|
|
||||||
color: var(--dim);
|
|
||||||
font-size: 0.9rem;
|
|
||||||
margin-left: 10px;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* SECTIONS */
|
|
||||||
section {
|
|
||||||
margin-bottom: 3rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* LISTS */
|
|
||||||
ul {
|
|
||||||
list-style: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.link-list li {
|
|
||||||
margin-bottom: 0.8rem;
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: 15px;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* STACK GRID */
|
|
||||||
.grid-2 {
|
|
||||||
display: grid;
|
|
||||||
grid-template-columns: 1fr 1fr;
|
|
||||||
gap: 2rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.skill-item {
|
|
||||||
display: flex;
|
|
||||||
justify-content: space-between;
|
|
||||||
margin-bottom: 0.5rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.level {
|
|
||||||
font-weight: bold;
|
|
||||||
}
|
|
||||||
|
|
||||||
.special .level {
|
|
||||||
color: var(--text-color);
|
|
||||||
text-shadow: 1px 0 0 red, -1px 0 0 blue;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* my dudes */
|
|
||||||
.team-grid {
|
|
||||||
display: flex;
|
|
||||||
gap: 2rem;
|
|
||||||
flex-wrap: wrap;
|
|
||||||
margin-top: 1rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.member {
|
|
||||||
text-align: center;
|
|
||||||
width: 100px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.avatar {
|
|
||||||
width: 80px;
|
|
||||||
height: 80px;
|
|
||||||
background-color: #222;
|
|
||||||
border: 2px solid var(--text-color);
|
|
||||||
margin: 0 auto 10px auto;
|
|
||||||
background-size: cover;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* if no avatar added: */
|
|
||||||
.placeholder::before {
|
|
||||||
content: "?";
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: center;
|
|
||||||
height: 100%;
|
|
||||||
font-size: 2rem;
|
|
||||||
color: var(--dim);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* REPOS */
|
|
||||||
.repo-list li {
|
|
||||||
margin-bottom: 1rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* FOOTER */
|
|
||||||
footer {
|
|
||||||
text-align: center;
|
|
||||||
color: var(--dim);
|
|
||||||
font-size: 0.8rem;
|
|
||||||
/* flag{why-are-you-here?} */
|
|
||||||
margin-top: 4rem;
|
|
||||||
}
|
|
||||||
/* SMTH RESPONSIVE */
|
|
||||||
@media (max-width: 600px) {
|
|
||||||
.grid-2 {
|
|
||||||
grid-template-columns: 1fr;
|
|
||||||
gap: 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
</head>
|
|
||||||
|
|
||||||
<body>
|
|
||||||
|
|
||||||
<div class="container">
|
|
||||||
<header>
|
|
||||||
<h1 class="glitch" data-text="502">502</h1>
|
|
||||||
<p class="subtitle">> Bad Gateway / System Failure.</p>
|
|
||||||
</header>
|
|
||||||
|
|
||||||
<hr>
|
|
||||||
|
|
||||||
<section id="message">
|
|
||||||
<h2>./error_message</h2>
|
|
||||||
<p>The server received an invalid response from the upstream server.</p>
|
|
||||||
<br>
|
|
||||||
<p>Check the <a href="https://status.forust.xyz">System Status</a> for more information.</p>
|
|
||||||
</section>
|
|
||||||
|
|
||||||
<footer>
|
|
||||||
<p>root@error:~$ curl -I upstream_host</p>
|
|
||||||
<p>HTTP/1.1 502 Bad Gateway</p>
|
|
||||||
<p>© XRock - Just Signal.</p>
|
|
||||||
</footer>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
</body>
|
|
||||||
|
|
||||||
</html>
|
|
||||||
@@ -1,207 +0,0 @@
|
|||||||
<!DOCTYPE html>
|
|
||||||
<html lang="en">
|
|
||||||
|
|
||||||
<head>
|
|
||||||
<meta charset="UTF-8">
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
|
||||||
<title>503 // Service Unavailable</title>
|
|
||||||
<script src="https://kit.fontawesome.com/a076d05399.js" crossorigin="anonymous"></script>
|
|
||||||
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css">
|
|
||||||
<style>
|
|
||||||
/* hidden in a plain sight? */
|
|
||||||
:root {
|
|
||||||
--bg-color: #050505;
|
|
||||||
--text-color: #e0e0e0;
|
|
||||||
--accent: #ffffff;
|
|
||||||
--dim: #666666;
|
|
||||||
--font-mono: 'Courier New', Courier, monospace;
|
|
||||||
}
|
|
||||||
|
|
||||||
* {
|
|
||||||
box-sizing: border-box;
|
|
||||||
margin: 0;
|
|
||||||
padding: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
body {
|
|
||||||
background-color: var(--bg-color);
|
|
||||||
color: var(--text-color);
|
|
||||||
font-family: var(--font-mono);
|
|
||||||
line-height: 1.6;
|
|
||||||
font-size: 16px;
|
|
||||||
padding: 2rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
a {
|
|
||||||
color: var(--text-color);
|
|
||||||
text-decoration: none;
|
|
||||||
border-bottom: 1px solid var(--dim);
|
|
||||||
transition: all 0.2s;
|
|
||||||
}
|
|
||||||
|
|
||||||
a:hover {
|
|
||||||
background-color: var(--text-color);
|
|
||||||
color: var(--bg-color);
|
|
||||||
border-color: var(--text-color);
|
|
||||||
}
|
|
||||||
|
|
||||||
.container {
|
|
||||||
max-width: 800px;
|
|
||||||
margin: 0 auto;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* TEXT */
|
|
||||||
h1 {
|
|
||||||
font-size: 2.5rem;
|
|
||||||
text-transform: uppercase;
|
|
||||||
letter-spacing: -2px;
|
|
||||||
margin-bottom: 0.5rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
h2 {
|
|
||||||
font-size: 1.2rem;
|
|
||||||
margin-bottom: 1.5rem;
|
|
||||||
border-bottom: 1px solid var(--dim);
|
|
||||||
display: inline-block;
|
|
||||||
padding-right: 20px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.subtitle {
|
|
||||||
color: var(--dim);
|
|
||||||
margin-bottom: 2rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
hr {
|
|
||||||
border: 0;
|
|
||||||
border-top: 1px dashed var(--dim);
|
|
||||||
margin: 2rem 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.comment {
|
|
||||||
color: var(--dim);
|
|
||||||
font-size: 0.9rem;
|
|
||||||
margin-left: 10px;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* SECTIONS */
|
|
||||||
section {
|
|
||||||
margin-bottom: 3rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* LISTS */
|
|
||||||
ul {
|
|
||||||
list-style: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.link-list li {
|
|
||||||
margin-bottom: 0.8rem;
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: 15px;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* STACK GRID */
|
|
||||||
.grid-2 {
|
|
||||||
display: grid;
|
|
||||||
grid-template-columns: 1fr 1fr;
|
|
||||||
gap: 2rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.skill-item {
|
|
||||||
display: flex;
|
|
||||||
justify-content: space-between;
|
|
||||||
margin-bottom: 0.5rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.level {
|
|
||||||
font-weight: bold;
|
|
||||||
}
|
|
||||||
|
|
||||||
.special .level {
|
|
||||||
color: var(--text-color);
|
|
||||||
text-shadow: 1px 0 0 red, -1px 0 0 blue;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* my dudes */
|
|
||||||
.team-grid {
|
|
||||||
display: flex;
|
|
||||||
gap: 2rem;
|
|
||||||
flex-wrap: wrap;
|
|
||||||
margin-top: 1rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.member {
|
|
||||||
text-align: center;
|
|
||||||
width: 100px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.avatar {
|
|
||||||
width: 80px;
|
|
||||||
height: 80px;
|
|
||||||
background-color: #222;
|
|
||||||
border: 2px solid var(--text-color);
|
|
||||||
margin: 0 auto 10px auto;
|
|
||||||
background-size: cover;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* if no avatar added: */
|
|
||||||
.placeholder::before {
|
|
||||||
content: "?";
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: center;
|
|
||||||
height: 100%;
|
|
||||||
font-size: 2rem;
|
|
||||||
color: var(--dim);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* REPOS */
|
|
||||||
.repo-list li {
|
|
||||||
margin-bottom: 1rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* FOOTER */
|
|
||||||
footer {
|
|
||||||
text-align: center;
|
|
||||||
color: var(--dim);
|
|
||||||
font-size: 0.8rem;
|
|
||||||
/* flag{why-are-you-here?} */
|
|
||||||
margin-top: 4rem;
|
|
||||||
}
|
|
||||||
/* SMTH RESPONSIVE */
|
|
||||||
@media (max-width: 600px) {
|
|
||||||
.grid-2 {
|
|
||||||
grid-template-columns: 1fr;
|
|
||||||
gap: 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
</head>
|
|
||||||
|
|
||||||
<body>
|
|
||||||
|
|
||||||
<div class="container">
|
|
||||||
<header>
|
|
||||||
<h1 class="glitch" data-text="503">503</h1>
|
|
||||||
<p class="subtitle">> Service Unavailable / System Failure.</p>
|
|
||||||
</header>
|
|
||||||
|
|
||||||
<hr>
|
|
||||||
|
|
||||||
<section id="message">
|
|
||||||
<h2>./error_message</h2>
|
|
||||||
<p>The server is currently unable to handle the request due to maintenance or overload.</p>
|
|
||||||
<br>
|
|
||||||
<p>Check the <a href="https://status.forust.xyz">System Status</a> for more information.</p>
|
|
||||||
</section>
|
|
||||||
|
|
||||||
<footer>
|
|
||||||
<p>root@error:~$ systemctl start service</p>
|
|
||||||
<p>Job for service failed because the control process exited with error code.</p>
|
|
||||||
<p>© XRock - Just Signal.</p>
|
|
||||||
</footer>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
</body>
|
|
||||||
|
|
||||||
</html>
|
|
||||||
@@ -1,207 +0,0 @@
|
|||||||
<!DOCTYPE html>
|
|
||||||
<html lang="en">
|
|
||||||
|
|
||||||
<head>
|
|
||||||
<meta charset="UTF-8">
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
|
||||||
<title>504 // Gateway Timeout</title>
|
|
||||||
<script src="https://kit.fontawesome.com/a076d05399.js" crossorigin="anonymous"></script>
|
|
||||||
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css">
|
|
||||||
<style>
|
|
||||||
/* hidden in a plain sight? */
|
|
||||||
:root {
|
|
||||||
--bg-color: #050505;
|
|
||||||
--text-color: #e0e0e0;
|
|
||||||
--accent: #ffffff;
|
|
||||||
--dim: #666666;
|
|
||||||
--font-mono: 'Courier New', Courier, monospace;
|
|
||||||
}
|
|
||||||
|
|
||||||
* {
|
|
||||||
box-sizing: border-box;
|
|
||||||
margin: 0;
|
|
||||||
padding: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
body {
|
|
||||||
background-color: var(--bg-color);
|
|
||||||
color: var(--text-color);
|
|
||||||
font-family: var(--font-mono);
|
|
||||||
line-height: 1.6;
|
|
||||||
font-size: 16px;
|
|
||||||
padding: 2rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
a {
|
|
||||||
color: var(--text-color);
|
|
||||||
text-decoration: none;
|
|
||||||
border-bottom: 1px solid var(--dim);
|
|
||||||
transition: all 0.2s;
|
|
||||||
}
|
|
||||||
|
|
||||||
a:hover {
|
|
||||||
background-color: var(--text-color);
|
|
||||||
color: var(--bg-color);
|
|
||||||
border-color: var(--text-color);
|
|
||||||
}
|
|
||||||
|
|
||||||
.container {
|
|
||||||
max-width: 800px;
|
|
||||||
margin: 0 auto;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* TEXT */
|
|
||||||
h1 {
|
|
||||||
font-size: 2.5rem;
|
|
||||||
text-transform: uppercase;
|
|
||||||
letter-spacing: -2px;
|
|
||||||
margin-bottom: 0.5rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
h2 {
|
|
||||||
font-size: 1.2rem;
|
|
||||||
margin-bottom: 1.5rem;
|
|
||||||
border-bottom: 1px solid var(--dim);
|
|
||||||
display: inline-block;
|
|
||||||
padding-right: 20px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.subtitle {
|
|
||||||
color: var(--dim);
|
|
||||||
margin-bottom: 2rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
hr {
|
|
||||||
border: 0;
|
|
||||||
border-top: 1px dashed var(--dim);
|
|
||||||
margin: 2rem 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.comment {
|
|
||||||
color: var(--dim);
|
|
||||||
font-size: 0.9rem;
|
|
||||||
margin-left: 10px;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* SECTIONS */
|
|
||||||
section {
|
|
||||||
margin-bottom: 3rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* LISTS */
|
|
||||||
ul {
|
|
||||||
list-style: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.link-list li {
|
|
||||||
margin-bottom: 0.8rem;
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: 15px;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* STACK GRID */
|
|
||||||
.grid-2 {
|
|
||||||
display: grid;
|
|
||||||
grid-template-columns: 1fr 1fr;
|
|
||||||
gap: 2rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.skill-item {
|
|
||||||
display: flex;
|
|
||||||
justify-content: space-between;
|
|
||||||
margin-bottom: 0.5rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.level {
|
|
||||||
font-weight: bold;
|
|
||||||
}
|
|
||||||
|
|
||||||
.special .level {
|
|
||||||
color: var(--text-color);
|
|
||||||
text-shadow: 1px 0 0 red, -1px 0 0 blue;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* my dudes */
|
|
||||||
.team-grid {
|
|
||||||
display: flex;
|
|
||||||
gap: 2rem;
|
|
||||||
flex-wrap: wrap;
|
|
||||||
margin-top: 1rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.member {
|
|
||||||
text-align: center;
|
|
||||||
width: 100px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.avatar {
|
|
||||||
width: 80px;
|
|
||||||
height: 80px;
|
|
||||||
background-color: #222;
|
|
||||||
border: 2px solid var(--text-color);
|
|
||||||
margin: 0 auto 10px auto;
|
|
||||||
background-size: cover;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* if no avatar added: */
|
|
||||||
.placeholder::before {
|
|
||||||
content: "?";
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: center;
|
|
||||||
height: 100%;
|
|
||||||
font-size: 2rem;
|
|
||||||
color: var(--dim);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* REPOS */
|
|
||||||
.repo-list li {
|
|
||||||
margin-bottom: 1rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* FOOTER */
|
|
||||||
footer {
|
|
||||||
text-align: center;
|
|
||||||
color: var(--dim);
|
|
||||||
font-size: 0.8rem;
|
|
||||||
/* flag{why-are-you-here?} */
|
|
||||||
margin-top: 4rem;
|
|
||||||
}
|
|
||||||
/* SMTH RESPONSIVE */
|
|
||||||
@media (max-width: 600px) {
|
|
||||||
.grid-2 {
|
|
||||||
grid-template-columns: 1fr;
|
|
||||||
gap: 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
</head>
|
|
||||||
|
|
||||||
<body>
|
|
||||||
|
|
||||||
<div class="container">
|
|
||||||
<header>
|
|
||||||
<h1 class="glitch" data-text="504">504</h1>
|
|
||||||
<p class="subtitle">> Gateway Timeout / System Failure.</p>
|
|
||||||
</header>
|
|
||||||
|
|
||||||
<hr>
|
|
||||||
|
|
||||||
<section id="message">
|
|
||||||
<h2>./error_message</h2>
|
|
||||||
<p>The server did not receive a timely response from the upstream server.</p>
|
|
||||||
<br>
|
|
||||||
<p>Check the <a href="https://status.forust.xyz">System Status</a> for more information.</p>
|
|
||||||
</section>
|
|
||||||
|
|
||||||
<footer>
|
|
||||||
<p>root@error:~$ timeout 30s curl upstream</p>
|
|
||||||
<p>curl: (28) Operation timed out after 30001 milliseconds with 0 bytes received</p>
|
|
||||||
<p>© XRock - Just Signal.</p>
|
|
||||||
</footer>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
</body>
|
|
||||||
|
|
||||||
</html>
|
|
||||||
@@ -1,33 +0,0 @@
|
|||||||
apiVersion: v1
|
|
||||||
kind: Service
|
|
||||||
metadata:
|
|
||||||
name: error-pages-service
|
|
||||||
namespace: error-pages
|
|
||||||
spec:
|
|
||||||
selector:
|
|
||||||
app: error-pages
|
|
||||||
ports:
|
|
||||||
- port: 80
|
|
||||||
targetPort: 80
|
|
||||||
---
|
|
||||||
apiVersion: apps/v1
|
|
||||||
kind: Deployment
|
|
||||||
metadata:
|
|
||||||
name: error-pages-deployment
|
|
||||||
namespace: error-pages
|
|
||||||
spec:
|
|
||||||
replicas: 1
|
|
||||||
selector:
|
|
||||||
matchLabels:
|
|
||||||
app: error-pages
|
|
||||||
template:
|
|
||||||
metadata:
|
|
||||||
labels:
|
|
||||||
app: error-pages
|
|
||||||
spec:
|
|
||||||
containers:
|
|
||||||
- name: error-pages
|
|
||||||
image: gcr.forust.xyz/forust/error-pages:latest
|
|
||||||
ports:
|
|
||||||
- containerPort: 80
|
|
||||||
---
|
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
apiVersion: v1
|
|
||||||
kind: Namespace
|
|
||||||
metadata:
|
|
||||||
name: error-pages
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
GITEA_POSTGRES_USER=
|
|
||||||
GITEA_POSTGRES_PASSWORD=
|
|
||||||
GITEA_POSTGRES_DB=gitea
|
|
||||||
GITEA_SMTP_PASS=
|
|
||||||
MAILER_ADDR=
|
|
||||||
SERVICE_EMAIL=email.used.by.services@domain.tld
|
|
||||||
@@ -1,78 +0,0 @@
|
|||||||
services:
|
|
||||||
server:
|
|
||||||
image: docker.gitea.com/gitea:1.26
|
|
||||||
container_name: gitea
|
|
||||||
restart: always
|
|
||||||
environment:
|
|
||||||
- USER_UID=1000
|
|
||||||
- USER_GID=1000
|
|
||||||
# Database
|
|
||||||
- GITEA__database__DB_TYPE=postgres
|
|
||||||
- GITEA__database__HOST=db:5432
|
|
||||||
- GITEA__database__USER=gitea
|
|
||||||
- GITEA__database__PASSWD=gitea
|
|
||||||
- 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
|
|
||||||
volumes:
|
|
||||||
- ./gitea-data:/data
|
|
||||||
- /etc/timezone:/etc/timezone:ro
|
|
||||||
- /etc/localtime:/etc/localtime:ro
|
|
||||||
labels:
|
|
||||||
- "traefik.enable=true"
|
|
||||||
- "traefik.http.services.gitea.loadbalancer.server.port=3000"
|
|
||||||
|
|
||||||
# Prod Router
|
|
||||||
- "traefik.http.routers.gitea.rule=Host(`gitea.forust.xyz`)"
|
|
||||||
- "traefik.http.routers.gitea.entrypoints=websecure"
|
|
||||||
- "traefik.http.routers.gitea.tls.certresolver"
|
|
||||||
# Local Router
|
|
||||||
- "traefik.http.routers.gitea-local.rule=Host(`gitea.workstation.internal`)"
|
|
||||||
- "traefik.http.routers.gitea-local.entrypoints=websecure"
|
|
||||||
- "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.tls=true"
|
|
||||||
# SSH Router
|
|
||||||
- "traefik.tcp.services.gitea.loadbalancer.server.port=22"
|
|
||||||
- "traefik.tcp.routers.gitea.entrypoints=ssh"
|
|
||||||
- "traefik.tcp.routers.gitea.rule=HostSNI(`*`)"
|
|
||||||
# Gitea container registry Router
|
|
||||||
- "traefik.http.routers.gitea-registry.rule=Host(`gcr.forust.xyz`) && PathPrefix(`/v2`)"
|
|
||||||
- "traefik.http.routers.gitea-registry.entrypoints=websecure"
|
|
||||||
- "traefik.http.routers.gitea-registry.tls.certresolver=letsencrypt"
|
|
||||||
ports:
|
|
||||||
- "2221:22"
|
|
||||||
networks:
|
|
||||||
- gitea-db
|
|
||||||
- proxy
|
|
||||||
depends_on:
|
|
||||||
- db
|
|
||||||
db:
|
|
||||||
image: docker.io/library/postgres:14
|
|
||||||
restart: always
|
|
||||||
environment:
|
|
||||||
- POSTGRES_USER=gitea
|
|
||||||
- POSTGRES_PASSWORD=gitea
|
|
||||||
- POSTGRES_DB=gitea
|
|
||||||
volumes:
|
|
||||||
- ./gitea-db/:/var/lib/postgresql/data
|
|
||||||
networks:
|
|
||||||
- gitea-db
|
|
||||||
networks:
|
|
||||||
gitea-db:
|
|
||||||
external: false
|
|
||||||
proxy:
|
|
||||||
external: true
|
|
||||||
@@ -1,20 +0,0 @@
|
|||||||
apiVersion: v1
|
|
||||||
kind: ConfigMap
|
|
||||||
metadata:
|
|
||||||
name: gitea-config
|
|
||||||
namespace: gitea
|
|
||||||
data:
|
|
||||||
GITEA__server__DOMAIN: "gitea.forust.xyz"
|
|
||||||
GITEA__server__ROOT_URL: "https://gitea.forust.xyz"
|
|
||||||
GITEA__server__SSH_DOMAIN: "gitssh.forust.xyz"
|
|
||||||
GITEA__server__SSH_PORT: "2221"
|
|
||||||
|
|
||||||
GITEA__database__DB_TYPE: "postgres"
|
|
||||||
GITEA__database__HOST: "gitea-postgres-service:5432"
|
|
||||||
GITEA__database__NAME: "gitea"
|
|
||||||
GITEA__security__REVERSE_PROXY_LIMIT: "1"
|
|
||||||
GITEA__security__REVERSE_PROXY_TRUSTED_PROXIES: "*"
|
|
||||||
|
|
||||||
GITEA__mailer__ENABLED: "false"
|
|
||||||
USER_UID: "1000"
|
|
||||||
USER_GID: "1000"
|
|
||||||
@@ -1,71 +0,0 @@
|
|||||||
apiVersion: v1
|
|
||||||
kind: Service
|
|
||||||
metadata:
|
|
||||||
name: gitea-service
|
|
||||||
namespace: gitea
|
|
||||||
spec:
|
|
||||||
selector:
|
|
||||||
app: gitea
|
|
||||||
ports:
|
|
||||||
- port: 3000
|
|
||||||
name: http
|
|
||||||
targetPort: 3000
|
|
||||||
- port: 2221
|
|
||||||
name: ssh
|
|
||||||
targetPort: 22
|
|
||||||
---
|
|
||||||
apiVersion: apps/v1
|
|
||||||
kind: Deployment
|
|
||||||
metadata:
|
|
||||||
name: gitea-deployment
|
|
||||||
namespace: gitea
|
|
||||||
spec:
|
|
||||||
replicas: 1
|
|
||||||
selector:
|
|
||||||
matchLabels:
|
|
||||||
app: gitea
|
|
||||||
template:
|
|
||||||
metadata:
|
|
||||||
labels:
|
|
||||||
app: gitea
|
|
||||||
spec:
|
|
||||||
containers:
|
|
||||||
- name: gitea
|
|
||||||
image: docker.gitea.com/gitea:1.26
|
|
||||||
envFrom:
|
|
||||||
- configMapRef:
|
|
||||||
name: gitea-config
|
|
||||||
- secretRef:
|
|
||||||
name: gitea-secrets
|
|
||||||
ports:
|
|
||||||
- containerPort: 3000
|
|
||||||
name: http
|
|
||||||
- containerPort: 2221
|
|
||||||
name: ssh
|
|
||||||
volumeMounts:
|
|
||||||
- name: gitea-data
|
|
||||||
mountPath: /data
|
|
||||||
resources:
|
|
||||||
requests:
|
|
||||||
memory: "512Mi"
|
|
||||||
cpu: "300m"
|
|
||||||
limits:
|
|
||||||
memory: "1.5Gi"
|
|
||||||
cpu: "1300m"
|
|
||||||
volumes:
|
|
||||||
- name: gitea-data
|
|
||||||
persistentVolumeClaim:
|
|
||||||
claimName: gitea-pvc
|
|
||||||
---
|
|
||||||
apiVersion: v1
|
|
||||||
kind: PersistentVolumeClaim
|
|
||||||
metadata:
|
|
||||||
name: gitea-pvc
|
|
||||||
namespace: gitea
|
|
||||||
spec:
|
|
||||||
accessModes:
|
|
||||||
- ReadWriteOnce
|
|
||||||
resources:
|
|
||||||
requests:
|
|
||||||
storage: 5Gi
|
|
||||||
---
|
|
||||||
@@ -1,64 +0,0 @@
|
|||||||
apiVersion: traefik.io/v1alpha1
|
|
||||||
kind: IngressRoute
|
|
||||||
metadata:
|
|
||||||
name: gitea-prod
|
|
||||||
namespace: gitea
|
|
||||||
spec:
|
|
||||||
entryPoints:
|
|
||||||
- websecure
|
|
||||||
routes:
|
|
||||||
- match: Host(`gitea.forust.xyz`)
|
|
||||||
kind: Rule
|
|
||||||
middlewares:
|
|
||||||
- name: "crowdsec-crowdsec-bouncer@kubernetescrd"
|
|
||||||
services:
|
|
||||||
- name: gitea-service
|
|
||||||
port: 3000
|
|
||||||
tls:
|
|
||||||
certResolver: letsencrypt
|
|
||||||
---
|
|
||||||
apiVersion: traefik.io/v1alpha1
|
|
||||||
kind: IngressRoute
|
|
||||||
metadata:
|
|
||||||
name: gitea-local
|
|
||||||
namespace: gitea
|
|
||||||
spec:
|
|
||||||
entryPoints:
|
|
||||||
- websecure
|
|
||||||
routes:
|
|
||||||
- match: Host(`gitea.workstation.internal`) || Host(`gitea.gigaforust.internal`)
|
|
||||||
kind: Rule
|
|
||||||
services:
|
|
||||||
- name: gitea-service
|
|
||||||
port: 3000
|
|
||||||
---
|
|
||||||
apiVersion: traefik.io/v1alpha1
|
|
||||||
kind: IngressRoute
|
|
||||||
metadata:
|
|
||||||
name: gitea-registry
|
|
||||||
namespace: gitea
|
|
||||||
spec:
|
|
||||||
entryPoints:
|
|
||||||
- websecure
|
|
||||||
routes:
|
|
||||||
- match: Host(`gcr.forust.xyz`) && PathPrefix(`/v2`)
|
|
||||||
kind: Rule
|
|
||||||
services:
|
|
||||||
- name: gitea-service
|
|
||||||
port: 3000
|
|
||||||
tls:
|
|
||||||
certResolver: letsencrypt
|
|
||||||
---
|
|
||||||
apiVersion: traefik.io/v1alpha1
|
|
||||||
kind: IngressRouteTCP
|
|
||||||
metadata:
|
|
||||||
name: gitea-ssh
|
|
||||||
namespace: gitea
|
|
||||||
spec:
|
|
||||||
entryPoints:
|
|
||||||
- ssh
|
|
||||||
routes:
|
|
||||||
- match: HostSNI(`*`)
|
|
||||||
services:
|
|
||||||
- name: gitea-service
|
|
||||||
port: 2221
|
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
apiVersion: v1
|
|
||||||
kind: Namespace
|
|
||||||
metadata:
|
|
||||||
name: gitea
|
|
||||||
@@ -1,62 +0,0 @@
|
|||||||
apiVersion: v1
|
|
||||||
kind: Service
|
|
||||||
metadata:
|
|
||||||
name: gitea-postgres-service
|
|
||||||
namespace: gitea
|
|
||||||
spec:
|
|
||||||
clusterIP: None
|
|
||||||
selector:
|
|
||||||
app: gitea-postgres
|
|
||||||
ports:
|
|
||||||
- port: 5432
|
|
||||||
targetPort: 5432
|
|
||||||
---
|
|
||||||
apiVersion: apps/v1
|
|
||||||
kind: StatefulSet
|
|
||||||
metadata:
|
|
||||||
name: gitea-postgres-statefulset
|
|
||||||
namespace: gitea
|
|
||||||
spec:
|
|
||||||
selector:
|
|
||||||
matchLabels:
|
|
||||||
app: gitea-postgres
|
|
||||||
serviceName: gitea-postgres-service
|
|
||||||
replicas: 1
|
|
||||||
template:
|
|
||||||
metadata:
|
|
||||||
labels:
|
|
||||||
app: gitea-postgres
|
|
||||||
spec:
|
|
||||||
containers:
|
|
||||||
- name: gitea-postgres
|
|
||||||
image: postgres:14
|
|
||||||
env:
|
|
||||||
- name: POSTGRES_USER
|
|
||||||
valueFrom:
|
|
||||||
secretKeyRef:
|
|
||||||
name: gitea-secrets
|
|
||||||
key: GITEA__database__USER
|
|
||||||
- name: POSTGRES_PASSWORD
|
|
||||||
valueFrom:
|
|
||||||
secretKeyRef:
|
|
||||||
name: gitea-secrets
|
|
||||||
key: GITEA__database__PASSWD
|
|
||||||
- name: POSTGRES_DB
|
|
||||||
valueFrom:
|
|
||||||
secretKeyRef:
|
|
||||||
name: gitea-secrets
|
|
||||||
key: GITEA__database__USER
|
|
||||||
ports:
|
|
||||||
- containerPort: 5432
|
|
||||||
name: postgres
|
|
||||||
volumeMounts:
|
|
||||||
- name: postgres-data
|
|
||||||
mountPath: /var/lib/postgresql/data
|
|
||||||
volumeClaimTemplates:
|
|
||||||
- metadata:
|
|
||||||
name: postgres-data
|
|
||||||
spec:
|
|
||||||
accessModes: ["ReadWriteOnce"]
|
|
||||||
resources:
|
|
||||||
requests:
|
|
||||||
storage: 1Gi
|
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
apiVersion: v1
|
|
||||||
kind: Secret
|
|
||||||
metadata:
|
|
||||||
name: gitea-secrets
|
|
||||||
namespace: gitea
|
|
||||||
type: Opaque
|
|
||||||
stringData:
|
|
||||||
GITEA__database__USER: "gitea"
|
|
||||||
GITEA__database__PASSWD: "gitea"
|
|
||||||
@@ -1,36 +0,0 @@
|
|||||||
services:
|
|
||||||
glance:
|
|
||||||
container_name: glance
|
|
||||||
image: glanceapp/glance
|
|
||||||
restart: unless-stopped
|
|
||||||
volumes:
|
|
||||||
- ./config:/app/config:ro
|
|
||||||
- ./assets:/app/assets:ro
|
|
||||||
- /etc/localtime:/etc/localtime:ro
|
|
||||||
- /var/run/docker.sock:/var/run/docker.sock:ro
|
|
||||||
env_file: .env
|
|
||||||
labels:
|
|
||||||
- "traefik.enable=true"
|
|
||||||
- "traefik.docker.network=proxy"
|
|
||||||
- "traefik.services.glance.loadbalancer.server.port=8080"
|
|
||||||
|
|
||||||
# Prod Router
|
|
||||||
- "traefik.http.routers.glance.rule=(Host(`forust.xyz`) || Host(`www.forust.xyz`)) && PathPrefix(`/glance`)"
|
|
||||||
- "traefik.http.routers.glance.entrypoints=websecure"
|
|
||||||
- "traefik.http.routers.glance.priority=50"
|
|
||||||
- "traefik.http.routers.glance.tls.certresolver=letsencrypt"
|
|
||||||
# Local Router
|
|
||||||
- "traefik.http.routers.glance-local.rule=Host(`workstation.internal`) && PathPrefix(`/glance`)"
|
|
||||||
- "traefik.http.routers.glance-local.entrypoints=websecure"
|
|
||||||
- "traefik.http.routers.glance-local.priority=50"
|
|
||||||
- "traefik.http.routers.glance-local.tls=true"
|
|
||||||
# Dev Router
|
|
||||||
- "traefik.http.routers.glance-dev.rule=Host(`gigaforust.internal`) && PathPrefix(`/glance`)"
|
|
||||||
- "traefik.http.routers.glance-dev.entrypoints=websecure"
|
|
||||||
- "traefik.http.routers.glance-dev.priority=50"
|
|
||||||
- "traefik.http.routers.glance-dev.tls=true"
|
|
||||||
networks:
|
|
||||||
- proxy
|
|
||||||
networks:
|
|
||||||
proxy:
|
|
||||||
external: true
|
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
server:
|
|
||||||
assets-path: /app/assets
|
|
||||||
|
|
||||||
theme:
|
|
||||||
background-color: 240 21 15
|
|
||||||
contrast-multiplier: 1.2
|
|
||||||
primary-color: 217 92 83
|
|
||||||
positive-color: 115 54 76
|
|
||||||
negative-color: 347 70 65
|
|
||||||
custom-css-file: /assets/user.css
|
|
||||||
|
|
||||||
pages:
|
|
||||||
# It's not necessary to create a new file for each page and include it, you can simply
|
|
||||||
# put its contents here, though multiple pages are easier to manage when separated
|
|
||||||
- $include: home.yml
|
|
||||||
- $include: monitor.yml
|
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user