From 962bf7d359b46ad069c3df1d681bc1afb402b5de Mon Sep 17 00:00:00 2001 From: mr-forust Date: Fri, 14 Nov 2025 02:56:26 +0100 Subject: [PATCH 001/100] add: metube service and routers overall metube compose --- metube-docker-compose.yaml | 21 +++++++++++++++++++++ traefik/dynamic/services.yml | 16 ++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 metube-docker-compose.yaml diff --git a/metube-docker-compose.yaml b/metube-docker-compose.yaml new file mode 100644 index 0000000..e63da7b --- /dev/null +++ b/metube-docker-compose.yaml @@ -0,0 +1,21 @@ +services: + metube: + image: ghcr.io/alexta69/metube + container_name: metube + restart: unless-stopped + ports: + # - "8081:8081" + environment: + - DOWNLOAD_MODE=limited + - MAX_CONCURRENT_DOWNLOADS=3 + - DELETE_FILE_ON_TRASHCAN=true + - DEFAULT_OPTION_PLAYLIST_STRICT_MODE=true + volumes: + - /home/forust/Downloads/MeTube:/downloads + labels: + - traefik.enable=true + networks: + - traefik-proxy +networks: + traefik-proxy: + external: true \ No newline at end of file diff --git a/traefik/dynamic/services.yml b/traefik/dynamic/services.yml index d377a78..b0a80a4 100644 --- a/traefik/dynamic/services.yml +++ b/traefik/dynamic/services.yml @@ -11,6 +11,17 @@ http: - security-headers tls: {} # certResolver: letsencrypt + + # MeTube + metube: + rule: "Host(`metube.forust.xyz`)" + entryPoints: + - websecure + service: metube + middlewares: + - security-headers + tls: + certResolver: letsencrypt # Portainer portainer: @@ -166,6 +177,11 @@ http: loadBalancer: servers: - url: "http://gitea:3000" + # MeTube + metube: + loadBalancer: + servers: + - url: "http://metube:8081" serversTransports: insecureTransport: From 28e2de85e8caf77077c6e772783fb16936909b99 Mon Sep 17 00:00:00 2001 From: mr-forust Date: Fri, 14 Nov 2025 03:04:18 +0100 Subject: [PATCH 002/100] Metube auth --- metube-docker-compose.yaml | 2 +- traefik/dynamic/services.yml | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/metube-docker-compose.yaml b/metube-docker-compose.yaml index e63da7b..b6cb188 100644 --- a/metube-docker-compose.yaml +++ b/metube-docker-compose.yaml @@ -11,7 +11,7 @@ services: - DELETE_FILE_ON_TRASHCAN=true - DEFAULT_OPTION_PLAYLIST_STRICT_MODE=true volumes: - - /home/forust/Downloads/MeTube:/downloads + - ./volumes/MeTube_downloads:/downloads labels: - traefik.enable=true networks: diff --git a/traefik/dynamic/services.yml b/traefik/dynamic/services.yml index b0a80a4..2570573 100644 --- a/traefik/dynamic/services.yml +++ b/traefik/dynamic/services.yml @@ -11,7 +11,7 @@ http: - security-headers tls: {} # certResolver: letsencrypt - + # MeTube metube: rule: "Host(`metube.forust.xyz`)" @@ -19,6 +19,7 @@ http: - websecure service: metube middlewares: + - metube-auth - security-headers tls: certResolver: letsencrypt @@ -194,6 +195,13 @@ http: scheme: https permanent: true + # Metube Basic Auth + metube-auth: + basicAuth: + users: + - "vv:$2y$05$oO.mQXBZSJq7aDRJF1iorudafu9HsrJCEfKb6Cev8UlzWOF8kzlY6" + realm: "MeTube Access" + # Basic Auth для Traefik Dashboard auth: basicAuth: From aaae3a5c861837920b0c67ab8665295c8d9527a2 Mon Sep 17 00:00:00 2001 From: mr-forust Date: Fri, 14 Nov 2025 03:05:28 +0100 Subject: [PATCH 003/100] fixed ports at metube --- metube-docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metube-docker-compose.yaml b/metube-docker-compose.yaml index b6cb188..0a98a02 100644 --- a/metube-docker-compose.yaml +++ b/metube-docker-compose.yaml @@ -3,7 +3,7 @@ services: image: ghcr.io/alexta69/metube container_name: metube restart: unless-stopped - ports: + # ports: # - "8081:8081" environment: - DOWNLOAD_MODE=limited From 9af0c5d98f30d3521263df250a67c00d7ed3ac9b Mon Sep 17 00:00:00 2001 From: mr-forust Date: Sun, 16 Nov 2025 01:04:02 +0100 Subject: [PATCH 004/100] annoyed of traefik log err spam about glance --- traefik/dynamic/dynamic.yml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/traefik/dynamic/dynamic.yml b/traefik/dynamic/dynamic.yml index 81e8cc9..f8355c2 100644 --- a/traefik/dynamic/dynamic.yml +++ b/traefik/dynamic/dynamic.yml @@ -74,15 +74,15 @@ http: - security-headers tls: {} - # Glance (local only) - glance: - rule: "Host(`glance.workstation`)" - entryPoints: - - websecure - service: glance - middlewares: - - security-headers - tls: {} + # # Glance (local only) + # glance: + # rule: "Host(`glance.workstation`)" + # entryPoints: + # - websecure + # service: glance + # middlewares: + # - security-headers + # tls: {} # Watercrawl (local only) watercrawl: @@ -139,11 +139,11 @@ http: - url: "https://dockmon:443" serversTransport: insecureTransport - # Glance - glance: - loadBalancer: - servers: - - url: "http://glance:8080" + # # Glance + # glance: + # loadBalancer: + # servers: + # - url: "http://glance:8080" # Watercrawl watercrawl: From 219cfb6e85ca299f389fd106c8925422ce26b342 Mon Sep 17 00:00:00 2001 From: mr-forust Date: Sun, 16 Nov 2025 16:26:25 +0100 Subject: [PATCH 005/100] feat: metube module with basic auth --- metube-docker-compose.yaml => metube/compose.yaml | 2 +- traefik/dynamic/dynamic.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename metube-docker-compose.yaml => metube/compose.yaml (90%) diff --git a/metube-docker-compose.yaml b/metube/compose.yaml similarity index 90% rename from metube-docker-compose.yaml rename to metube/compose.yaml index 0a98a02..80f095b 100644 --- a/metube-docker-compose.yaml +++ b/metube/compose.yaml @@ -11,7 +11,7 @@ services: - DELETE_FILE_ON_TRASHCAN=true - DEFAULT_OPTION_PLAYLIST_STRICT_MODE=true volumes: - - ./volumes/MeTube_downloads:/downloads + - ./MeTube_downloads:/downloads labels: - traefik.enable=true networks: diff --git a/traefik/dynamic/dynamic.yml b/traefik/dynamic/dynamic.yml index 0fd8fbc..915856d 100644 --- a/traefik/dynamic/dynamic.yml +++ b/traefik/dynamic/dynamic.yml @@ -195,7 +195,7 @@ http: metube-auth: basicAuth: users: - - "vv:$2y$05$oO.mQXBZSJq7aDRJF1iorudafu9HsrJCEfKb6Cev8UlzWOF8kzlY6" + - "admin:$2y$05$3Q6gyLFW3NFNp4C6elnyfupntqB6VNB/tcIAeo8NEzvaqPxOjN0iC" realm: "MeTube Access" # Basic Auth Traefik Dashboard From f56dc9c009d6f523089afdd378d6edb083fbc34e Mon Sep 17 00:00:00 2001 From: mr-forust Date: Sun, 16 Nov 2025 21:07:42 +0100 Subject: [PATCH 006/100] fix: metube name for traefik --- metube/compose.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/metube/compose.yaml b/metube/compose.yaml index 80f095b..0d0d9b4 100644 --- a/metube/compose.yaml +++ b/metube/compose.yaml @@ -1,7 +1,7 @@ services: metube: image: ghcr.io/alexta69/metube - container_name: metube + # container_name: metube restart: unless-stopped # ports: # - "8081:8081" @@ -14,6 +14,8 @@ services: - ./MeTube_downloads:/downloads labels: - traefik.enable=true + - "traefik.docker.network=traefik-proxy" + networks: - traefik-proxy networks: From 75d928ff8ea0c9660dc2e7217cc9740ee413de0f Mon Sep 17 00:00:00 2001 From: mr-forust Date: Sun, 16 Nov 2025 21:10:58 +0100 Subject: [PATCH 007/100] chore: add metube downloads folder to gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index e4c5b93..81ad7bd 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,7 @@ n8n/n8n-node-data/* adguardhome/data/* dockmon/data/* portainer/portainer_data/* +metube/MeTube_downloads # Traefik files traefik/letsencrypt/acme.json From 9a810cf9b3b398795ddc2e0da3ced08fdb1c7cfc Mon Sep 17 00:00:00 2001 From: mr-forust Date: Sun, 16 Nov 2025 21:28:30 +0100 Subject: [PATCH 008/100] Add RU test user, remove let'sencrypt form metube Running metube under code subdomain --- traefik/dynamic/dynamic.yml | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/traefik/dynamic/dynamic.yml b/traefik/dynamic/dynamic.yml index 915856d..de1fc22 100644 --- a/traefik/dynamic/dynamic.yml +++ b/traefik/dynamic/dynamic.yml @@ -22,16 +22,26 @@ http: tls: {} # MeTube + # metube: + # rule: "Host(`metube.forust.xyz`)" + # entryPoints: + # - websecure + # service: metube + # middlewares: + # - metube-auth + # - security-headers + # tls: {} + + # MetubeCodename metube: - rule: "Host(`metube.forust.xyz`)" + rule: "Host(`sharpie.forust.xyz`)" entryPoints: - websecure service: metube middlewares: - metube-auth - security-headers - tls: - certResolver: letsencrypt + tls: {} # Portainer (public (account required)) portainer: @@ -203,6 +213,8 @@ http: basicAuth: users: - "admin:$$apr1$$57E60OUM$$JoYwmLr/uZKaTy6U4IQd9." + - "jeepik:$2y$05$Q8QqJwSjpycVYONyk4id/.rDFApW9oL8tycRMlGttNySsDv71Rnsu" + # - "vv:" realm: "Traefik Dashboard" # Basic Auth Dockmon From d877ba8f95723ce3c1069aa5e59906fe5cbaf0ad Mon Sep 17 00:00:00 2001 From: mr-forust Date: Sun, 16 Nov 2025 21:34:49 +0100 Subject: [PATCH 009/100] fix: new test credentials --- traefik/dynamic/dynamic.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/traefik/dynamic/dynamic.yml b/traefik/dynamic/dynamic.yml index de1fc22..7b479b7 100644 --- a/traefik/dynamic/dynamic.yml +++ b/traefik/dynamic/dynamic.yml @@ -206,6 +206,7 @@ http: basicAuth: users: - "admin:$2y$05$3Q6gyLFW3NFNp4C6elnyfupntqB6VNB/tcIAeo8NEzvaqPxOjN0iC" + - "jeepik:$2y$05$tIKrmhd7SYOe6yImRRAfpen7hpVdF8PnSbgBTCDZ.GI0Djx.Le2bq" realm: "MeTube Access" # Basic Auth Traefik Dashboard From 49a537798cb1f338caccd42f4c96292fb3fbf392 Mon Sep 17 00:00:00 2001 From: mr-forust Date: Sun, 16 Nov 2025 21:46:38 +0100 Subject: [PATCH 010/100] feat: metube original subdomen, removed test user --- traefik/dynamic/dynamic.yml | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/traefik/dynamic/dynamic.yml b/traefik/dynamic/dynamic.yml index 7b479b7..5e1c21c 100644 --- a/traefik/dynamic/dynamic.yml +++ b/traefik/dynamic/dynamic.yml @@ -22,19 +22,8 @@ http: tls: {} # MeTube - # metube: - # rule: "Host(`metube.forust.xyz`)" - # entryPoints: - # - websecure - # service: metube - # middlewares: - # - metube-auth - # - security-headers - # tls: {} - - # MetubeCodename metube: - rule: "Host(`sharpie.forust.xyz`)" + rule: "Host(`metube.forust.xyz`)" entryPoints: - websecure service: metube @@ -42,7 +31,7 @@ http: - metube-auth - security-headers tls: {} - + # Portainer (public (account required)) portainer: rule: "Host(`portainer.forust.xyz`)" From 46175d7c04b2967dcff9875bb013b7fa6dceca62 Mon Sep 17 00:00:00 2001 From: mr-forust Date: Sun, 16 Nov 2025 21:47:50 +0100 Subject: [PATCH 011/100] chore: remove jeepik from credentils --- traefik/dynamic/dynamic.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/traefik/dynamic/dynamic.yml b/traefik/dynamic/dynamic.yml index 5e1c21c..3fc6544 100644 --- a/traefik/dynamic/dynamic.yml +++ b/traefik/dynamic/dynamic.yml @@ -195,7 +195,7 @@ http: basicAuth: users: - "admin:$2y$05$3Q6gyLFW3NFNp4C6elnyfupntqB6VNB/tcIAeo8NEzvaqPxOjN0iC" - - "jeepik:$2y$05$tIKrmhd7SYOe6yImRRAfpen7hpVdF8PnSbgBTCDZ.GI0Djx.Le2bq" + # - "jeepik:$2y$05$tIKrmhd7SYOe6yImRRAfpen7hpVdF8PnSbgBTCDZ.GI0Djx.Le2bq" realm: "MeTube Access" # Basic Auth Traefik Dashboard @@ -203,7 +203,7 @@ http: basicAuth: users: - "admin:$$apr1$$57E60OUM$$JoYwmLr/uZKaTy6U4IQd9." - - "jeepik:$2y$05$Q8QqJwSjpycVYONyk4id/.rDFApW9oL8tycRMlGttNySsDv71Rnsu" + # - "jeepik:$2y$05$Q8QqJwSjpycVYONyk4id/.rDFApW9oL8tycRMlGttNySsDv71Rnsu" # - "vv:" realm: "Traefik Dashboard" From d25570e293c5ab29ed83c1c80f92489b7c0f317c Mon Sep 17 00:00:00 2001 From: mr-forust Date: Mon, 17 Nov 2025 18:42:38 +0100 Subject: [PATCH 012/100] chore: add replacements.txt to .gitignore for data security --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 81ad7bd..47d29d2 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,6 @@ traefik/certs/* .python-version .venv/ venv/ + +#DataSecurity +replacements.txt From 45021933a65d5cc580e07d1f25f9a8852eea8f95 Mon Sep 17 00:00:00 2001 From: mr-forust Date: Mon, 17 Nov 2025 19:05:03 +0100 Subject: [PATCH 013/100] feat: add LICENSE file with Mozilla Public License Version 2.0 --- dtek_notif/LICENSE | 373 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 373 insertions(+) create mode 100644 dtek_notif/LICENSE diff --git a/dtek_notif/LICENSE b/dtek_notif/LICENSE new file mode 100644 index 0000000..ee6256c --- /dev/null +++ b/dtek_notif/LICENSE @@ -0,0 +1,373 @@ +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. From 45b0859ab5143eed8878d0a815ed5800368e8077 Mon Sep 17 00:00:00 2001 From: mr-forust Date: Mon, 17 Nov 2025 21:04:22 +0100 Subject: [PATCH 014/100] feat: Add uptime-kuma module on uptime subd --- kuma/compose.yaml | 12 ++++++++++++ traefik/dynamic/dynamic.yml | 15 +++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 kuma/compose.yaml diff --git a/kuma/compose.yaml b/kuma/compose.yaml new file mode 100644 index 0000000..8d57eb1 --- /dev/null +++ b/kuma/compose.yaml @@ -0,0 +1,12 @@ +services: + uptime-kuma: + image: louislam/uptime-kuma:2 + restart: unless-stopped + volumes: + - ./data:/app/data + # ports: + # : + # - "3001:3001 + labels: + - "traefik.enable=true" + \ No newline at end of file diff --git a/traefik/dynamic/dynamic.yml b/traefik/dynamic/dynamic.yml index 3fc6544..a85af7e 100644 --- a/traefik/dynamic/dynamic.yml +++ b/traefik/dynamic/dynamic.yml @@ -42,6 +42,16 @@ http: - security-headers tls: {} + # Uptime Kuma + uptime-kuma: + rule: "Host(`uptime.forust.xyz`)" + entryPoints: + - websecure + service: uptime-kuma + middlewares: + - security-headers + tls: {} + # AdGuard Home (public (account required)) adguard: rule: "Host(`adguard.forust.xyz`)" @@ -143,6 +153,11 @@ http: servers: - url: "http://nextcloud-aio-apache:11000" + # Uptime Kuma + uptime-kuma: + loadBalancer: + servers: "http://uptime-kuma:3001" + # Dockmon dockmon: loadBalancer: From 2d895fe2bd7fbd5cd124a0d68a5c599c553c2e16 Mon Sep 17 00:00:00 2001 From: mr-forust Date: Mon, 17 Nov 2025 21:13:19 +0100 Subject: [PATCH 015/100] fix: traefik network for uptime-kuma --- kuma/compose.yaml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/kuma/compose.yaml b/kuma/compose.yaml index 8d57eb1..245cc56 100644 --- a/kuma/compose.yaml +++ b/kuma/compose.yaml @@ -4,9 +4,15 @@ services: restart: unless-stopped volumes: - ./data:/app/data - # ports: + ports: # : - # - "3001:3001 + - "3001:3001" labels: - "traefik.enable=true" + - "traefik.docker.network=traefik-proxy" + networks: + - traefik-proxy +networks: + traefik-proxy: + external: true \ No newline at end of file From 0f75fe02c2607f52a7ee318fdf0b1fe70b419b20 Mon Sep 17 00:00:00 2001 From: mr-forust Date: Mon, 17 Nov 2025 21:45:51 +0100 Subject: [PATCH 016/100] refactor: Move uptime kuma to respectful dir Add container name for uptime-kuma --- {kuma => uptime-kuma}/compose.yaml | 1 + 1 file changed, 1 insertion(+) rename {kuma => uptime-kuma}/compose.yaml (92%) diff --git a/kuma/compose.yaml b/uptime-kuma/compose.yaml similarity index 92% rename from kuma/compose.yaml rename to uptime-kuma/compose.yaml index 245cc56..98662f4 100644 --- a/kuma/compose.yaml +++ b/uptime-kuma/compose.yaml @@ -3,6 +3,7 @@ services: image: louislam/uptime-kuma:2 restart: unless-stopped volumes: + container_name: uptime-kuma - ./data:/app/data ports: # : From e7d21bfe90f8eae8b84fc08f3d8b14fc6c0fd980 Mon Sep 17 00:00:00 2001 From: mr-forust Date: Mon, 17 Nov 2025 21:50:14 +0100 Subject: [PATCH 017/100] fix: update Uptime Kuma host rule in dynamic configuration --- traefik/dynamic/dynamic.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/traefik/dynamic/dynamic.yml b/traefik/dynamic/dynamic.yml index a85af7e..89d021f 100644 --- a/traefik/dynamic/dynamic.yml +++ b/traefik/dynamic/dynamic.yml @@ -44,12 +44,12 @@ http: # Uptime Kuma uptime-kuma: - rule: "Host(`uptime.forust.xyz`)" + rule: "Host(`uptime-kuma.forust.xyz`)" entryPoints: - websecure service: uptime-kuma - middlewares: - - security-headers + # middlewares: + # - security-headers tls: {} # AdGuard Home (public (account required)) From b4bce72611883895e9ef49eb96ed709cf8104379 Mon Sep 17 00:00:00 2001 From: mr-forust Date: Mon, 17 Nov 2025 21:54:24 +0100 Subject: [PATCH 018/100] chore: Add uptime-kuma files to .gitignore, fixed gitea-db gitignore --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 47d29d2..d532ac9 100644 --- a/.gitignore +++ b/.gitignore @@ -8,7 +8,7 @@ sync.ffs_lock .env.forust # Volumes and data directories -gitea/gitea-db/* +gitea/gitea-db/ gitea/gitea-data/* n8n/n8n-data/* n8n/n8n-node-data/* @@ -16,6 +16,7 @@ adguardhome/data/* dockmon/data/* portainer/portainer_data/* metube/MeTube_downloads +uptime-kuma/data/ # Traefik files traefik/letsencrypt/acme.json From b20c01226840ccd6d8028188ea4b83bcc10a1dd8 Mon Sep 17 00:00:00 2001 From: mr-forust Date: Mon, 17 Nov 2025 21:54:24 +0100 Subject: [PATCH 019/100] chore: Add uptime-kuma files to .gitignore, fixed gitea-db gitignore --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 47d29d2..d532ac9 100644 --- a/.gitignore +++ b/.gitignore @@ -8,7 +8,7 @@ sync.ffs_lock .env.forust # Volumes and data directories -gitea/gitea-db/* +gitea/gitea-db/ gitea/gitea-data/* n8n/n8n-data/* n8n/n8n-node-data/* @@ -16,6 +16,7 @@ adguardhome/data/* dockmon/data/* portainer/portainer_data/* metube/MeTube_downloads +uptime-kuma/data/ # Traefik files traefik/letsencrypt/acme.json From 1f9a1c2c621cac02ef2c924a1dc30eb41b98f8a0 Mon Sep 17 00:00:00 2001 From: mr-forust Date: Mon, 17 Nov 2025 22:16:27 +0100 Subject: [PATCH 020/100] fix: Uptime kuma on local traefik --- traefik/dynamic/dynamic.yml | 26 +++++++++++++------------- uptime-kuma/compose.yaml | 10 +++++++--- 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/traefik/dynamic/dynamic.yml b/traefik/dynamic/dynamic.yml index 89d021f..4830bb3 100644 --- a/traefik/dynamic/dynamic.yml +++ b/traefik/dynamic/dynamic.yml @@ -42,15 +42,15 @@ http: - security-headers tls: {} - # Uptime Kuma - uptime-kuma: - rule: "Host(`uptime-kuma.forust.xyz`)" - entryPoints: - - websecure - service: uptime-kuma - # middlewares: - # - security-headers - tls: {} + # # Uptime Kuma + # uptime-kuma: + # rule: "Host(`uptime-kuma.forust.xyz`)" + # entryPoints: + # - websecure + # service: uptime-kuma + # # middlewares: + # # - security-headers + # tls: {} # AdGuard Home (public (account required)) adguard: @@ -153,10 +153,10 @@ http: servers: - url: "http://nextcloud-aio-apache:11000" - # Uptime Kuma - uptime-kuma: - loadBalancer: - servers: "http://uptime-kuma:3001" + # # Uptime Kuma + # uptime-kuma: + # loadBalancer: + # servers: "http://uptime-kuma:3001" # Dockmon dockmon: diff --git a/uptime-kuma/compose.yaml b/uptime-kuma/compose.yaml index 98662f4..df6b935 100644 --- a/uptime-kuma/compose.yaml +++ b/uptime-kuma/compose.yaml @@ -2,15 +2,19 @@ services: uptime-kuma: image: louislam/uptime-kuma:2 restart: unless-stopped - volumes: container_name: uptime-kuma + volumes: - ./data:/app/data ports: # : - "3001:3001" labels: - - "traefik.enable=true" - - "traefik.docker.network=traefik-proxy" + - "traefik.enable=true" + - "traefik.http.routers.uptime-kuma.rule=Host(`uptime-kuma.gigaforust`)" + - "traefik.http.routers.uptime-kuma.entrypoints=websecure" + - "traefik.http.routers.uptime-kuma.tls=true" + # - "traefik.http.routers.uptime-kuma.tls.certresolver=myresolver" + - "traefik.http.services.uptime-kuma.loadBalancer.server.port=3001" networks: - traefik-proxy networks: From 6f8b7809064b0eaab3cd1a7af1e3a7635ef3029d Mon Sep 17 00:00:00 2001 From: mr-forust Date: Mon, 17 Nov 2025 22:17:24 +0100 Subject: [PATCH 021/100] chore: updated hostame from test --- uptime-kuma/compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uptime-kuma/compose.yaml b/uptime-kuma/compose.yaml index df6b935..39f4db6 100644 --- a/uptime-kuma/compose.yaml +++ b/uptime-kuma/compose.yaml @@ -10,7 +10,7 @@ services: - "3001:3001" labels: - "traefik.enable=true" - - "traefik.http.routers.uptime-kuma.rule=Host(`uptime-kuma.gigaforust`)" + - "traefik.http.routers.uptime-kuma.rule=Host(`uptime-kuma.forust.xyz`)" - "traefik.http.routers.uptime-kuma.entrypoints=websecure" - "traefik.http.routers.uptime-kuma.tls=true" # - "traefik.http.routers.uptime-kuma.tls.certresolver=myresolver" From 4fe36be5eabe77a511451d35e590df5211920b7b Mon Sep 17 00:00:00 2001 From: mr-forust Date: Mon, 17 Nov 2025 21:50:14 +0100 Subject: [PATCH 022/100] fix: update Uptime Kuma host rule in dynamic configuration --- traefik/dynamic/dynamic.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/traefik/dynamic/dynamic.yml b/traefik/dynamic/dynamic.yml index a85af7e..89d021f 100644 --- a/traefik/dynamic/dynamic.yml +++ b/traefik/dynamic/dynamic.yml @@ -44,12 +44,12 @@ http: # Uptime Kuma uptime-kuma: - rule: "Host(`uptime.forust.xyz`)" + rule: "Host(`uptime-kuma.forust.xyz`)" entryPoints: - websecure service: uptime-kuma - middlewares: - - security-headers + # middlewares: + # - security-headers tls: {} # AdGuard Home (public (account required)) From ed20fb6e2a7a5c7dfa6a4107be8fe289cc49cb11 Mon Sep 17 00:00:00 2001 From: mr-forust Date: Mon, 17 Nov 2025 22:16:27 +0100 Subject: [PATCH 023/100] fix: Uptime kuma on local traefik --- traefik/dynamic/dynamic.yml | 26 +++++++++++++------------- uptime-kuma/compose.yaml | 10 +++++++--- 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/traefik/dynamic/dynamic.yml b/traefik/dynamic/dynamic.yml index 89d021f..4830bb3 100644 --- a/traefik/dynamic/dynamic.yml +++ b/traefik/dynamic/dynamic.yml @@ -42,15 +42,15 @@ http: - security-headers tls: {} - # Uptime Kuma - uptime-kuma: - rule: "Host(`uptime-kuma.forust.xyz`)" - entryPoints: - - websecure - service: uptime-kuma - # middlewares: - # - security-headers - tls: {} + # # Uptime Kuma + # uptime-kuma: + # rule: "Host(`uptime-kuma.forust.xyz`)" + # entryPoints: + # - websecure + # service: uptime-kuma + # # middlewares: + # # - security-headers + # tls: {} # AdGuard Home (public (account required)) adguard: @@ -153,10 +153,10 @@ http: servers: - url: "http://nextcloud-aio-apache:11000" - # Uptime Kuma - uptime-kuma: - loadBalancer: - servers: "http://uptime-kuma:3001" + # # Uptime Kuma + # uptime-kuma: + # loadBalancer: + # servers: "http://uptime-kuma:3001" # Dockmon dockmon: diff --git a/uptime-kuma/compose.yaml b/uptime-kuma/compose.yaml index 98662f4..df6b935 100644 --- a/uptime-kuma/compose.yaml +++ b/uptime-kuma/compose.yaml @@ -2,15 +2,19 @@ services: uptime-kuma: image: louislam/uptime-kuma:2 restart: unless-stopped - volumes: container_name: uptime-kuma + volumes: - ./data:/app/data ports: # : - "3001:3001" labels: - - "traefik.enable=true" - - "traefik.docker.network=traefik-proxy" + - "traefik.enable=true" + - "traefik.http.routers.uptime-kuma.rule=Host(`uptime-kuma.gigaforust`)" + - "traefik.http.routers.uptime-kuma.entrypoints=websecure" + - "traefik.http.routers.uptime-kuma.tls=true" + # - "traefik.http.routers.uptime-kuma.tls.certresolver=myresolver" + - "traefik.http.services.uptime-kuma.loadBalancer.server.port=3001" networks: - traefik-proxy networks: From 13340b6ddcdb5e6068b59f2bef0a947b9a9be4b6 Mon Sep 17 00:00:00 2001 From: mr-forust Date: Mon, 17 Nov 2025 22:17:24 +0100 Subject: [PATCH 024/100] chore: updated hostame from test --- uptime-kuma/compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uptime-kuma/compose.yaml b/uptime-kuma/compose.yaml index df6b935..39f4db6 100644 --- a/uptime-kuma/compose.yaml +++ b/uptime-kuma/compose.yaml @@ -10,7 +10,7 @@ services: - "3001:3001" labels: - "traefik.enable=true" - - "traefik.http.routers.uptime-kuma.rule=Host(`uptime-kuma.gigaforust`)" + - "traefik.http.routers.uptime-kuma.rule=Host(`uptime-kuma.forust.xyz`)" - "traefik.http.routers.uptime-kuma.entrypoints=websecure" - "traefik.http.routers.uptime-kuma.tls=true" # - "traefik.http.routers.uptime-kuma.tls.certresolver=myresolver" From 319cf0ea1fd5ed70cb97a654646b6fd4aab4fd27 Mon Sep 17 00:00:00 2001 From: mr-forust Date: Tue, 18 Nov 2025 02:12:48 +0100 Subject: [PATCH 025/100] feat: Add demo landing page --- homepage/Dockerfile | 5 +++ homepage/compose.yaml | 14 +++++++ homepage/files/index.html | 77 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 96 insertions(+) create mode 100644 homepage/Dockerfile create mode 100644 homepage/compose.yaml create mode 100644 homepage/files/index.html diff --git a/homepage/Dockerfile b/homepage/Dockerfile new file mode 100644 index 0000000..f60f38d --- /dev/null +++ b/homepage/Dockerfile @@ -0,0 +1,5 @@ +FROM nginx:alpine:latest +WORKDIR /usr/share/nginx/html +COPY . . +CMD [ "nginx", "-g", "daemon off;" ] +EXPOSE 80 diff --git a/homepage/compose.yaml b/homepage/compose.yaml new file mode 100644 index 0000000..b076289 --- /dev/null +++ b/homepage/compose.yaml @@ -0,0 +1,14 @@ +services: + homepage: + container_name: landing + volumes: + - ./homepage:/usr/share/nginx/html:ro + ports: + - "8080:80" + restart: always + networks: + - traefik-proxy + +networks: + traefik-proxy: + external: true \ No newline at end of file diff --git a/homepage/files/index.html b/homepage/files/index.html new file mode 100644 index 0000000..243092e --- /dev/null +++ b/homepage/files/index.html @@ -0,0 +1,77 @@ + + + + + + forust — terminal landing + + + + + +
+ +
+ forust@home:~$ whoami +
+
+
+ +
+

>> OSINT / Pentesting

+

>> Linux enjoyer

+

>> self-hosting & automation

+

> projects: soon™

+
+ + + + + From 5b05207985c3f52a76963c398672352ea57fdc35 Mon Sep 17 00:00:00 2001 From: mr-forust Date: Tue, 18 Nov 2025 02:30:42 +0100 Subject: [PATCH 026/100] refactor: Move uptime-kuma traefik labels to dynamic.yaml --- traefik/dynamic/dynamic.yml | 25 ++++++++++++------------- uptime-kuma/compose.yaml | 8 ++++---- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/traefik/dynamic/dynamic.yml b/traefik/dynamic/dynamic.yml index 4830bb3..233316e 100644 --- a/traefik/dynamic/dynamic.yml +++ b/traefik/dynamic/dynamic.yml @@ -42,15 +42,13 @@ http: - security-headers tls: {} - # # Uptime Kuma - # uptime-kuma: - # rule: "Host(`uptime-kuma.forust.xyz`)" - # entryPoints: - # - websecure - # service: uptime-kuma - # # middlewares: - # # - security-headers - # tls: {} + # Uptime Kuma + uptime-kuma: + rule: "Host(`uptime.forust.xyz`)" + entryPoints: + - websecure + service: uptime-kuma + tls: {} # AdGuard Home (public (account required)) adguard: @@ -153,10 +151,11 @@ http: servers: - url: "http://nextcloud-aio-apache:11000" - # # Uptime Kuma - # uptime-kuma: - # loadBalancer: - # servers: "http://uptime-kuma:3001" + # Uptime Kuma + uptime-kuma: + loadBalancer: + servers: + - url: "http://uptime-kuma:3001" # Dockmon dockmon: diff --git a/uptime-kuma/compose.yaml b/uptime-kuma/compose.yaml index 39f4db6..b91586f 100644 --- a/uptime-kuma/compose.yaml +++ b/uptime-kuma/compose.yaml @@ -10,11 +10,11 @@ services: - "3001:3001" labels: - "traefik.enable=true" - - "traefik.http.routers.uptime-kuma.rule=Host(`uptime-kuma.forust.xyz`)" - - "traefik.http.routers.uptime-kuma.entrypoints=websecure" - - "traefik.http.routers.uptime-kuma.tls=true" + # - "traefik.http.routers.uptime-kuma.rule=Host(`uptime-kuma.forust.xyz`)" + # - "traefik.http.routers.uptime-kuma.entrypoints=websecure" + # - "traefik.http.routers.uptime-kuma.tls=true" # - "traefik.http.routers.uptime-kuma.tls.certresolver=myresolver" - - "traefik.http.services.uptime-kuma.loadBalancer.server.port=3001" + # - "traefik.http.services.uptime-kuma.loadBalancer.server.port=3001" networks: - traefik-proxy networks: From 09a05a5ad5b4ca5cf75418de75736ba2f236401f Mon Sep 17 00:00:00 2001 From: mr-forust Date: Tue, 18 Nov 2025 02:34:55 +0100 Subject: [PATCH 027/100] chore: remove commented docker labels --- uptime-kuma/compose.yaml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/uptime-kuma/compose.yaml b/uptime-kuma/compose.yaml index b91586f..d9d97fe 100644 --- a/uptime-kuma/compose.yaml +++ b/uptime-kuma/compose.yaml @@ -10,11 +10,6 @@ services: - "3001:3001" labels: - "traefik.enable=true" - # - "traefik.http.routers.uptime-kuma.rule=Host(`uptime-kuma.forust.xyz`)" - # - "traefik.http.routers.uptime-kuma.entrypoints=websecure" - # - "traefik.http.routers.uptime-kuma.tls=true" - # - "traefik.http.routers.uptime-kuma.tls.certresolver=myresolver" - # - "traefik.http.services.uptime-kuma.loadBalancer.server.port=3001" networks: - traefik-proxy networks: From b238e9ccf2d0166cc2c266a091c78efb08ff5cc0 Mon Sep 17 00:00:00 2001 From: mr-forust Date: Tue, 18 Nov 2025 03:23:57 +0100 Subject: [PATCH 028/100] chore: Env example --- .env.example | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 .env.example diff --git a/.env.example b/.env.example new file mode 100644 index 0000000..95493ef --- /dev/null +++ b/.env.example @@ -0,0 +1,70 @@ + + +#=============================== +# Basic auth credentials +#=============================== +# +# +# +#=============================== + +#=============================================== +#BEGIN TRAEFIK ENVIRONMENT VARIABLES =========== +#=============================================== + +#=============================================== +# 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 +#=============================================== \ No newline at end of file From 9bb5f070e3bd20b0e4cd1e5865c4c22001c51582 Mon Sep 17 00:00:00 2001 From: mr-forust Date: Tue, 18 Nov 2025 03:34:34 +0100 Subject: [PATCH 029/100] chore: gitignore for termix --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index d532ac9..7d5042c 100644 --- a/.gitignore +++ b/.gitignore @@ -17,6 +17,7 @@ dockmon/data/* portainer/portainer_data/* metube/MeTube_downloads uptime-kuma/data/ +termix/termix-data/* # Traefik files traefik/letsencrypt/acme.json From ed1b41ca1dc5b325287413ef77ec98349fc39234 Mon Sep 17 00:00:00 2001 From: mr-forust Date: Tue, 18 Nov 2025 03:34:55 +0100 Subject: [PATCH 030/100] feat: Add termix ssh manager, traefik routers --- termix/compose.yaml | 21 +++++++++++++++++++++ traefik/dynamic/dynamic.yml | 16 ++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 termix/compose.yaml diff --git a/termix/compose.yaml b/termix/compose.yaml new file mode 100644 index 0000000..241fa19 --- /dev/null +++ b/termix/compose.yaml @@ -0,0 +1,21 @@ +services: + termix: + image: ghcr.io/lukegus/termix:latest + container_name: termix + restart: unless-stopped + ports: + - "3331:8080" + volumes: + - ./termix-data:/app/data + environment: + PORT: "8080" + networks: + - traefik-proxy + +networks: + traefik-proxy: + external: true + +volumes: + termix-data: + driver: local \ No newline at end of file diff --git a/traefik/dynamic/dynamic.yml b/traefik/dynamic/dynamic.yml index 233316e..dc39b9b 100644 --- a/traefik/dynamic/dynamic.yml +++ b/traefik/dynamic/dynamic.yml @@ -21,6 +21,16 @@ http: - security-headers tls: {} + # Termix (public (account required)) + termix: + rule: "Host(`termix.forust.xyz`)" + entryPoints: + - websecure + service: termix + middlewares: + - security-headers + tls: {} + # MeTube metube: rule: "Host(`metube.forust.xyz`)" @@ -157,6 +167,12 @@ http: servers: - url: "http://uptime-kuma:3001" + # Termix + termix: + loadBalancer: + servers: + - url: "http://termix:8080" + # Dockmon dockmon: loadBalancer: From 155bb8d02b19beb1bca57106299cc4806015c2fd Mon Sep 17 00:00:00 2001 From: mr-forust Date: Tue, 18 Nov 2025 14:41:41 +0100 Subject: [PATCH 031/100] refactor: Sepparate traefik services --- traefik/dynamic/dynamic.bak | 328 +++++++++++++++++++++++++++++++++++ traefik/dynamic/dynamic.yml | 75 -------- traefik/dynamic/services.yml | 75 ++++++++ 3 files changed, 403 insertions(+), 75 deletions(-) create mode 100644 traefik/dynamic/dynamic.bak create mode 100644 traefik/dynamic/services.yml diff --git a/traefik/dynamic/dynamic.bak b/traefik/dynamic/dynamic.bak new file mode 100644 index 0000000..dc39b9b --- /dev/null +++ b/traefik/dynamic/dynamic.bak @@ -0,0 +1,328 @@ +http: + routers: + # Traefik Dashboard (ADMIN, local only) + traefik-dashboard: + rule: "Host(`traefik.workstation`)" + entryPoints: + - websecure + service: api@internal + middlewares: + # - auth + - security-headers + tls: {} + + # Nextcloud AIO Interface (ADMIN, local is better) + nextcloud-aio: + rule: "Host(`nextcloud-aio.workstation`)" + entryPoints: + - websecure + service: nextcloud-aio + middlewares: + - security-headers + tls: {} + + # Termix (public (account required)) + termix: + rule: "Host(`termix.forust.xyz`)" + entryPoints: + - websecure + service: termix + middlewares: + - security-headers + tls: {} + + # MeTube + metube: + rule: "Host(`metube.forust.xyz`)" + entryPoints: + - websecure + service: metube + middlewares: + - metube-auth + - security-headers + tls: {} + + # Portainer (public (account required)) + portainer: + rule: "Host(`portainer.forust.xyz`)" + entryPoints: + - websecure + service: portainer + middlewares: + - security-headers + tls: {} + + # Uptime Kuma + uptime-kuma: + rule: "Host(`uptime.forust.xyz`)" + entryPoints: + - websecure + service: uptime-kuma + tls: {} + + # AdGuard Home (public (account required)) + adguard: + rule: "Host(`adguard.forust.xyz`)" + entryPoints: + - websecure + service: adguard + middlewares: + - security-headers + tls: {} + + + # Nextcloud Main (public (account required)) + nextcloud: + rule: "Host(`nextcloud.forust.xyz`)" + entrypoints: + - websecure + service: nextcloud + middlewares: + - nextcloud-chain + tls: {} + + # Dockmon (public (account required)) + dockmon: + rule: "Host(`dockmon.forust.xyz`)" + entryPoints: + - websecure + service: dockmon + middlewares: + # - dockmon-auth + - security-headers + tls: {} + + # Gitea (public (account required)) + gitea: + rule: "Host(`gitea.forust.xyz`)" + entryPoints: + - websecure + - ssh + service: gitea + middlewares: + - security-headers + tls: {} + + # # Glance (local only) + # glance: + # rule: "Host(`glance.workstation`)" + # entryPoints: + # - websecure + # service: glance + # middlewares: + # - security-headers + # tls: {} + + # Watercrawl (local only) + watercrawl: + rule: "Host(`watercrawl.workstation`)" + entryPoints: + - websecure + service: watercrawl + middlewares: + - security-headers + tls: {} + + # N8N (local only) + n8n: + rule: "Host(`n8n.workstation`)" + entryPoints: + - websecure + service: n8n + middlewares: + - security-headers + tls: {} + + + services: + # Portainer + portainer: + loadBalancer: + servers: + - url: "https://portainer:9443" + serversTransport: insecureTransport + + # AdGuard Home + adguard: + loadBalancer: + servers: + - url: "http://adguardhome:3000" + + # Nextcloud AIO Interface + nextcloud-aio: + loadBalancer: + servers: + - url: "https://nextcloud-aio-mastercontainer:8080" + serversTransport: insecureTransport + + # Nextcloud Main + nextcloud: + loadBalancer: + servers: + - url: "http://nextcloud-aio-apache:11000" + + # Uptime Kuma + uptime-kuma: + loadBalancer: + servers: + - url: "http://uptime-kuma:3001" + + # Termix + termix: + loadBalancer: + servers: + - url: "http://termix:8080" + + # Dockmon + dockmon: + loadBalancer: + servers: + - url: "https://dockmon:443" + serversTransport: insecureTransport + + # # Glance + # glance: + # loadBalancer: + # servers: + # - url: "http://glance:8080" + + # Watercrawl + watercrawl: + loadBalancer: + servers: + - url: "http://nginx:80" + + # N8N + n8n: + loadBalancer: + servers: + - url: "http://n8n:5678" + + # Gitea + gitea: + loadBalancer: + servers: + - url: "http://gitea:3000" + # MeTube + metube: + loadBalancer: + servers: + - url: "http://metube:8081" + + serversTransports: + insecureTransport: + insecureSkipVerify: true + + middlewares: + # HTTPS Redirect + redirect-https: + redirectScheme: + scheme: https + permanent: true + + # Metube Basic Auth + metube-auth: + basicAuth: + users: + - "admin:$2y$05$3Q6gyLFW3NFNp4C6elnyfupntqB6VNB/tcIAeo8NEzvaqPxOjN0iC" + # - "jeepik:$2y$05$tIKrmhd7SYOe6yImRRAfpen7hpVdF8PnSbgBTCDZ.GI0Djx.Le2bq" + realm: "MeTube Access" + + # Basic Auth Traefik Dashboard + auth: + basicAuth: + users: + - "admin:$$apr1$$57E60OUM$$JoYwmLr/uZKaTy6U4IQd9." + # - "jeepik:$2y$05$Q8QqJwSjpycVYONyk4id/.rDFApW9oL8tycRMlGttNySsDv71Rnsu" + # - "vv:" + realm: "Traefik Dashboard" + + # Basic Auth Dockmon + dockmon-auth: + basicAuth: + users: + - "admin:$$apr1$$.bCpmIHl$$dxPEKdw5aZLAwo8wUz52b1" + realm: "Dockmon Access" + + # Cloudflare IP Whitelist + cloudflare-ipwhitelist: + ipWhiteList: + sourceRange: + - "173.245.48.0/20" + - "103.21.244.0/22" + - "103.22.200.0/22" + - "103.31.4.0/22" + - "141.101.64.0/18" + - "108.162.192.0/18" + - "190.93.240.0/20" + - "188.114.96.0/20" + - "197.234.240.0/22" + - "198.41.128.0/17" + - "162.158.0.0/15" + - "104.16.0.0/13" + - "104.24.0.0/14" + - "172.64.0.0/13" + - "131.0.72.0/22" + + # Security Headers + security-headers: + headers: + browserXssFilter: true + contentTypeNosniff: true + forceSTSHeader: true + stsIncludeSubdomains: true + stsPreload: true + stsSeconds: 31536000 + customFrameOptionsValue: "SAMEORIGIN" + customResponseHeaders: + X-Content-Type-Options: "nosniff" + Referrer-Policy: "strict-origin-when-cross-origin" + + # Nextcloud specific headers + nextcloud-secure-headers: + headers: + hostsProxyHeaders: + - "X-Forwarded-Host" + - "X-Forwarded-Proto" + referrerPolicy: "same-origin" + customFrameOptionsValue: "SAMEORIGIN" + + # Rate limiting + rate-limit: + rateLimit: + average: 100 + burst: 50 + period: 1m + + # Nextcloud chain + nextcloud-chain: + chain: + middlewares: + - nextcloud-secure-headers + - security-headers + +# TLS Configuration +tls: + certificates: + # Cloudflare Origin CA *.forust.xyz + - certFile: /certs/cloudflare.pem + keyFile: /certs/cloudflare.key + # Local certificate + - certFile: /certs/workstation+1.pem + keyFile: /certs/workstation+1-key.pem + + stores: + default: + defaultCertificate: + # Fallback local certificate + certFile: /certs/workstation+1.pem + keyFile: /certs/workstation+1-key.pem + + options: + default: + minVersion: VersionTLS12 + sniStrict: true + cipherSuites: + - TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 + - TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 + - TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305 \ No newline at end of file diff --git a/traefik/dynamic/dynamic.yml b/traefik/dynamic/dynamic.yml index dc39b9b..f3681dc 100644 --- a/traefik/dynamic/dynamic.yml +++ b/traefik/dynamic/dynamic.yml @@ -134,81 +134,6 @@ http: tls: {} - services: - # Portainer - portainer: - loadBalancer: - servers: - - url: "https://portainer:9443" - serversTransport: insecureTransport - - # AdGuard Home - adguard: - loadBalancer: - servers: - - url: "http://adguardhome:3000" - - # Nextcloud AIO Interface - nextcloud-aio: - loadBalancer: - servers: - - url: "https://nextcloud-aio-mastercontainer:8080" - serversTransport: insecureTransport - - # Nextcloud Main - nextcloud: - loadBalancer: - servers: - - url: "http://nextcloud-aio-apache:11000" - - # Uptime Kuma - uptime-kuma: - loadBalancer: - servers: - - url: "http://uptime-kuma:3001" - - # Termix - termix: - loadBalancer: - servers: - - url: "http://termix:8080" - - # Dockmon - dockmon: - loadBalancer: - servers: - - url: "https://dockmon:443" - serversTransport: insecureTransport - - # # Glance - # glance: - # loadBalancer: - # servers: - # - url: "http://glance:8080" - - # Watercrawl - watercrawl: - loadBalancer: - servers: - - url: "http://nginx:80" - - # N8N - n8n: - loadBalancer: - servers: - - url: "http://n8n:5678" - - # Gitea - gitea: - loadBalancer: - servers: - - url: "http://gitea:3000" - # MeTube - metube: - loadBalancer: - servers: - - url: "http://metube:8081" - serversTransports: insecureTransport: insecureSkipVerify: true diff --git a/traefik/dynamic/services.yml b/traefik/dynamic/services.yml new file mode 100644 index 0000000..c53d2ac --- /dev/null +++ b/traefik/dynamic/services.yml @@ -0,0 +1,75 @@ +http: + services: + # Portainer + portainer: + loadBalancer: + servers: + - url: "https://portainer:9443" + serversTransport: insecureTransport + + # AdGuard Home + adguard: + loadBalancer: + servers: + - url: "http://adguardhome:3000" + + # Nextcloud AIO Interface + nextcloud-aio: + loadBalancer: + servers: + - url: "https://nextcloud-aio-mastercontainer:8080" + serversTransport: insecureTransport + + # Nextcloud Main + nextcloud: + loadBalancer: + servers: + - url: "http://nextcloud-aio-apache:11000" + + # Uptime Kuma + uptime-kuma: + loadBalancer: + servers: + - url: "http://uptime-kuma:3001" + + # Termix + termix: + loadBalancer: + servers: + - url: "http://termix:8080" + + # Dockmon + dockmon: + loadBalancer: + servers: + - url: "https://dockmon:443" + serversTransport: insecureTransport + + # # Glance + # glance: + # loadBalancer: + # servers: + # - url: "http://glance:8080" + + # Watercrawl + watercrawl: + loadBalancer: + servers: + - url: "http://nginx:80" + + # N8N + n8n: + loadBalancer: + servers: + - url: "http://n8n:5678" + + # Gitea + gitea: + loadBalancer: + servers: + - url: "http://gitea:3000" + # MeTube + metube: + loadBalancer: + servers: + - url: "http://metube:8081" From 2c2474165b861b1f17c450aab27d11a9d305c9eb Mon Sep 17 00:00:00 2001 From: mr-forust Date: Tue, 18 Nov 2025 14:43:49 +0100 Subject: [PATCH 032/100] refactor: Sepparate traefik tls configuration --- traefik/dynamic/dynamic.yml | 28 +--------------------------- traefik/dynamic/tls.yml | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 27 deletions(-) create mode 100644 traefik/dynamic/tls.yml diff --git a/traefik/dynamic/dynamic.yml b/traefik/dynamic/dynamic.yml index f3681dc..018fdb0 100644 --- a/traefik/dynamic/dynamic.yml +++ b/traefik/dynamic/dynamic.yml @@ -224,30 +224,4 @@ http: chain: middlewares: - nextcloud-secure-headers - - security-headers - -# TLS Configuration -tls: - certificates: - # Cloudflare Origin CA *.forust.xyz - - certFile: /certs/cloudflare.pem - keyFile: /certs/cloudflare.key - # Local certificate - - certFile: /certs/workstation+1.pem - keyFile: /certs/workstation+1-key.pem - - stores: - default: - defaultCertificate: - # Fallback local certificate - certFile: /certs/workstation+1.pem - keyFile: /certs/workstation+1-key.pem - - options: - default: - minVersion: VersionTLS12 - sniStrict: true - cipherSuites: - - TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 - - TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 - - TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305 \ No newline at end of file + - security-headers \ No newline at end of file diff --git a/traefik/dynamic/tls.yml b/traefik/dynamic/tls.yml new file mode 100644 index 0000000..83ab0ce --- /dev/null +++ b/traefik/dynamic/tls.yml @@ -0,0 +1,25 @@ +# TLS Configuration +tls: + certificates: + # Cloudflare Origin CA *.forust.xyz + - certFile: /certs/cloudflare.pem + keyFile: /certs/cloudflare.key + # Local certificate + - certFile: /certs/workstation+1.pem + keyFile: /certs/workstation+1-key.pem + + stores: + default: + defaultCertificate: + # Fallback local certificate + certFile: /certs/workstation+1.pem + keyFile: /certs/workstation+1-key.pem + + options: + default: + minVersion: VersionTLS12 + sniStrict: true + cipherSuites: + - TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 + - TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 + - TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305 \ No newline at end of file From b2ae170ea0fdbe8b45be21726a3a58c04c2ded9b Mon Sep 17 00:00:00 2001 From: mr-forust Date: Tue, 18 Nov 2025 14:45:30 +0100 Subject: [PATCH 033/100] refactor: Sepparate traefik middlewares --- traefik/dynamic/dynamic.yml | 90 +-------------------------------- traefik/dynamic/middlewares.yml | 88 ++++++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+), 89 deletions(-) create mode 100644 traefik/dynamic/middlewares.yml diff --git a/traefik/dynamic/dynamic.yml b/traefik/dynamic/dynamic.yml index 018fdb0..c050219 100644 --- a/traefik/dynamic/dynamic.yml +++ b/traefik/dynamic/dynamic.yml @@ -136,92 +136,4 @@ http: serversTransports: insecureTransport: - insecureSkipVerify: true - - middlewares: - # HTTPS Redirect - redirect-https: - redirectScheme: - scheme: https - permanent: true - - # Metube Basic Auth - metube-auth: - basicAuth: - users: - - "admin:$2y$05$3Q6gyLFW3NFNp4C6elnyfupntqB6VNB/tcIAeo8NEzvaqPxOjN0iC" - # - "jeepik:$2y$05$tIKrmhd7SYOe6yImRRAfpen7hpVdF8PnSbgBTCDZ.GI0Djx.Le2bq" - realm: "MeTube Access" - - # Basic Auth Traefik Dashboard - auth: - basicAuth: - users: - - "admin:$$apr1$$57E60OUM$$JoYwmLr/uZKaTy6U4IQd9." - # - "jeepik:$2y$05$Q8QqJwSjpycVYONyk4id/.rDFApW9oL8tycRMlGttNySsDv71Rnsu" - # - "vv:" - realm: "Traefik Dashboard" - - # Basic Auth Dockmon - dockmon-auth: - basicAuth: - users: - - "admin:$$apr1$$.bCpmIHl$$dxPEKdw5aZLAwo8wUz52b1" - realm: "Dockmon Access" - - # Cloudflare IP Whitelist - cloudflare-ipwhitelist: - ipWhiteList: - sourceRange: - - "173.245.48.0/20" - - "103.21.244.0/22" - - "103.22.200.0/22" - - "103.31.4.0/22" - - "141.101.64.0/18" - - "108.162.192.0/18" - - "190.93.240.0/20" - - "188.114.96.0/20" - - "197.234.240.0/22" - - "198.41.128.0/17" - - "162.158.0.0/15" - - "104.16.0.0/13" - - "104.24.0.0/14" - - "172.64.0.0/13" - - "131.0.72.0/22" - - # Security Headers - security-headers: - headers: - browserXssFilter: true - contentTypeNosniff: true - forceSTSHeader: true - stsIncludeSubdomains: true - stsPreload: true - stsSeconds: 31536000 - customFrameOptionsValue: "SAMEORIGIN" - customResponseHeaders: - X-Content-Type-Options: "nosniff" - Referrer-Policy: "strict-origin-when-cross-origin" - - # Nextcloud specific headers - nextcloud-secure-headers: - headers: - hostsProxyHeaders: - - "X-Forwarded-Host" - - "X-Forwarded-Proto" - referrerPolicy: "same-origin" - customFrameOptionsValue: "SAMEORIGIN" - - # Rate limiting - rate-limit: - rateLimit: - average: 100 - burst: 50 - period: 1m - - # Nextcloud chain - nextcloud-chain: - chain: - middlewares: - - nextcloud-secure-headers - - security-headers \ No newline at end of file + insecureSkipVerify: true \ No newline at end of file diff --git a/traefik/dynamic/middlewares.yml b/traefik/dynamic/middlewares.yml new file mode 100644 index 0000000..7ab61ff --- /dev/null +++ b/traefik/dynamic/middlewares.yml @@ -0,0 +1,88 @@ +http: + middlewares: + # HTTPS Redirect + redirect-https: + redirectScheme: + scheme: https + permanent: true + + # Metube Basic Auth + metube-auth: + basicAuth: + users: + - "admin:$2y$05$3Q6gyLFW3NFNp4C6elnyfupntqB6VNB/tcIAeo8NEzvaqPxOjN0iC" + # - "jeepik:$2y$05$tIKrmhd7SYOe6yImRRAfpen7hpVdF8PnSbgBTCDZ.GI0Djx.Le2bq" + realm: "MeTube Access" + + # Basic Auth Traefik Dashboard + auth: + basicAuth: + users: + - "admin:$$apr1$$57E60OUM$$JoYwmLr/uZKaTy6U4IQd9." + # - "jeepik:$2y$05$Q8QqJwSjpycVYONyk4id/.rDFApW9oL8tycRMlGttNySsDv71Rnsu" + # - "vv:" + realm: "Traefik Dashboard" + + # Basic Auth Dockmon + dockmon-auth: + basicAuth: + users: + - "admin:$$apr1$$.bCpmIHl$$dxPEKdw5aZLAwo8wUz52b1" + realm: "Dockmon Access" + + # Cloudflare IP Whitelist + cloudflare-ipwhitelist: + ipWhiteList: + sourceRange: + - "173.245.48.0/20" + - "103.21.244.0/22" + - "103.22.200.0/22" + - "103.31.4.0/22" + - "141.101.64.0/18" + - "108.162.192.0/18" + - "190.93.240.0/20" + - "188.114.96.0/20" + - "197.234.240.0/22" + - "198.41.128.0/17" + - "162.158.0.0/15" + - "104.16.0.0/13" + - "104.24.0.0/14" + - "172.64.0.0/13" + - "131.0.72.0/22" + + # Security Headers + security-headers: + headers: + browserXssFilter: true + contentTypeNosniff: true + forceSTSHeader: true + stsIncludeSubdomains: true + stsPreload: true + stsSeconds: 31536000 + customFrameOptionsValue: "SAMEORIGIN" + customResponseHeaders: + X-Content-Type-Options: "nosniff" + Referrer-Policy: "strict-origin-when-cross-origin" + + # Nextcloud specific headers + nextcloud-secure-headers: + headers: + hostsProxyHeaders: + - "X-Forwarded-Host" + - "X-Forwarded-Proto" + referrerPolicy: "same-origin" + customFrameOptionsValue: "SAMEORIGIN" + + # Rate limiting + rate-limit: + rateLimit: + average: 100 + burst: 50 + period: 1m + + # Nextcloud chain + nextcloud-chain: + chain: + middlewares: + - nextcloud-secure-headers + - security-headers \ No newline at end of file From 7c29d74c729090daf908033ccb9539838bd5e4dd Mon Sep 17 00:00:00 2001 From: mr-forust Date: Tue, 18 Nov 2025 14:47:59 +0100 Subject: [PATCH 034/100] refactor: Removed routers from dynamic. Use .bak for references --- traefik/dynamic/dynamic.yml | 135 ------------------------------------ 1 file changed, 135 deletions(-) diff --git a/traefik/dynamic/dynamic.yml b/traefik/dynamic/dynamic.yml index c050219..70bbffa 100644 --- a/traefik/dynamic/dynamic.yml +++ b/traefik/dynamic/dynamic.yml @@ -1,139 +1,4 @@ http: - routers: - # Traefik Dashboard (ADMIN, local only) - traefik-dashboard: - rule: "Host(`traefik.workstation`)" - entryPoints: - - websecure - service: api@internal - middlewares: - # - auth - - security-headers - tls: {} - - # Nextcloud AIO Interface (ADMIN, local is better) - nextcloud-aio: - rule: "Host(`nextcloud-aio.workstation`)" - entryPoints: - - websecure - service: nextcloud-aio - middlewares: - - security-headers - tls: {} - - # Termix (public (account required)) - termix: - rule: "Host(`termix.forust.xyz`)" - entryPoints: - - websecure - service: termix - middlewares: - - security-headers - tls: {} - - # MeTube - metube: - rule: "Host(`metube.forust.xyz`)" - entryPoints: - - websecure - service: metube - middlewares: - - metube-auth - - security-headers - tls: {} - - # Portainer (public (account required)) - portainer: - rule: "Host(`portainer.forust.xyz`)" - entryPoints: - - websecure - service: portainer - middlewares: - - security-headers - tls: {} - - # Uptime Kuma - uptime-kuma: - rule: "Host(`uptime.forust.xyz`)" - entryPoints: - - websecure - service: uptime-kuma - tls: {} - - # AdGuard Home (public (account required)) - adguard: - rule: "Host(`adguard.forust.xyz`)" - entryPoints: - - websecure - service: adguard - middlewares: - - security-headers - tls: {} - - - # Nextcloud Main (public (account required)) - nextcloud: - rule: "Host(`nextcloud.forust.xyz`)" - entrypoints: - - websecure - service: nextcloud - middlewares: - - nextcloud-chain - tls: {} - - # Dockmon (public (account required)) - dockmon: - rule: "Host(`dockmon.forust.xyz`)" - entryPoints: - - websecure - service: dockmon - middlewares: - # - dockmon-auth - - security-headers - tls: {} - - # Gitea (public (account required)) - gitea: - rule: "Host(`gitea.forust.xyz`)" - entryPoints: - - websecure - - ssh - service: gitea - middlewares: - - security-headers - tls: {} - - # # Glance (local only) - # glance: - # rule: "Host(`glance.workstation`)" - # entryPoints: - # - websecure - # service: glance - # middlewares: - # - security-headers - # tls: {} - - # Watercrawl (local only) - watercrawl: - rule: "Host(`watercrawl.workstation`)" - entryPoints: - - websecure - service: watercrawl - middlewares: - - security-headers - tls: {} - - # N8N (local only) - n8n: - rule: "Host(`n8n.workstation`)" - entryPoints: - - websecure - service: n8n - middlewares: - - security-headers - tls: {} - - serversTransports: insecureTransport: insecureSkipVerify: true \ No newline at end of file From d22ef0cb444f6cb67441eb8f58c8a609b9c90e84 Mon Sep 17 00:00:00 2001 From: mr-forust Date: Tue, 18 Nov 2025 15:04:06 +0100 Subject: [PATCH 035/100] feat: Add routers for local testing --- traefik/dynamic/routers-dev.yml | 134 ++++++++++++++++++++++++++++++++ 1 file changed, 134 insertions(+) create mode 100644 traefik/dynamic/routers-dev.yml diff --git a/traefik/dynamic/routers-dev.yml b/traefik/dynamic/routers-dev.yml new file mode 100644 index 0000000..40d2733 --- /dev/null +++ b/traefik/dynamic/routers-dev.yml @@ -0,0 +1,134 @@ +http: + routers: + # Traefik Dashboard (dev access. local only) + traefik-dashboard-dev: + rule: "Host(`traefik.gigaforust`)" + entryPoints: + - websecure + service: api@internal + middlewares: + # - auth + - security-headers + tls: {} + + + # Nextcloud AIO Interface (dev access. local only) + nextcloud-aio-dev: + rule: "Host(`nextcloud-aio.gigaforust`)" + entryPoints: + - websecure + service: nextcloud-aio + middlewares: + - security-headers + tls: {} + + # Termix (dev access, (account required)) + termix-dev: + rule: "Host(`termix.gigaforust`)" + entryPoints: + - websecure + service: termix + middlewares: + - security-headers + tls: {} + + # MeTube (dev access, (auth required)) + metube-dev: + rule: "Host(`metube.gigaforust`)" + entryPoints: + - websecure + service: metube + middlewares: + - metube-auth + - security-headers + tls: {} + + # Portainer (dev acess, (account required)) + portainer-dev: + rule: "Host(`portainer.gigaforust`)" + entryPoints: + - websecure + service: portainer + middlewares: + - security-headers + tls: {} + + # Uptime Kuma (dev access, (account required)) + uptime-kuma-dev: + rule: "Host(`uptime.gigaforust`)" + entryPoints: + - websecure + service: uptime-kuma + tls: {} + + # AdGuard Home (dev access, (account required)) + adguard-dev: + rule: "Host(`adguard.gigaforust`)" + entryPoints: + - websecure + service: adguard + middlewares: + - security-headers + tls: {} + + # Nextcloud Main (public (account required)) + nextcloud-dev: + rule: "Host(`nextcloud.gigaforust`)" + entrypoints: + - websecure + service: nextcloud + middlewares: + - nextcloud-chain + tls: {} + + # Dockmon (dev access (account required)) + dockmon-dev: + rule: "Host(`dockmon.gigaforust`)" + entryPoints: + - websecure + service: dockmon + middlewares: + - security-headers + tls: {} + + # Gitea (dev access (account required)) + gitea-dev: + rule: "Host(`gitea.gigaforust`)" + entryPoints: + - websecure + - ssh + service: gitea + middlewares: + - security-headers + tls: {} + + # Glance (dev access, local only) + glance-dev: + rule: "Host(`glance.gigaforust`)" + entryPoints: + - websecure + service: glance + middlewares: + - security-headers + tls: {} + + # Watercrawl (dev access, local only) + watercrawl-dev: + rule: "Host(`watercrawl.gigaforust`)" + entryPoints: + - websecure + service: watercrawl + middlewares: + - security-headers + tls: {} + + # N8N (local only) + n8n-dev: + rule: "Host(`n8n.gigaforust`)" + entryPoints: + - websecure + service: n8n + middlewares: + - security-headers + tls: {} + From b3b0d5b553e826508a6e27fac5cac423d9e95b57 Mon Sep 17 00:00:00 2001 From: mr-forust Date: Tue, 18 Nov 2025 15:13:45 +0100 Subject: [PATCH 036/100] refactor: sepparate traefik production routers --- traefik/dynamic/routers-prod.yml | 132 +++++++++++++++++++++++++++++++ 1 file changed, 132 insertions(+) create mode 100644 traefik/dynamic/routers-prod.yml diff --git a/traefik/dynamic/routers-prod.yml b/traefik/dynamic/routers-prod.yml new file mode 100644 index 0000000..3643d65 --- /dev/null +++ b/traefik/dynamic/routers-prod.yml @@ -0,0 +1,132 @@ +http: + routers: + # Traefik Dashboard (ADMIN, without subdomeain) + traefik-dashboard: + rule: "Host(`traefik.forust.xyz`)" + entryPoints: + - websecure + service: api@internal + middlewares: + - auth + - security-headers + tls: {} + + # Nextcloud AIO Interface (ADMIN, without subdomeain) + nextcloud-aio: + rule: "Host(`nextcloud-aio.forust.xyz`)" + entryPoints: + - websecure + service: nextcloud-aio + middlewares: + - security-headers + tls: {} + + # Termix (public (account required)) + termix: + rule: "Host(`termix.forust.xyz`)" + entryPoints: + - websecure + service: termix + middlewares: + - security-headers + tls: {} + + # MeTube + metube: (public (auth required)) + rule: "Host(`metube.forust.xyz`)" + entryPoints: + - websecure + service: metube + middlewares: + - metube-auth + - security-headers + tls: {} + + # Portainer (public (account required)) + portainer: + rule: "Host(`portainer.forust.xyz`)" + entryPoints: + - websecure + service: portainer + middlewares: + - security-headers + tls: {} + + # Uptime Kuma (public (account required)) + uptime-kuma: + rule: "Host(`uptime.forust.xyz`)" + entryPoints: + - websecure + service: uptime-kuma + tls: {} + + # AdGuard Home (public (account required)) + adguard: + rule: "Host(`adguard.forust.xyz`)" + entryPoints: + - websecure + service: adguard + middlewares: + - security-headers + tls: {} + + # Nextcloud Main (public (account required)) + nextcloud: + rule: "Host(`nextcloud.forust.xyz`)" + entrypoints: + - websecure + service: nextcloud + middlewares: + - nextcloud-chain + tls: {} + + # Dockmon (public (account required)) + dockmon: + rule: "Host(`dockmon.forust.xyz`)" + entryPoints: + - websecure + service: dockmon + middlewares: + - security-headers + tls: {} + + # Gitea (public (account required)) + gitea: + rule: "Host(`gitea.forust.xyz`)" + entryPoints: + - websecure + - ssh + service: gitea + middlewares: + - security-headers + tls: {} + + # Glance (public, without subdomain) + glance: + rule: "Host(`glance.forust.xyz`)" + entryPoints: + - websecure + service: glance + middlewares: + - security-headers + tls: {} + + # Watercrawl (public, without subdomain) + watercrawl: + rule: "Host(`watercrawl.fourst.xyz`)" + entryPoints: + - websecure + service: watercrawl + middlewares: + - security-headers + tls: {} + + # N8N (public, without subdomain) + n8n: + rule: "Host(`n8n.forust.xyz`)" + entryPoints: + - websecure + service: n8n + middlewares: + - security-headers + tls: {} \ No newline at end of file From d1adaa54b14734107f3c8ab2471e0efb0e4069c1 Mon Sep 17 00:00:00 2001 From: mr-forust Date: Tue, 18 Nov 2025 15:19:27 +0100 Subject: [PATCH 037/100] feat: Add routers for local access --- traefik/dynamic/routers-local.yml | 134 ++++++++++++++++++++++++++++++ 1 file changed, 134 insertions(+) create mode 100644 traefik/dynamic/routers-local.yml diff --git a/traefik/dynamic/routers-local.yml b/traefik/dynamic/routers-local.yml new file mode 100644 index 0000000..d647f95 --- /dev/null +++ b/traefik/dynamic/routers-local.yml @@ -0,0 +1,134 @@ +http: + routers: + # Traefik Dashboard (local access, ADMIN, local only) + traefik-dashboard-local: + rule: "Host(`traefik.workstation`)" + entryPoints: + - websecure + service: api@internal + middlewares: + # - auth + - security-headers + tls: {} + + + # Nextcloud AIO Interface (local access. ADMIN, local only) + nextcloud-aio-local: + rule: "Host(`nextcloud-aio.workstation`)" + entryPoints: + - websecure + service: nextcloud-aio + middlewares: + - security-headers + tls: {} + + # Termix (local access, (account required)) + termix-local: + rule: "Host(`termix.workstation`)" + entryPoints: + - websecure + service: termix + middlewares: + - security-headers + tls: {} + + # MeTube (local access, (auth required)) + metube-local: + rule: "Host(`metube.workstation`)" + entryPoints: + - websecure + service: metube + middlewares: + - metube-auth + - security-headers + tls: {} + + # Portainer (dev acess, (account required)) + portainer-local: + rule: "Host(`portainer.workstation`)" + entryPoints: + - websecure + service: portainer + middlewares: + - security-headers + tls: {} + + # Uptime Kuma (local access, (account required)) + uptime-kuma-local: + rule: "Host(`uptime.workstation`)" + entryPoints: + - websecure + service: uptime-kuma + tls: {} + + # AdGuard Home (local access, (account required)) + adguard-local: + rule: "Host(`adguard.workstation`)" + entryPoints: + - websecure + service: adguard + middlewares: + - security-headers + tls: {} + + # Nextcloud Main (public (account required)) + nextcloud-local: + rule: "Host(`nextcloud.workstation`)" + entrypoints: + - websecure + service: nextcloud + middlewares: + - nextcloud-chain + tls: {} + + # Dockmon (local access (account required)) + dockmon-local: + rule: "Host(`dockmon.workstation`)" + entryPoints: + - websecure + service: dockmon + middlewares: + - security-headers + tls: {} + + # Gitea (local access (account required)) + gitea-local: + rule: "Host(`gitea.workstation`)" + entryPoints: + - websecure + - ssh + service: gitea + middlewares: + - security-headers + tls: {} + + # Glance (local access) + glance-local: + rule: "Host(`glance.workstation`)" + entryPoints: + - websecure + service: glance + middlewares: + - security-headers + tls: {} + + # Watercrawl (local access) + watercrawl-local: + rule: "Host(`watercrawl.workstation`)" + entryPoints: + - websecure + service: watercrawl + middlewares: + - security-headers + tls: {} + + # N8N (local only) + n8n-local: + rule: "Host(`n8n.workstation`)" + entryPoints: + - websecure + service: n8n + middlewares: + - security-headers + tls: {} + From 8f9be8a478a4e8f54b8f08f979db9c05da670a13 Mon Sep 17 00:00:00 2001 From: mr-forust Date: Tue, 18 Nov 2025 15:20:53 +0100 Subject: [PATCH 038/100] fix: Misplaced comment --- traefik/dynamic/routers-prod.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/traefik/dynamic/routers-prod.yml b/traefik/dynamic/routers-prod.yml index 3643d65..86eed1d 100644 --- a/traefik/dynamic/routers-prod.yml +++ b/traefik/dynamic/routers-prod.yml @@ -31,8 +31,8 @@ http: - security-headers tls: {} - # MeTube - metube: (public (auth required)) + # MeTube (public (auth required)) + metube: rule: "Host(`metube.forust.xyz`)" entryPoints: - websecure From 7af5af06303909e4f30bb6eccd7f7d80dad3d54e Mon Sep 17 00:00:00 2001 From: mr-forust Date: Tue, 18 Nov 2025 15:42:51 +0100 Subject: [PATCH 039/100] fix: Return glance service --- traefik/dynamic/services.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/traefik/dynamic/services.yml b/traefik/dynamic/services.yml index c53d2ac..10a3b08 100644 --- a/traefik/dynamic/services.yml +++ b/traefik/dynamic/services.yml @@ -45,11 +45,11 @@ http: - url: "https://dockmon:443" serversTransport: insecureTransport - # # Glance - # glance: - # loadBalancer: - # servers: - # - url: "http://glance:8080" + # Glance + glance: + loadBalancer: + servers: + - url: "http://glance:8080" # Watercrawl watercrawl: From 1040e4fdf76d67c3b5ad58d8b8958e108e5da729 Mon Sep 17 00:00:00 2001 From: mr-forust Date: Thu, 20 Nov 2025 03:43:10 +0100 Subject: [PATCH 040/100] chore: termix-data to gitignore --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index d532ac9..2ebd212 100644 --- a/.gitignore +++ b/.gitignore @@ -17,6 +17,7 @@ dockmon/data/* portainer/portainer_data/* metube/MeTube_downloads uptime-kuma/data/ +termix/termix-data/* # Traefik files traefik/letsencrypt/acme.json @@ -29,4 +30,4 @@ traefik/certs/* venv/ #DataSecurity -replacements.txt +replacements.txt \ No newline at end of file From cc20d848f8aca2d402cd57846f85b978cab56668 Mon Sep 17 00:00:00 2001 From: mr-forust Date: Tue, 25 Nov 2025 19:29:12 +0100 Subject: [PATCH 041/100] chore: vv pass --- traefik/dynamic/middlewares.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/traefik/dynamic/middlewares.yml b/traefik/dynamic/middlewares.yml index 7ab61ff..8237b09 100644 --- a/traefik/dynamic/middlewares.yml +++ b/traefik/dynamic/middlewares.yml @@ -12,6 +12,8 @@ http: users: - "admin:$2y$05$3Q6gyLFW3NFNp4C6elnyfupntqB6VNB/tcIAeo8NEzvaqPxOjN0iC" # - "jeepik:$2y$05$tIKrmhd7SYOe6yImRRAfpen7hpVdF8PnSbgBTCDZ.GI0Djx.Le2bq" + - "vv:$2y$05$JdT8AGUO9bd.E/PiCmKaoOJS1RFlXkrrmZ5mJ4f8/a1bEW39L3FbS" + realm: "MeTube Access" # Basic Auth Traefik Dashboard From 7b60630d76751d34ef53d0ba84ea8a938a0a6884 Mon Sep 17 00:00:00 2001 From: mr-forust Date: Tue, 25 Nov 2025 23:48:12 +0100 Subject: [PATCH 042/100] feat: new landing page matching xrock style --- homepage/assets/css/style.css | 167 ++++++++++++++++++++++++++++++++++ homepage/files/index.html | 77 ---------------- homepage/index.html | 141 ++++++++++++++++++++++++++++ 3 files changed, 308 insertions(+), 77 deletions(-) create mode 100644 homepage/assets/css/style.css delete mode 100644 homepage/files/index.html create mode 100644 homepage/index.html diff --git a/homepage/assets/css/style.css b/homepage/assets/css/style.css new file mode 100644 index 0000000..bbaa64d --- /dev/null +++ b/homepage/assets/css/style.css @@ -0,0 +1,167 @@ +/* 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; + } +} \ No newline at end of file diff --git a/homepage/files/index.html b/homepage/files/index.html deleted file mode 100644 index 243092e..0000000 --- a/homepage/files/index.html +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - forust — terminal landing - - - - - -
- -
- forust@home:~$ whoami -
-
-
- -
-

>> OSINT / Pentesting

-

>> Linux enjoyer

-

>> self-hosting & automation

-

> projects: soon™

-
- - - - - diff --git a/homepage/index.html b/homepage/index.html new file mode 100644 index 0000000..5d93d1c --- /dev/null +++ b/homepage/index.html @@ -0,0 +1,141 @@ + + + + + + MrForust // XRock + + + + + + +
+
+

Mr-Forust

+

> CTF Player / XRock_Team / Just Signal.

+
+ +
+ +
+

./socials

+ +
+ +
+

./skills_and_tools

+
+
+
+ ArchLinux # btw + [#######...] +
+
+ Docker Compose [#####.....] +
+
+ Web Pentest [#####.....] +
+
+ Burpsuite [#####.....] +
+
+ Docker [####......] +
+
+ Steganography [####......] +
+
+
+
+ Cryptography [####......] +
+
+ OSINT [####......] +
+
+ Python [###.......] +
+
+ HTML [###.......] +
+
+ Bash [##........] +
+
+ Golang [#.........] +
+
+
+
+ +
+

./xrock_team

+

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

+ +
+
+
+ MrForust +
+ +
+
+ Teammate_1 +
+ +
+
+ Teammate_2 +
+
+
+ +
+

./favorite_repos

+ +
+ +
+

root@xrock:~$ shutdown -h now

+

© XRock - Just Signal.

+
+
+ + + \ No newline at end of file From 03d39f8a322005c423371e83e3139725c65a7023 Mon Sep 17 00:00:00 2001 From: mr-forust Date: Tue, 25 Nov 2025 23:59:15 +0100 Subject: [PATCH 043/100] chore: separate docker files from nginx --- homepage/{ => files}/assets/css/style.css | 0 homepage/{ => files}/index.html | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename homepage/{ => files}/assets/css/style.css (100%) rename homepage/{ => files}/index.html (100%) diff --git a/homepage/assets/css/style.css b/homepage/files/assets/css/style.css similarity index 100% rename from homepage/assets/css/style.css rename to homepage/files/assets/css/style.css diff --git a/homepage/index.html b/homepage/files/index.html similarity index 100% rename from homepage/index.html rename to homepage/files/index.html From 5d9fc18ba50b4f2bb335d2c4b362d4dfc25c2a88 Mon Sep 17 00:00:00 2001 From: mr-forust Date: Wed, 26 Nov 2025 00:01:43 +0100 Subject: [PATCH 044/100] feat: docker deployment --- homepage/Dockerfile | 13 +++++++++---- homepage/compose.yaml | 13 +++++++------ 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/homepage/Dockerfile b/homepage/Dockerfile index f60f38d..51b2d93 100644 --- a/homepage/Dockerfile +++ b/homepage/Dockerfile @@ -1,5 +1,10 @@ -FROM nginx:alpine:latest -WORKDIR /usr/share/nginx/html -COPY . . -CMD [ "nginx", "-g", "daemon off;" ] +# everyone use that +FROM nginx:alpine + +RUN rm -rf /usr/share/nginx/html/* + +COPY ./files /usr/share/nginx/html + EXPOSE 80 +# Start +CMD ["nginx", "-g", "daemon off;"] \ No newline at end of file diff --git a/homepage/compose.yaml b/homepage/compose.yaml index b076289..fb62f1c 100644 --- a/homepage/compose.yaml +++ b/homepage/compose.yaml @@ -1,11 +1,12 @@ services: - homepage: - container_name: landing - volumes: - - ./homepage:/usr/share/nginx/html:ro + landing: + build: . + container_name: mrforust_landing ports: - - "8080:80" - restart: always + - "8085:80" + restart: unless-stopped + volumes: + - ./files:/usr/share/nginx/html networks: - traefik-proxy From 1c1170ca969587fc60b27c8c1a5496c05e7059ae Mon Sep 17 00:00:00 2001 From: mr-forust Date: Wed, 26 Nov 2025 00:09:12 +0100 Subject: [PATCH 045/100] refactor: change names for forust-homepage --- homepage/compose.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/homepage/compose.yaml b/homepage/compose.yaml index fb62f1c..dc5a182 100644 --- a/homepage/compose.yaml +++ b/homepage/compose.yaml @@ -1,7 +1,6 @@ services: - landing: + forust-homepage: build: . - container_name: mrforust_landing ports: - "8085:80" restart: unless-stopped From 02671b91177889b41e97841106467b7cf1ecd66d Mon Sep 17 00:00:00 2001 From: mr-forust Date: Wed, 26 Nov 2025 00:10:35 +0100 Subject: [PATCH 046/100] feat: traefik dynamic files for forust-homepage --- traefik/dynamic/routers-dev.yml | 11 ++++++++++- traefik/dynamic/routers-local.yml | 9 +++++++++ traefik/dynamic/routers-prod.yml | 10 ++++++++++ traefik/dynamic/services.yml | 5 +++++ 4 files changed, 34 insertions(+), 1 deletion(-) diff --git a/traefik/dynamic/routers-dev.yml b/traefik/dynamic/routers-dev.yml index 40d2733..4e41b8e 100644 --- a/traefik/dynamic/routers-dev.yml +++ b/traefik/dynamic/routers-dev.yml @@ -131,4 +131,13 @@ http: middlewares: - security-headers tls: {} - + + # Landing Page (public) + forust-homepage-dev: + rule: "Host(`landing.gigaforust`)" + entryPoints: + - websecure + service: landing-page + middlewares: + - security-headers + tls: {} \ No newline at end of file diff --git a/traefik/dynamic/routers-local.yml b/traefik/dynamic/routers-local.yml index d647f95..5d350a2 100644 --- a/traefik/dynamic/routers-local.yml +++ b/traefik/dynamic/routers-local.yml @@ -132,3 +132,12 @@ http: - security-headers tls: {} + # Landing Page (local access) + forust-homepage-local: + rule: "Host(`landing.workstation`)" + entryPoints: + - websecure + service: landing-page + middlewares: + - security-headers + tls: {} diff --git a/traefik/dynamic/routers-prod.yml b/traefik/dynamic/routers-prod.yml index 86eed1d..c63a48e 100644 --- a/traefik/dynamic/routers-prod.yml +++ b/traefik/dynamic/routers-prod.yml @@ -127,6 +127,16 @@ http: entryPoints: - websecure service: n8n + middlewares: + - security-headers + tls: {} + + # Landing Page (public) + forust-homepage: + rule: "Host(`forust.xyz`)" + entryPoints: + - websecure + service: landing-page middlewares: - security-headers tls: {} \ No newline at end of file diff --git a/traefik/dynamic/services.yml b/traefik/dynamic/services.yml index 10a3b08..c75c7a1 100644 --- a/traefik/dynamic/services.yml +++ b/traefik/dynamic/services.yml @@ -73,3 +73,8 @@ http: loadBalancer: servers: - url: "http://metube:8081" + # Landing Page + forust-homepage: + loadBalancer: + servers: + - url: "http://forust_homepage:80" \ No newline at end of file From aca485836bf8c548fdfb13271951fb88a48de622 Mon Sep 17 00:00:00 2001 From: mr-forust Date: Wed, 26 Nov 2025 00:42:10 +0100 Subject: [PATCH 047/100] fix: service names --- traefik/dynamic/routers-dev.yml | 2 +- traefik/dynamic/routers-local.yml | 2 +- traefik/dynamic/routers-prod.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/traefik/dynamic/routers-dev.yml b/traefik/dynamic/routers-dev.yml index 4e41b8e..58c16d4 100644 --- a/traefik/dynamic/routers-dev.yml +++ b/traefik/dynamic/routers-dev.yml @@ -137,7 +137,7 @@ http: rule: "Host(`landing.gigaforust`)" entryPoints: - websecure - service: landing-page + service: forust-homepage middlewares: - security-headers tls: {} \ No newline at end of file diff --git a/traefik/dynamic/routers-local.yml b/traefik/dynamic/routers-local.yml index 5d350a2..ecbab2f 100644 --- a/traefik/dynamic/routers-local.yml +++ b/traefik/dynamic/routers-local.yml @@ -137,7 +137,7 @@ http: rule: "Host(`landing.workstation`)" entryPoints: - websecure - service: landing-page + service: forust-homepage middlewares: - security-headers tls: {} diff --git a/traefik/dynamic/routers-prod.yml b/traefik/dynamic/routers-prod.yml index c63a48e..fd9e4b6 100644 --- a/traefik/dynamic/routers-prod.yml +++ b/traefik/dynamic/routers-prod.yml @@ -136,7 +136,7 @@ http: rule: "Host(`forust.xyz`)" entryPoints: - websecure - service: landing-page + service: forust-homepage middlewares: - security-headers tls: {} \ No newline at end of file From 272666d2fda452924312a643ededead3721d8f01 Mon Sep 17 00:00:00 2001 From: mr-forust Date: Wed, 26 Nov 2025 00:44:58 +0100 Subject: [PATCH 048/100] fix: container url forust-homepage --- traefik/dynamic/services.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/traefik/dynamic/services.yml b/traefik/dynamic/services.yml index c75c7a1..712706f 100644 --- a/traefik/dynamic/services.yml +++ b/traefik/dynamic/services.yml @@ -77,4 +77,4 @@ http: forust-homepage: loadBalancer: servers: - - url: "http://forust_homepage:80" \ No newline at end of file + - url: "http://forust-homepage:80" \ No newline at end of file From 61e6b2b5c766e2164b2b83c14c631416e8589da8 Mon Sep 17 00:00:00 2001 From: mr-forust Date: Wed, 26 Nov 2025 01:01:37 +0100 Subject: [PATCH 049/100] chore: reformat discord username to unified style --- homepage/files/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/homepage/files/index.html b/homepage/files/index.html index 5d93d1c..f6f5c8b 100644 --- a/homepage/files/index.html +++ b/homepage/files/index.html @@ -35,7 +35,7 @@
  • - discord: mr.forust + discord/mr.forust
  • From 68b5467a374885fb1a3fea0c91b0a146dfa17d01 Mon Sep 17 00:00:00 2001 From: mr-forust Date: Wed, 26 Nov 2025 01:19:50 +0100 Subject: [PATCH 050/100] chore: exclude team images from project --- .gitignore | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 2ebd212..f29520c 100644 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,9 @@ metube/MeTube_downloads uptime-kuma/data/ termix/termix-data/* +# Homepage +homepage/files/assets/images/team/* + # Traefik files traefik/letsencrypt/acme.json traefik/logs/* @@ -30,4 +33,4 @@ traefik/certs/* venv/ #DataSecurity -replacements.txt \ No newline at end of file +replacements.txt From 739915c451bb8f82c5c104753ec3e687f98d2727 Mon Sep 17 00:00:00 2001 From: mr-forust Date: Wed, 26 Nov 2025 01:20:12 +0100 Subject: [PATCH 051/100] feat: team avatars --- homepage/files/index.html | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/homepage/files/index.html b/homepage/files/index.html index f6f5c8b..4651500 100644 --- a/homepage/files/index.html +++ b/homepage/files/index.html @@ -97,18 +97,28 @@
    -
    - MrForust +
    + MrForust
    -
    - Teammate_1 +
    + Anna~
    -
    - Teammate_2 +
    + Chernuha +
    + +
    +
    + p1ngvi +
    + +
    +
    + xdfnx
    From 7ee0a1e7a2ce8166f9b1786944e3219fed41f25f Mon Sep 17 00:00:00 2001 From: mr-forust Date: Wed, 26 Nov 2025 11:51:09 +0100 Subject: [PATCH 052/100] feat: repos added to forust homepage --- homepage/files/index.html | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/homepage/files/index.html b/homepage/files/index.html index 4651500..1f35baf 100644 --- a/homepage/files/index.html +++ b/homepage/files/index.html @@ -127,8 +127,8 @@

    ./favorite_repos

    - +

    root@xrock:~$ shutdown -h now

    © XRock - Just Signal.

    From 258ed04f98fb9b40420a55bc5f8e8a933472ac21 Mon Sep 17 00:00:00 2001 From: mr-forust Date: Wed, 26 Nov 2025 14:23:56 +0100 Subject: [PATCH 053/100] feat: miku --- homepage/files/index.html | 2 ++ homepage/files/miku.html | 73 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+) create mode 100644 homepage/files/miku.html diff --git a/homepage/files/index.html b/homepage/files/index.html index 1f35baf..1573d24 100644 --- a/homepage/files/index.html +++ b/homepage/files/index.html @@ -154,6 +154,8 @@
    +

    root@xrock:~$ cat ./miku

    +

    miku?

    root@xrock:~$ shutdown -h now

    © XRock - Just Signal.

    diff --git a/homepage/files/miku.html b/homepage/files/miku.html new file mode 100644 index 0000000..3cb24dd --- /dev/null +++ b/homepage/files/miku.html @@ -0,0 +1,73 @@ + + + + + + miku? + + + +⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠿⠛⠋⠉⠉⠀⠀⠀⠀⠀⠀⠛⠘⠛⠛⠛⠿⠿⠿⠿⠿⣽⠙⣛⡛⠿⢿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿ +⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡿⠟⠋⠁⠀⠀⠀⠀⠀⢀⣀⣀⣀⣀⣀⣀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠂⠈⠙⠛⠿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿ +⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡿⢋⣰⢋⣴⠻⣿⡟⢹⡟⠋⠀⠀⠀⠀⢀⣠⣴⣶⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣷⣶⣶⣶⣶⣶⣶⣶⣿⣿⣿⣷⣶⣶⣦⣤⣄⣀⠀⠀⠉⠛⢿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿ +⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡿⠋⡀⠏⣰⠟⠁⡰⢋⠀⠀⠀⠀⠀⢀⣠⣾⣿⣿⣿⡿⠟⠛⣛⣽⣯⣿⣽⣯⣿⣟⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣖⡄⠀⠀⠉⠻⢿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿ +⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠟⠁⠀⣠⠾⠋⠀⢊⡴⠋⠀⠀⠀⣀⣴⣿⣿⣿⡿⠋⢀⣠⣶⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣯⣿⣿⣽⣿⣯⣿⣯⣿⣽⣯⣿⢿⣷⣷⣄⠀⠀⠙⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿ +⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠟⠁⠀⢠⠞⠁⠀⠀⣰⠋⠀⠀⢀⣤⣾⣿⣿⣿⠿⣋⣴⣾⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣯⣝⣛⡫⠷⣿⡿⣯⣿⢿⣺⣄⠀⠈⠋⠙⣿⡻⣧⠹⣏⢻⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿ +⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡟⠁⠀⢀⡴⠋⠀⠀⢠⡾⠁⠀⢀⣴⣿⣿⣿⣿⣿⣿⣾⠿⠛⣩⣽⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣶⣭⣛⣿⣿⣻⣿⣷⣤⠀⠀⠘⢷⠘⣧⠹⣆⠻⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿ +⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠋⠀⢀⡰⠍⠀⠀⢀⣴⡟⠁⢀⣶⣿⣿⣿⣿⣿⣿⠟⣋⠴⢂⣴⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⢿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣷⡄⠀⠀⠀⠹⣦⠘⠀⠻⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿ +⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡿⠿⠀⠀⢀⠀⠀⠀⢰⣾⠏⢀⣴⣾⣿⣿⡿⣻⡿⢛⣡⠞⣁⣶⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⢿⣻⣽⣾⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣄⢠⡀⠁⠘⢧⠀⠀⠹⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿ +⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡿⠃⠀⠀⠀⠀⠠⠀⠀⠀⣿⠏⣴⣿⣿⣿⡿⣋⣾⠟⣱⠋⢂⣶⣿⣿⣿⣿⣿⣿⡿⣯⣿⣽⢿⡾⣟⣿⡽⣾⢽⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣧⠱⠀⠀⠈⢧⠀⠀⠘⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿ +⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡿⡋⠀⠠⢀⠏⠀⠀⠀⠀⠀⠀⢋⣾⣿⣿⣿⣿⣷⠟⡡⠞⢁⣼⣿⣿⣿⣿⣿⢟⣿⢿⣽⣟⡷⣯⣟⡿⣽⢯⡿⣽⢊⢷⣻⣟⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣽⣿⣟⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣷⡂⠀⠀⠀⢫⠄⠀⠘⢿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿ +⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡟⠀⡈⠁⡌⠀⠀⠀⠀⠀⢀⣴⣿⣿⣿⣿⣿⠟⢁⢮⡱⣳⢾⣟⠋⣿⣿⡿⠃⣼⢯⡟⣾⡽⣳⠶⣭⠿⣽⣛⡞⣷⡈⢎⢷⡹⣯⣟⣿⣿⣿⣿⣿⣿⡿⣿⣿⣿⣿⣿⣿⣯⣿⣿⣿⣿⣿⣿⣟⣿⣿⣿⣿⣿⣿⣿⣷⡆⠀⠀⠀⠫⡄⠀⠈⢿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿ +⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠃⠀⡔⠀⢈⠆⠀⠀⠀⣠⣾⣿⣿⣿⣿⢛⢋⡰⣋⢮⡱⢏⡾⠍⣰⣿⡿⠁⡼⣏⠷⡘⢼⣓⠧⡓⡜⣯⢳⣭⣛⢶⡁⢊⠶⣙⢧⡻⣷⣻⣯⣿⢿⣷⣿⢿⣯⣿⢿⣽⣾⢿⣳⣿⣽⡿⣿⣿⡿⣟⣾⣽⣻⢿⣿⣿⣿⣿⣧⠀⠀⠀⠄⠀⠀⢰⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿ +⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡧⠀⡘⠀⡀⠌⡐⠀⠀⣼⣿⣿⣿⣿⣿⠃⢀⠦⡓⢭⡲⢭⣓⠞⢠⣿⡟⢀⣼⢳⡍⠧⡑⠈⡝⠦⡑⡍⡖⣏⢶⡩⢞⠁⡄⠘⡱⢎⡵⢫⢷⣻⣽⣿⣻⣾⢿⣽⡾⣟⣯⡿⣟⣿⣳⣯⢿⡟⣿⣿⣟⡿⣞⡿⣯⣟⣿⢿⣿⣯⡀⠀⢀⠂⠀⠀⠟⡛⢿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿ +⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠁⠠⠘⠰⢀⡘⠔⢀⣾⣿⣿⣿⣿⣿⠃⠀⡎⠵⣙⠶⣹⢣⡞⠁⣾⡿⢁⡾⣡⠗⡬⠑⢀⡆⡙⢆⠱⡘⠼⣘⠦⣝⢪⠀⣗⡀⠙⡼⣘⢏⡞⡵⣛⡾⣽⢯⣟⠾⡽⣭⢿⣹⢟⣷⡻⣎⢯⢳⡌⢿⣾⣟⣯⢳⡝⣺⠽⣻⣽⣻⡇⠀⠀⠀⠀⢰⡄⠸⡈⠿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿ +⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠀⠂⡍⡖⠀⠌⣠⣿⣿⣿⡿⣿⡿⠃⠀⡜⣌⠳⣬⢛⡴⢫⡜⢸⣿⠃⡼⣱⢃⠞⡠⢁⣾⠁⢹⠠⢃⢌⠣⡝⣚⢬⢣⠀⣿⣦⠀⠰⡩⠞⡼⣱⢫⡝⣧⢟⡾⢫⡕⣣⢏⢞⡹⢲⡝⡜⣊⠖⠲⠈⢿⣾⣻⠸⡜⣥⠫⣝⡷⣟⡧⠀⠀⠀⠀⠰⣃⠐⢠⠀⢻⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿ +⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡇⢀⠱⢠⠄⠈⣴⣿⣿⣿⠟⣼⡿⢡⠃⡜⡰⢊⢷⡸⣍⢞⡣⠄⣿⣏⠴⣣⠧⣉⠎⢁⣼⣯⠇⠰⣉⠌⡄⠳⣌⠧⢎⢧⠀⣿⡽⣷⠀⠈⠽⡰⢣⠳⣜⢬⢫⡜⣳⠸⣑⢎⠎⡕⢣⠜⡰⢡⠎⣡⢃⠘⣿⣽⡆⢹⠰⣍⢲⡹⣟⣿⠀⠀⠀⢀⡃⠲⠀⢠⠂⢸⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿ +⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠀⠄⡂⡜⢀⣾⣿⣿⣿⢋⣾⣟⢠⠃⡸⢰⡑⢯⡒⢷⣘⢮⡑⢸⣯⢏⡞⣡⠞⡤⠁⣾⠋⣾⠡⠐⡥⢂⠈⡱⣈⢮⡙⢦⠐⣏⠻⣿⣷⣤⠈⠱⣋⠳⣜⢪⡓⡼⣡⠳⣉⢎⢎⡙⠦⡙⡔⠣⢎⠔⡈⠆⢹⣯⣧⠈⡳⢌⠦⣱⣛⣮⠀⠀⠀⠆⡌⢡⠃⠄⢂⢸⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿ +⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡇⠀⠆⡑⢠⣾⣿⣿⡻⢃⣾⣿⠋⠆⠰⣁⠦⣙⠦⣏⠳⡜⢦⠁⣾⣏⠞⡴⢱⢊⠀⣼⢏⣾⣿⡅⠈⠴⠈⠐⢠⡑⢦⡙⣧⠈⣟⣦⠹⣿⣿⣄⠀⠉⠷⣌⠳⡜⣥⢃⠯⣜⣊⢦⡙⢦⠱⣌⠳⡌⢎⠱⡈⠄⢻⣿⡄⡹⢌⠲⡡⢞⡵⠀⠀⠀⡇⠄⡃⠥⢈⠄⠘⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿ +⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠁⡈⠂⣴⣟⠫⡍⠰⢁⣾⣿⠃⡜⢀⠣⣐⠣⣍⠞⣌⢳⢩⢚⠀⡿⣌⠏⡼⢡⠂⠰⣿⡾⢿⣿⣇⠀⠓⡄⡄⠂⡜⢢⡝⡶⠐⣸⣿⣷⡜⢿⣿⣷⡠⠘⢌⡳⢍⠶⣩⠞⡴⣊⢦⡙⢆⡳⢌⠣⡜⣌⠲⡁⠎⠈⣿⣷⡱⢋⡒⠥⣫⠖⠀⠠⢌⡓⠌⡰⢁⠎⡐⠈⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿ +⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡏⠀⢀⡾⢋⡌⢣⠌⢁⣿⡿⠁⡜⠀⢢⠑⡄⠳⣈⠞⡌⢎⠦⡉⢸⡗⡭⢊⡵⠁⣰⣶⣤⣤⣌⡙⠉⠷⠈⠄⢣⠐⣈⠳⣜⣳⠀⣿⣿⣿⣿⣦⡙⣿⣷⡀⠈⠼⣩⠞⣥⢛⡴⣍⠶⣉⠦⣑⠮⣑⢮⣐⢣⠱⡈⠅⠸⣷⡏⡵⢘⡐⢧⣻⠀⡡⢂⡝⢠⠐⡩⠐⢠⠀⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿ +⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠂⡰⢋⠔⠣⠘⢠⠃⣾⡟⠄⡐⢀⡘⠄⠣⢌⠱⠠⢎⡐⢣⡘⠁⣾⢸⡱⢋⠄⣘⣿⣿⣿⣿⣿⣿⣿⡦⠀⠁⢸⡄⢠⢋⢾⣱⠠⣿⣿⣿⣿⣿⣿⣌⢻⣿⣤⠈⢱⡚⢦⡛⣶⡩⢞⢥⠓⣜⢢⡍⠶⣨⢆⢣⡑⠌⡀⢿⣷⢡⠣⡘⠦⣏⠔⡁⠢⣜⠠⠂⢥⠃⠄⠂⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿ +⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠟⠅⢀⠰⠌⡌⢁⠊⠄⣸⡟⠀⡐⠀⡄⢢⢉⠒⡌⢂⠇⢢⠘⢤⠘⢰⠋⣦⡙⠂⣠⣾⣿⣿⣿⣿⣿⣿⣿⣿⡄⠘⢸⣧⠀⡚⣼⢳⠀⣿⣿⣿⣿⣿⣿⣿⡷⢈⢁⣤⠀⠍⡧⡝⢦⠻⣍⢮⡙⣤⠣⡜⢳⡰⢎⠲⣌⠒⡀⠘⣿⣎⠱⣀⠛⡼⢐⡈⠔⣌⠂⡉⠔⡨⢈⠄⣻⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿ +⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠿⠃⠈⠐⠈⠆⢠⠂⠌⡐⢰⡿⠂⡐⠀⠰⡈⠆⡌⠒⡌⢌⡘⠤⡉⢆⠁⣼⣙⢦⠙⣠⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡀⠈⣿⡇⠘⡴⣻⠀⣹⣿⣿⣿⣿⣿⣿⣶⣾⣷⣿⡖⠀⠱⣩⠏⣝⢮⠳⡜⢤⠓⣍⠲⣱⢪⡑⢆⠣⡔⠁⢹⣎⠧⢠⠙⣞⠀⢎⠐⣌⠂⣁⠚⠄⢢⠀⢽⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿ +⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠗⢀⣠⣶⠁⠌⠂⡌⢀⠂⢠⡿⠁⠀⠀⠀⣎⠡⡘⢠⠃⢌⠢⠄⡃⠜⡠⢀⡿⣜⠋⣰⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣷⡀⢿⣿⡆⢱⢻⠀⣸⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣆⣄⠑⢮⡱⢎⠿⣜⠦⡙⢤⠛⣤⠓⡼⣈⠇⣆⠡⠀⢻⡜⡠⢙⡼⠈⠆⡌⣰⠡⠠⠘⡌⠠⠂⢸⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿ +⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠿⢛⣡⣴⣿⣿⡏⠐⢨⠀⠆⠠⠁⣼⠃⠀⠀⠀⡜⢄⠢⠑⡄⢊⠄⡃⠜⡠⢃⠔⠰⣯⠍⢠⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣷⣾⣿⣿⣀⠹⡇⢻⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣷⡦⡀⠹⢎⡝⣮⢧⠙⣢⠙⣤⠛⣔⢣⡚⢤⢃⠅⡈⠞⠤⡁⢞⡥⠘⡄⢲⠀⡅⢣⠐⡡⠁⢸⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿ +⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠁⡈⠄⡘⢠⠁⢸⠇⠀⠀⠀⣼⠱⡈⠄⡡⠐⠌⢂⡘⠤⠑⠢⠀⣼⠇⠀⠀⠉⠙⠻⢿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣄⠀⢸⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣧⣀⠉⢞⡬⣛⣇⠰⣉⠦⡹⢌⡖⡍⣆⠫⡔⡀⢈⠱⢈⠺⣄⠱⣌⠲⢁⠰⢀⠇⠄⡡⢸⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿ +⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡟⠠⠐⢡⡘⠤⢀⡏⠀⠀⠀⣸⡱⢂⡁⠂⠄⡑⠈⡄⠰⡈⢡⠁⠐⡟⢀⣶⣤⣄⣀⠀⠀⠈⠙⠿⣿⣿⡙⢿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡄⢀⣸⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣦⡈⠲⡝⡾⣇⠈⡖⣩⠲⣌⠳⣌⢳⣜⡰⠀⠄⠊⣜⣣⢘⡧⡘⠄⢂⠡⢊⡐⠐⢸⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿ +⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠇⠠⣉⠐⢆⠂⡼⠀⠀⠀⣼⢣⢇⠃⠠⢈⠐⠠⠁⢄⠃⠤⠁⠌⡀⢡⣿⣿⣿⣿⣿⣿⣷⣦⣄⠀⠀⠙⠻⢷⣬⣙⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠿⠿⣿⣿⣿⣿⠿⠟⠛⠛⠁⠀⠘⠵⣻⡄⠸⣄⠳⣌⠳⣌⠧⣿⢰⢃⠘⡀⠰⣧⢸⠲⡍⠂⡌⢐⡃⢄⡉⢸⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿ +⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠀⢂⠤⡙⡄⢰⠁⠀⠀⢬⡷⣩⠎⡄⠁⠄⡈⠄⡁⢂⠌⠄⣉⠰⠀⢠⣿⡟⠉⠉⠉⠉⠀⠁⠈⠁⠀⠀⠀⠀⠈⣹⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡏⢡⣶⠾⠟⠋⠉⠀⠀⠀⢀⣀⣀⣠⣤⣤⡀⠓⠋⡀⢨⠓⣌⠳⣌⢳⡌⢠⡋⠄⠀⠐⣽⢸⠣⡅⢃⠐⢂⡅⢂⠰⠀⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿ +⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡟⠀⡌⢂⡜⠀⠃⠀⠀⡜⢲⡝⠂⣁⡀⠈⡀⠄⡐⠐⡠⢈⠂⢄⠒⠀⠈⣿⣷⣀⣠⣤⣤⣶⣶⣶⣶⣶⣶⣶⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣯⠁⠀⠀⠀⠀⠀⠶⠾⣿⣿⣿⣿⣿⣿⣿⣿⠄⠀⠱⠀⡹⢄⣛⠈⣁⡘⢂⣇⠈⠆⠀⢘⣯⠃⡜⣀⠊⢄⡒⠈⡔⠀⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿ +⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠇⡐⢌⠒⠆⡈⠀⢠⠘⣌⢻⠌⣸⣿⠇⠀⢀⠐⠠⢁⡐⠠⠌⠂⢌⠀⠀⢹⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣶⣦⣤⣄⣀⠀⠀⠀⠉⠙⠻⢿⣿⡏⠀⠐⡀⠅⢀⠣⠎⠐⣿⣧⡀⢺⡀⠌⢡⠘⣮⠑⡌⠤⠈⡔⢨⢁⠰⠈⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿ +⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠀⡰⢈⢜⡂⠀⢀⡎⠴⡨⡇⢰⣿⣿⡁⠀⠀⠌⡐⠠⠀⡡⠘⡈⠤⠀⠀⠀⢿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣷⣦⣄⣀⣠⣿⡟⠀⡈⠄⡐⠌⡄⢀⠩⠀⢿⣿⡄⠠⡇⠈⠄⠢⣝⠢⠜⡠⢃⡐⢃⠄⢊⠁⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿ +⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡏⠠⡐⠡⡸⠀⢠⢃⡜⢰⠱⠇⣼⣿⣿⠄⠀⠈⠄⠠⠁⠠⢂⠡⡐⠐⡀⢠⣶⡎⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡟⠀⠠⠀⢂⠄⠃⠀⣬⣂⠀⢼⣿⣧⠀⢳⠈⠌⢡⢘⡇⡱⠄⡃⠌⡆⡘⠤⠁⢹⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿ +⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠁⡰⢁⠣⡅⡘⢄⠺⡄⢣⠛⢰⣿⣿⣿⠀⠀⠌⠠⠁⣴⣆⠁⢂⠔⠡⠀⣿⣿⣿⡸⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠟⠀⠀⡅⠀⢠⣄⡀⢈⣿⣿⣄⠈⣿⣿⣄⠈⠧⡘⢀⠎⡖⢱⡈⠔⡡⢚⡀⢆⡁⢸⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿ +⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡯⠀⡔⢡⢊⡵⢈⠜⣸⠐⣣⠁⣾⣿⣿⠿⠀⠀⠌⢀⣾⣿⡏⠀⠌⡠⢁⠀⠻⣿⣿⣷⡜⢿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠿⠿⠿⠿⠿⠿⢿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⢋⣄⠀⡘⠀⠠⠘⢻⡻⣿⣿⣿⣿⠆⣿⣿⣧⠀⢃⠆⡡⢂⢝⠢⠜⡠⢁⠧⡈⢄⠒⢸⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿ +⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡇⠰⡈⢆⣩⠆⣅⠚⣤⠙⡄⠸⣽⣿⣿⠁⠀⠀⣠⣿⣿⡿⠰⠀⢂⡁⢂⠀⣆⡈⠻⣿⣿⣦⡹⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡄⣻⢖⡶⣹⢖⡶⣤⠦⠄⣹⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡿⣡⣿⡟⠠⠁⣀⠃⢀⢸⣿⣿⣿⣿⣿⡇⢿⣿⣿⡄⠈⢆⠡⢂⠌⣇⠓⠤⡉⢖⠡⠊⡌⢈⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿ +⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠅⢢⠑⡌⡲⢌⡄⣋⠴⣉⠀⣩⣿⣿⡏⠀⢀⣴⣿⣿⣿⢁⣿⡅⢀⠒⠠⢀⣿⣷⣆⡈⠛⠿⠛⠛⠻⠿⠿⠿⢿⣿⣿⣿⣿⣷⡈⠻⣜⣧⣻⡜⡧⠋⣴⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠿⣋⣴⣿⡿⠀⠀⠐⠤⠁⣾⣇⢹⣿⡿⢿⣿⣿⢸⣿⣿⣯⠀⢨⠂⡅⢊⡼⡘⠤⡑⢎⠰⢡⠘⡀⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿ +⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠀⢢⡉⠴⣙⠤⡘⢤⡓⠌⢠⣾⣿⣿⠀⣠⣾⣿⣿⣿⠇⣾⣿⣯⠀⠌⡡⠠⣿⣿⣿⣿⣦⣄⣀⠀⠂⠀⠀⠀⠀⠀⠀⠀⠉⠛⢿⣷⣬⣌⣁⣭⣴⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡟⣋⣥⣾⣿⣿⣿⢃⡆⠀⢩⢀⣾⣿⣿⡌⢿⣿⣎⣿⣿⡄⣿⣿⣿⡆⢀⠳⣸⠠⡹⢄⠣⡘⢼⢀⠣⡘⡀⢿⣿⣿⣿⣿⣿⣿⣿⣿⣿ +⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡷⢀⠣⡘⢔⡫⢰⡉⢦⠍⠂⣸⣿⣿⡿⠁⣾⡟⣽⣿⡟⣰⣿⣿⣿⡀⢂⠡⢐⣿⣿⣿⣿⣿⣿⣿⣷⣤⠀⠀⠀⠋⠀⠀⠂⠀⠀⣸⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠿⠋⣁⣀⣀⣉⣙⣛⣻⣿⣧⣞⠀⠨⢀⣾⣿⣿⣿⣿⡘⣿⣿⡜⣿⣷⠸⣿⣿⣷⡀⠱⢸⠅⣟⠄⢣⠑⢮⠠⢃⠴⠁⢺⣿⣿⣿⣿⣿⣿⣿⣿⣿ +⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡇⢈⣒⣉⠆⠛⣀⣈⣐⢃⣴⣿⣿⣿⠅⢘⣿⣽⢿⡿⢠⣿⣿⣿⣿⣧⠀⠆⢈⣿⣿⣿⣿⣿⣿⣿⣿⣿⣶⣶⢢⣤⡠⢤⣤⣤⡴⢿⣿⣿⣿⣿⣿⣿⡿⠿⣛⣭⠇⣠⡴⣹⣿⣿⣿⣿⣿⣿⣿⣿⣿⠇⠀⢠⣾⣿⣿⣿⣿⣿⣧⢹⣿⣷⣽⣿⡆⢿⣿⣿⣷⡄⢚⣉⣈⠋⠠⣍⣺⠀⠉⠦⣉⢸⣿⣿⣿⣿⣿⣿⣿⣿⣿ +⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠏⠠⠚⣃⣋⣰⣿⣿⣿⣟⣡⣿⣿⣿⣿⣿⣿⣿⡤⣶⢀⣾⣿⣿⣿⣿⣿⣂⠨⢀⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣬⠛⡓⢦⡙⠻⣿⣷⣬⣍⣛⣭⣵⣶⣾⡿⢋⣡⠞⣉⢰⣿⣿⣿⣿⣿⣿⣿⣿⣿⡟⠀⢀⣾⣿⣿⣿⣿⣿⣿⣿⡆⢩⣦⣛⣿⣿⣾⣿⣿⣿⣧⡙⢿⣿⣯⡑⣈⣑⣋⠳⢢⡀⠈⣿⣿⣿⣿⣿⣿⣿⣿⣿ +⣿⣿⣿⣿⣿⣿⣿⣿⣿⠃⡄⢰⣿⣿⣿⣷⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡔⡌⢿⣽⣿⣿⣿⣿⣿⣿⠄⠠⣿⣿⣿⣿⣿⣿⣿⣿⡿⢃⡿⣷⣶⠉⢢⡽⣷⣬⣙⠻⢿⣿⣿⠟⢋⣡⣴⢟⣡⡾⣽⣦⢿⣝⡻⣿⣿⣿⣿⣿⣿⠛⢀⣾⣿⣿⣿⣿⣿⣿⣿⡿⠻⠉⣄⣾⣿⣿⣿⣿⣿⣿⣿⣿⣼⣿⣿⣷⡘⣿⣿⡗⠀⢷⡀⣿⣿⣿⣿⣿⣿⣿⣿⣿ +⣿⣿⣿⣿⣿⣿⣿⣿⣇⢸⡁⠘⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣮⢽⠃⠙⢿⣿⣿⣿⣷⠀⢿⣿⣿⣿⣿⡿⠛⠁⣶⢏⣼⣿⣿⣷⣦⣿⣿⣿⣿⡗⢢⡙⣡⢾⣿⣿⣿⣿⣿⣿⣿⣿⣷⣟⣿⡈⠻⠿⣿⣿⣿⣷⣾⣿⣿⣿⣿⣿⡿⠟⠡⡄⣊⣾⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡗⠠⣸⠇⢹⣿⣿⣿⣿⣿⣿⣿⣿ +⣿⣿⣿⣿⣿⣿⣿⣿⠇⠸⣷⡀⢻⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣷⣀⠸⣦⣈⠻⢿⣿⣧⣿⣿⣿⣿⣿⠀⠘⡇⢻⣼⣿⣿⣿⣿⣿⣿⣿⣿⠿⢿⣦⠙⢹⠏⣿⣿⣿⣿⣿⣿⠟⢿⣿⣿⣿⠀⠳⣀⢻⣿⣿⣿⣿⣿⣿⣿⠿⢋⣤⡞⢠⣾⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠟⠀⣰⡿⢀⢸⣿⣿⣿⣿⣿⣿⣿⣿ +⣿⣿⣿⣿⣿⣿⣿⡏⠀⠀⠙⢷⡄⠹⢻⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣟⠀⠈⠙⢷⣆⡙⢿⣿⣿⣿⣿⣿⠁⢠⣆⠸⣿⣿⣿⣿⣿⣿⣿⣿⣿⠗⣀⣄⣤⣤⣌⡐⢼⣿⣿⡿⠁⢰⡦⢙⠿⡿⢀⣃⠈⣿⣿⣿⣿⣿⣿⠛⣡⡶⠟⠁⠀⢸⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠟⠋⢀⣼⠟⠀⠠⠈⣿⣿⣿⣿⣿⣿⣿⣿ +⣿⣿⣿⣿⣿⣿⡟⠀⠀⠀⠀⠈⠛⢷⣄⡙⠻⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡗⠀⠀⠀⠀⠙⢷⣆⠹⣿⣿⡿⠃⠄⣸⡆⠀⢻⣿⣿⣿⣿⣿⣿⡟⠁⢰⡿⣯⢿⡽⣯⢿⡀⢻⣿⠁⢠⣧⣶⡏⣰⠁⢸⣇⠀⠈⣿⣿⣿⠏⢀⣶⠟⠁⠀⠀⠀⠘⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠿⠉⣀⣴⠿⠉⠀⠀⠀⠁⠸⣿⣿⣿⣿⣿⣿⣿ +⣿⣿⣿⣿⣿⡿⠁⠀⠀⠀⠀⠀⠀⠀⠉⠻⢶⣄⡙⠛⢿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡟⠀⠀⠀⠀⠀⠀⠀⠙⣷⡌⠻⣧⠐⣰⣿⣷⠀⠈⢿⣿⣿⣿⡿⠋⡁⠔⢺⠿⣽⢫⡽⣯⣟⠲⠄⡙⠿⣦⣍⡛⣰⠏⠀⣿⣿⡄⠀⢨⡿⠃⣴⡟⠁⠀⠀⠀⠀⠀⠀⠙⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡿⠏⢁⣁⣴⠞⠋⠁⠀⠀⠀⠀⠀⠀⠀⢹⣿⣿⣿⣿⣿⣿ +⣿⣿⣿⣿⣿⠃⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠉⠛⠷⣦⣄⡉⠛⠻⢿⣿⣿⣿⣿⠋⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⢿⣄⠁⣰⣾⣿⣿⣧⠀⠈⠉⢉⣀⣴⡾⣷⡀⠈⢻⣓⣯⣙⡳⠃⣀⣶⣌⣐⠠⢠⡉⢀⠀⣶⡿⣿⣿⣄⠘⠁⣼⠏⠀⠀⠀⠀⠀⠀⠀⠀⠀⠐⢯⢿⣿⡿⡿⠻⠛⢉⣀⣤⡾⠛⠉⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢻⣿⣿⣿⣿⣿ +⣿⣿⣿⣿⠏⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠉⠙⠻⠶⣤⡈⠉⠙⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⢁⠂⠀⣿⠀⠙⣿⣿⣽⣿⣿⣿⣷⣾⡿⣷⣻⢷⣻⠀⢠⣟⡾⣽⢣⠀⣾⣿⣿⣻⣷⣶⣶⣿⣯⣿⣷⢿⣿⡟⠀⢸⠃⠀⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠉⠉⢀⣠⡴⠚⠋⠉⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⢿⣿⣿⣿⣿ +⣿⣿⣿⡟⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠙⠙⠲⢍⡖⣆⠦⠤⠤⠤⢠⣄⡌⣤⢤⣤⣙⠖⢠⣿⣿⣻⣾⣿⣿⣿⣷⣿⣳⣽⣻⣿⠇⢸⣞⡽⣽⢫⠐⠿⣿⣷⣿⣿⣿⣿⣿⣿⣿⣿⣾⣿⡃⠐⣮⣤⢤⠤⣤⠤⣄⠤⠤⢤⢒⡤⢎⡜⠣⠛⠉⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠘⣿⣿⣿⣿ +⣿⣿⡟⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠉⠉⠓⠉⠓⠾⠜⠻⠞⠙⠁⣰⣾⣿⣿⣽⣿⣿⣿⣿⣿⣷⣿⣞⣿⣿⠀⢸⣎⣟⢮⣏⠀⢺⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣦⣀⠙⠋⠛⠲⠛⠜⠉⠛⠈⠁⠈⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠹⣿⣿⣿ +⣿⡿⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢺⠀⣿⣿⣿⣿⣷⣿⣿⣿⣿⣿⣿⣿⣿⣿⣯⣿⠀⢸⡮⣝⡞⡼⠀⣸⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡄⢸⢀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢹⣿⣿ +⣿⠃⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣴⣿⠀⠀⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡿⠀⡿⣼⡹⣜⡱⠂⣽⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡅⠈⢸⣷⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢻⣿ +⠇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣴⣿⡿⢃⠀⡿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⢠⢳⢧⡝⢦⡹⡁⢹⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣷⠄⢈⠻⣿⣧⡄⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⢿ +⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⡰⢻⣿⣿⠇⠀⢀⣾⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡏⢰⣋⢶⡹⢎⡵⣁⢸⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣯⣝⢿⣿⣿⡄⠈⠰⣿⣿⣿⣦⣀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈ +⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣰⣿⣿⡘⣿⠅⠠⠀⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡇⠸⡜⡶⣩⢳⢎⡵⢸⣿⣿⣿⡏⠹⠿⠿⠟⠻⠛⡟⠻⠟⠀⣿⣿⣷⡀⠠⠙⣿⡏⣸⣿⣶⣀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ +⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣴⣿⣿⣿⣿⡇⠝⠀⠀⢠⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠂⢼⡹⣱⢏⡾⣘⠖⠘⣿⣿⣿⣿⣦⣉⣉⣭⣭⣤⣭⣤⣈⣸⣿⣿⣿⣧⠀⠘⢿⢀⣿⣿⣿⣿⣦⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ +⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣠⣾⣿⣿⣿⣿⣿⣿⠀⠊⢀⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠀⢧⡛⡽⢪⠵⣩⠞⠀⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⠹⣿⣿⣿⣿⣆⠈⠀⢸⣿⣿⣿⣿⣿⣿⣦⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ +⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢠⣾⣿⣿⣿⣿⣿⣿⣿⡿⠂⠀⢸⣿⣿⣿⣟⡳⢯⣛⠿⣻⢿⡿⣿⠻⣟⣿⣿⣿⣿⠀⣎⠵⣩⢳⡙⢦⢫⠄⢻⣿⣿⣿⣿⢿⣻⡟⣿⢫⠟⡵⢪⢇⣹⣿⣿⣿⣿⡇⢈⠹⣿⣿⣿⣿⣿⣿⣿⣷⣆⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ +⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣴⣿⣿⣿⣿⣿⣿⣿⣿⣿⡆⠀⣠⣾⢿⣿⡗⢮⡑⢣⠘⡬⢑⠮⡑⢎⡱⢎⡞⡽⢹⡃⠀⡎⢧⠣⢧⣝⢣⢏⠆⡸⣏⠿⣱⢎⢳⡘⡜⢢⢋⡜⢌⡑⢊⠴⢻⣿⣿⣿⡇⠈⢸⣿⣿⣿⣿⣿⣿⣿⣿⣿⣶⣄⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ + + + \ No newline at end of file From 7cbc5bf4f32e6550ce9abd3981dff94d08bcd2db Mon Sep 17 00:00:00 2001 From: mr-forust Date: Wed, 26 Nov 2025 17:00:44 +0100 Subject: [PATCH 054/100] feat: edu phpsessid updater bot --- edu_master/.env.example | 7 + edu_master/backend/Dockerfile | 15 -- edu_master/backend/extra_requirements.txt | 1 - edu_master/compose.yaml | 264 +--------------------- edu_master/lessons_bot/Dockerfile | 16 -- edu_master/lessons_bot/config.py | 26 --- edu_master/lessons_bot/handlers.py | 131 ----------- edu_master/lessons_bot/main.py | 42 ---- edu_master/lessons_bot/requirements.txt | 5 - edu_master/lessons_bot/utils.py | 258 --------------------- edu_master/nginx/entrypoint.sh | 8 - edu_master/nginx/nginx.conf | 87 ------- edu_master/phpsessid-bot/Dockerfile | 12 + edu_master/phpsessid-bot/bot.py | 103 +++++++++ edu_master/phpsessid_bot/Dockerfile | 15 -- edu_master/phpsessid_bot/main.py | 216 ------------------ edu_master/phpsessid_bot/requirements.txt | 3 - 17 files changed, 128 insertions(+), 1081 deletions(-) create mode 100644 edu_master/.env.example delete mode 100644 edu_master/backend/Dockerfile delete mode 100644 edu_master/backend/extra_requirements.txt delete mode 100644 edu_master/lessons_bot/Dockerfile delete mode 100644 edu_master/lessons_bot/config.py delete mode 100644 edu_master/lessons_bot/handlers.py delete mode 100644 edu_master/lessons_bot/main.py delete mode 100644 edu_master/lessons_bot/requirements.txt delete mode 100644 edu_master/lessons_bot/utils.py delete mode 100644 edu_master/nginx/entrypoint.sh delete mode 100644 edu_master/nginx/nginx.conf create mode 100644 edu_master/phpsessid-bot/Dockerfile create mode 100644 edu_master/phpsessid-bot/bot.py delete mode 100644 edu_master/phpsessid_bot/Dockerfile delete mode 100644 edu_master/phpsessid_bot/main.py delete mode 100644 edu_master/phpsessid_bot/requirements.txt diff --git a/edu_master/.env.example b/edu_master/.env.example new file mode 100644 index 0000000..70573f0 --- /dev/null +++ b/edu_master/.env.example @@ -0,0 +1,7 @@ +EDU_LOGIN=login +EDU_PASSWORD=password +EDU_URL_LOGIN=https://edu.edu.vn.ua/user/login +EDU_URL_VERIFY=https://edu.edu.vn.ua/course/userlist +EDU_INTERVAL=10 +EDU_USER_AGENT="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/142.0.0.0 Safari/537.36" +EDU_PHPSESSID= diff --git a/edu_master/backend/Dockerfile b/edu_master/backend/Dockerfile deleted file mode 100644 index 89681fd..0000000 --- a/edu_master/backend/Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -ARG VERSION -# Use the official WaterCrawl image as the base image -FROM watercrawl/watercrawl:${VERSION:-v0.10.2} - -# Set working directory -WORKDIR /var/www - -# Copy the extra requirements file -COPY extra_requirements.txt /var/www/extra_requirements.txt - -# Install any additional packages -RUN poetry run pip install -r /var/www/extra_requirements.txt - -# The rest of the configuration is inherited from the base image -# The entrypoint and command should be defined in docker-compose.yml diff --git a/edu_master/backend/extra_requirements.txt b/edu_master/backend/extra_requirements.txt deleted file mode 100644 index 54bb109..0000000 --- a/edu_master/backend/extra_requirements.txt +++ /dev/null @@ -1 +0,0 @@ -# Add your additional Python packages here, one per line diff --git a/edu_master/compose.yaml b/edu_master/compose.yaml index 0aa1fbd..13284c6 100644 --- a/edu_master/compose.yaml +++ b/edu_master/compose.yaml @@ -1,262 +1,10 @@ -x-app: &app - build: - context: ./backend/ - dockerfile: Dockerfile - args: - - VERSION=${VERSION:-v0.10.2} - depends_on: - db: - condition: service_healthy - dns: - - 8.8.8.8 - - 1.1.1.1 - environment: - - SECRET_KEY=${SECRET_KEY:-django-insecure-el4wo4a4--=f0+ag#omp@^w4eq^8v4(scda&1a(td_y2@=sh6&} - - API_ENCRYPTION_KEY=${API_ENCRYPTION_KEY:-8zSd6JIuC7ovfZ4AoxG_XmhubW6CPnQWW7Qe_4TD1TQ=} - - DEBUG=${DEBUG:-True} - - ALLOWED_HOSTS=${ALLOWED_HOSTS:-*} - - LANGUAGE_CODE=${LANGUAGE_CODE:-en-us} - - TIME_ZONE=${TIME_ZONE:-UTC} - - USE_I18N=${USE_I18N:-True} - - USE_TZ=${USE_TZ:-True} - - STATIC_ROOT=${STATIC_ROOT:-storage/static/} - - MEDIA_ROOT=${MEDIA_ROOT:-storage/media/} - - LOG_LEVEL=${LOG_LEVEL:-INFO} - - REDIS_URL=${REDIS_URL:-redis://redis:6379/1} - - DATABASE_URL=postgres://${POSTGRES_USER:-postgres}:${POSTGRES_PASSWORD:-postgres}@${POSTGRES_HOST:-db}:${POSTGRES_PORT:-5432}/${POSTGRES_DB:-postgres} - - CELERY_BROKER_URL=${CELERY_BROKER_URL:-redis://redis:6379/0} - - CELERY_RESULT_BACKEND=${CELERY_RESULT_BACKEND:-django-db} - - REDIS_LOCKER_URL=${REDIS_LOCKER_URL:-redis://redis:6379/3} - - MINIO_ENDPOINT=minio:9000 - - MINIO_EXTERNAL_ENDPOINT=nginx - - MINIO_REGION=us-east-1 - - MINIO_ACCESS_KEY=minio - - MINIO_SECRET_KEY=minio123 - - MINIO_USE_HTTPS=False - - MINIO_EXTERNAL_ENDPOINT_USE_HTTPS=False - - MINIO_URL_EXPIRY_HOURS=7 - - MINIO_PRIVATE_BUCKET=private - - MINIO_PUBLIC_BUCKET=public - - CSRF_TRUSTED_ORIGINS=${CSRF_TRUSTED_ORIGINS:-} - - CORS_ALLOWED_ORIGINS=${CORS_ALLOWED_ORIGINS:-} - - CORS_ALLOWED_ORIGIN_REGEXES=${CORS_ALLOWED_ORIGIN_REGEXES:-} - - CORS_ALLOW_ALL_ORIGINS=${CORS_ALLOW_ALL_ORIGINS:-False} - - FRONTEND_URL=${FRONTEND_URL:-http://localhost} - - IS_LOGIN_ACTIVE=${IS_LOGIN_ACTIVE:-True} - - IS_SIGNUP_ACTIVE=${IS_SIGNUP_ACTIVE:-True} - - IS_GITHUB_LOGIN_ACTIVE=${IS_GITHUB_LOGIN_ACTIVE:-True} - - IS_GOOGLE_LOGIN_ACTIVE=${IS_GOOGLE_LOGIN_ACTIVE:-True} - - GITHUB_CLIENT_ID=${GITHUB_CLIENT_ID:-} - - GITHUB_CLIENT_SECRET=${GITHUB_CLIENT_SECRET:-} - - GOOGLE_CLIENT_ID=${GOOGLE_CLIENT_ID:-} - - GOOGLE_CLIENT_SECRET=${GOOGLE_CLIENT_SECRET:-} - - ACCESS_TOKEN_LIFETIME_MINUTES=${ACCESS_TOKEN_LIFETIME_MINUTES:-5} - - REFRESH_TOKEN_LIFETIME_DAYS=${REFRESH_TOKEN_LIFETIME_DAYS:-30} - - EMAIL_BACKEND=${EMAIL_BACKEND:-django.core.mail.backends.smtp.EmailBackend} - - EMAIL_HOST=${EMAIL_HOST:-} - - EMAIL_PORT=${EMAIL_PORT:-587} - - EMAIL_USE_TLS=${EMAIL_USE_TLS:-True} - - EMAIL_HOST_USER=${EMAIL_HOST_USER:-} - - EMAIL_HOST_PASSWORD=${EMAIL_HOST_PASSWORD:-} - - DEFAULT_FROM_EMAIL=${DEFAULT_FROM_EMAIL:-} - - SCRAPY_USER_AGENT=${SCRAPY_USER_AGENT:-WaterCrawl/0.1 (+https://github.com/watercrawl/watercrawl)} - - SCRAPY_ROBOTSTXT_OBEY=${SCRAPY_ROBOTSTXT_OBEY:-True} - - SCRAPY_CONCURRENT_REQUESTS=${SCRAPY_CONCURRENT_REQUESTS:-16} - - SCRAPY_DOWNLOAD_DELAY=${SCRAPY_DOWNLOAD_DELAY:-0} - - SCRAPY_CONCURRENT_REQUESTS_PER_DOMAIN=${SCRAPY_CONCURRENT_REQUESTS_PER_DOMAIN:-4} - - SCRAPY_CONCURRENT_REQUESTS_PER_IP=${SCRAPY_CONCURRENT_REQUESTS_PER_IP:-4} - - SCRAPY_COOKIES_ENABLED=${SCRAPY_COOKIES_ENABLED:-False} - - SCRAPY_HTTPCACHE_ENABLED=${SCRAPY_HTTPCACHE_ENABLED:-True} - - SCRAPY_HTTPCACHE_EXPIRATION_SECS=${SCRAPY_HTTPCACHE_EXPIRATION_SECS:-3600} - - SCRAPY_HTTPCACHE_DIR=${SCRAPY_HTTPCACHE_DIR:-httpcache} - - SCRAPY_LOG_LEVEL=${SCRAPY_LOG_LEVEL:-ERROR} - - SCRAPY_GOOGLE_API_KEY=${SCRAPY_GOOGLE_API_KEY:-} - - SCRAPY_GOOGLE_CSE_ID=${SCRAPY_GOOGLE_CSE_ID:-} - - SCRAPY_MAX_NUMBER_OF_SITEMAP_URLS=${SCRAPY_MAX_NUMBER_OF_SITEMAP_URLS:-20000} - - SCRAPY_SITEMAP_CRAWL_PAGE_LIMIT=${SCRAPY_SITEMAP_CRAWL_PAGE_LIMIT:-100} - - PLAYWRIGHT_SERVER=${PLAYWRIGHT_SERVER:-http://playwright:8000} - - PLAYWRIGHT_API_KEY=${PLAYWRIGHT_API_KEY:-your-secret-api-key} - - OPENAI_API_KEY=${OPENAI_API_KEY:-} - - STRIPE_SECRET_KEY=${STRIPE_SECRET_KEY:-} - - STRIPE_WEBHOOK_SECRET=${STRIPE_WEBHOOK_SECRET:-} - - GOOGLE_ANALYTICS_ID=${GOOGLE_ANALYTICS_ID:-} - - IS_ENTERPRISE_MODE_ACTIVE=${IS_ENTERPRISE_MODE_ACTIVE:-False} - - MAX_CRAWL_DEPTH=${MAX_CRAWL_DEPTH:--1} - - CAPTURE_USAGE_HISTORY=${CAPTURE_USAGE_HISTORY:-True} - - MCP_SERVER=${MCP_SERVER:-http://localhost/sse} - networks: - - traefik-proxy - - default - - n8n - -x-frontend: &frontend - image: watercrawl/frontend:${VERSION:-v0.10.2} - environment: - - VITE_API_BASE_URL=${API_BASE_URL:-http://localhost/api} - depends_on: - - app - services: - nginx: - image: nginx:alpine - volumes: - - ./nginx/nginx.conf:/etc/nginx/conf.d/default.conf.template - - ./nginx/entrypoint.sh:/entrypoint.sh - environment: - - MINIO_PRIVATE_BUCKET=${MINIO_PRIVATE_BUCKET:-private} - - MINIO_PUBLIC_BUCKET=${MINIO_PUBLIC_BUCKET:-public} - command: ["/bin/sh", "/entrypoint.sh"] - depends_on: - - app - - frontend - - minio + session-keeper: + build: ./phpsessid-bot + env_file: .env restart: unless-stopped - networks: - - traefik-proxy - - n8n - - labels: - - "traefik.enable=true" - - "traefik.docker.network=traefik-proxy" - - app: - <<: *app - command: [ "gunicorn", "-b", "0.0.0.0:9000", "-w", "2", "watercrawl.wsgi:application", "--access-logfile", "-", "--error-logfile", "-", "--timeout", "60" ] - - celery: - <<: *app - command: [ "celery", "-A", "watercrawl", "worker", "-l", "info", "-S", "django" ] - dns: - - 1.1.1.1 - - 8.8.8.8 - - celery-beat: - <<: *app - command: [ "celery", "-A", "watercrawl", "beat", "-l", "info", "-S", "django" ] - - frontend: - <<: *frontend - command: [ "npm", "run", "serve" ] - - minio: - image: minio/minio:RELEASE.2024-11-07T00-52-20Z - restart: unless-stopped - volumes: - - ./volumes/minio-data:/data - command: server /data --console-address ":9001" - environment: - - MINIO_BROWSER_REDIRECT_URL=${MINIO_BROWSER_REDIRECT_URL:-http://localhost/minio-console/} - - MINIO_SERVER_URL=${MINIO_SERVER_URL:-http://localhost/} - - MINIO_ROOT_USER=${MINIO_ACCESS_KEY:-minio} - - MINIO_ROOT_PASSWORD=${MINIO_SECRET_KEY:-minio123} - - playwright: - image: watercrawl/playwright:1.1 - restart: unless-stopped - user: root - environment: - - AUTH_API_KEY=${PLAYWRIGHT_API_KEY:-your-secret-api-key} - - PORT=${PLAYWRIGHT_PORT:-8000} - - HOST=${PLAYWRIGHT_HOST:-0.0.0.0} - dns: - - 8.8.8.8 - - 1.1.1.1 - networks: - - traefik-proxy - - n8n - - db: - image: postgres:17.2-alpine3.21 - restart: unless-stopped - environment: - - POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-postgres} - - POSTGRES_USER=${POSTGRES_USER:-postgres} - - POSTGRES_DB=${POSTGRES_DB:-postgres} - volumes: - - ./volumes/postgres-db:/var/lib/postgresql/data healthcheck: - test: [ "CMD-SHELL", "pg_isready" ] - interval: 10s + test: ["CMD-SHELL", "test $(find /tmp/last_success -mmin -15)"] + interval: 1m timeout: 5s - retries: 5 - - mcp: - image: watercrawl/mcp:v1.2.0 - restart: unless-stopped - command: [ "sse", "--base-url", "http://app:9000", '--port', '3000', '--endpoint', '/sse' ] - networks: - - n8n - - redis: - image: redis:latest - restart: unless-stopped - - llm: - image: ollama/ollama:latest - restart: unless-stopped - volumes: - - ./volumes/ollama-models:/root/.ollama - environment: - - OLLAMA_DISABLE_TELEMETRY=true - - OLLAMA_KEEP_ALIVE=5m - - OLLAMA_HOST=0.0.0.0:11434 - - OLLAMA_NUM_PARALLEL=1 - - OLLAMA_MAX_LOADED_MODELS=1 - dns: - - 1.1.1.1 - - 8.8.8.8 - networks: - - n8n - -# docker exec -it edu_master-llm-1 ollama pull neural-chat:7b-q4 -# docker exec -it edu_master-llm-1 ollama pull mistral:7b-q4 - - # lessons-bot: - # build: - # context: edu_master/lessons_bot/ - # dockerfile: Dockerfile - # restart: unless-stopped - # environment: - # - LESSONS_BOT_TOKEN=${LESSONS_BOT_TOKEN} - # - N8N_WEBHOOK_URL=${N8N_WEBHOOK_URL:-http://n8n:5678/webhook-test/get-lessons} - # - N8N_SECRET=${N8N_SECRET:-your-secret-token-here} - # - WATERCRAWL_API_URL=${WATERCRAWL_API_URL:-http://app:9000/api} - # - PHPSESSID_BOT_URL=${PHPSESSID_BOT_URL:-http://phpsessid-bot:5000} - # - EDU_HOST=${EDU_HOST:-edu.edu.vn.ua} - # depends_on: - # - n8n - # - app - # - phpsessid-bot - # dns: - # - 1.1.1.1 - # - 8.8.8.8 - # networks: - # - default - - phpsessid-bot: - build: - context: ./phpsessid_bot/ - dockerfile: Dockerfile - restart: unless-stopped - environment: - - EDU_HOST=${EDU_HOST:-edu.edu.vn.ua} - - EDU_LOGIN=${EDU_LOGIN} - - EDU_PASSWORD=${EDU_PASSWORD} - - BOT_PORT=${PHPSESSID_BOT_PORT:-5000} - - BOT_HOST=${PHPSESSID_BOT_HOST:-0.0.0.0} - dns: - - 1.1.1.1 - - 8.8.8.8 - networks: - - default - - -volumes: - n8n_data: - postgres-db: - minio-data: - ollama-models: - lmstudio_data: -networks: - traefik-proxy: - external: true + retries: 3 diff --git a/edu_master/lessons_bot/Dockerfile b/edu_master/lessons_bot/Dockerfile deleted file mode 100644 index 1af5983..0000000 --- a/edu_master/lessons_bot/Dockerfile +++ /dev/null @@ -1,16 +0,0 @@ -FROM python:3.11-slim - -WORKDIR /app - -# Установка зависимостей -COPY requirements.txt . -RUN pip install --no-cache-dir -r requirements.txt - -# Копирование кода -COPY config.py . -COPY utils.py . -COPY handlers.py . -COPY main.py . - -# Запуск бота -CMD ["python", "-u", "main.py"] \ No newline at end of file diff --git a/edu_master/lessons_bot/config.py b/edu_master/lessons_bot/config.py deleted file mode 100644 index 8326eca..0000000 --- a/edu_master/lessons_bot/config.py +++ /dev/null @@ -1,26 +0,0 @@ -import os -from dotenv import load_dotenv - -load_dotenv() - -# Telegram -BOT_TOKEN = os.getenv('LESSONS_BOT_TOKEN') - -# n8n -N8N_WEBHOOK_URL = os.getenv('N8N_WEBHOOK_URL', 'http://n8n:5678/webhook/homework-check') -N8N_SECRET = os.getenv('N8N_SECRET', 'your-secret-token-here') - -# WaterCrawl API -WATERCRAWL_API_URL = os.getenv('WATERCRAWL_API_URL', 'http://app:9000/api') - -# PHPSESSID Bot -PHPSESSID_BOT_URL = os.getenv('PHPSESSID_BOT_URL', 'http://phpsessid-bot:5000') - -# EDU site -EDU_HOST = os.getenv('EDU_HOST', 'edu.edu.vn.ua') -EDU_WEBINAR_URL = f'https://{EDU_HOST}/webinar/useractive' - -# Playwright -PLAYWRIGHT_SERVER = os.getenv('PLAYWRIGHT_SERVER', 'http://playwright:8000') -PLAYWRIGHT_API_KEY = os.getenv('PLAYWRIGHT_API_KEY', 'your-secret-api-key') -WEBINAR_WAIT_TIME = int(os.getenv('WEBINAR_WAIT_TIME', '3')) # Секунды ожидания загрузки \ No newline at end of file diff --git a/edu_master/lessons_bot/handlers.py b/edu_master/lessons_bot/handlers.py deleted file mode 100644 index 5ff92dc..0000000 --- a/edu_master/lessons_bot/handlers.py +++ /dev/null @@ -1,131 +0,0 @@ -import logging -import requests -from telegram import Update -from telegram.ext import ContextTypes -import config -from utils import fetch_webinars, format_webinar_message - -logger = logging.getLogger(__name__) - - -async def start(update: Update, context: ContextTypes.DEFAULT_TYPE): - """Команда /start""" - welcome_message = """ -Привет! Я бот для проверки домашних заданий и вебинаров. - -Команды: -/check - Проверить несделанные уроки -/webinar - Проверить активные онлайн уроки -/help - Помощь - """ - await update.message.reply_text(welcome_message, parse_mode='HTML') - - -async def help_command(update: Update, context: ContextTypes.DEFAULT_TYPE): - """Команда /help""" - help_text = """ -Как пользоваться ботом: - -/check - Проверка домашних заданий -- Поиск несделанных уроков - -⏱ Проверка занимает 10-30 секунд - -/webinar - Активные онлайн уроки -- Проверка активных вебинаровв -⏱ Проверка занимает 3-5 секунд - """ - await update.message.reply_text(help_text, parse_mode='HTML') - - -async def check_homework(update: Update, context: ContextTypes.DEFAULT_TYPE): - """Команда /check - запускает проверку уроков""" - chat_id = update.effective_chat.id - user_id = update.effective_user.id - username = update.effective_user.username or "unknown" - - # Отправляем уведомление что начали работу - status_message = await update.message.reply_text("Запускаю проверку уроков...") - - # Формируем данные для n8n - payload = { - "chat_id": chat_id, - "user_id": user_id, - "username": username, - "timestamp": update.message.date.isoformat() - } - - headers = { - "Authorization": f"Bearer {config.N8N_SECRET}", - "Content-Type": "application/json" - } - - try: - logger.info(f"Sending request to n8n for user {user_id}") - - # Отправляем запрос в n8n - response = requests.post( - config.N8N_WEBHOOK_URL, - json=payload, - headers=headers, - timeout=5 # Короткий таймаут т.к. это асинхронный запрос - ) - - if response.status_code == 200: - await status_message.edit_text( - "✅ Запрос принят!\n" - "🔄 Парсинг сайта и анализ данных...\n" - "⏱ Это займет 10-30 секунд" - ) - logger.info(f"Request accepted for user {user_id}") - else: - await status_message.edit_text( - f"Ошибка при отправке запроса. Функция в разработке\n" - f"Код: {response.status_code}" - ) - logger.error(f"n8n returned status {response.status_code}") - - except requests.Timeout: - await status_message.edit_text("⏱ Запрос обрабатывается (таймаут соединения)") - logger.warning(f"Timeout for user {user_id}") - except Exception as e: - await status_message.edit_text(f"❌ Ошибка: {str(e)}") - logger.error(f"Error for user {user_id}: {e}", exc_info=True) - - -async def check_webinar(update: Update, context: ContextTypes.DEFAULT_TYPE): - """Команда /webinar - проверяет активные онлайн уроки""" - user_id = update.effective_user.id - - # Отправляем уведомление что начали работу - status_message = await update.message.reply_text("Проверяю активные вебинары...") - - try: - logger.info(f"Checking webinars for user {user_id}") - - # Получаем список вебинаров - webinars = fetch_webinars() - - if webinars is None: - await status_message.edit_text( - "❌ Не удалось получить информацию о вебинарах\n" - "Попробуйте позже или обратитесь к администратору\n" - "|@MrForust|mr.forust| Либо же прямо сюда." - ) - logger.error(f"Failed to fetch webinars for user {user_id}") - return - - # Форматируем и отправляем результат - message = format_webinar_message(webinars) - await status_message.edit_text(message, parse_mode='HTML', disable_web_page_preview=True) - - logger.info(f"Webinar check completed for user {user_id}: found {len(webinars)} webinars") - - except Exception as e: - await status_message.edit_text(f"❌ Ошибка: {str(e)}") - logger.error(f"Error checking webinars for user {user_id}: {e}", exc_info=True) - - -async def error_handler(update: Update, context: ContextTypes.DEFAULT_TYPE): - """Обработчик ошибок""" - logger.error(f"Update {update} caused error {context.error}", exc_info=context.error) diff --git a/edu_master/lessons_bot/main.py b/edu_master/lessons_bot/main.py deleted file mode 100644 index 5758598..0000000 --- a/edu_master/lessons_bot/main.py +++ /dev/null @@ -1,42 +0,0 @@ -import logging -from telegram import Update -from telegram.ext import Application, CommandHandler -import config -from handlers import start, help_command, check_homework, check_webinar, error_handler - -# Настройка логирования -logging.basicConfig( - format='%(asctime)s - %(name)s - %(levelname)s - %(message)s', - level=logging.INFO -) -logger = logging.getLogger(__name__) - - -def main(): - """Запуск бота""" - if not config.BOT_TOKEN: - logger.error("LESSONS_BOT_TOKEN not set!") - return - - # Создаем приложение - application = Application.builder().token(config.BOT_TOKEN).build() - - # Регистрируем обработчики команд - application.add_handler(CommandHandler("start", start)) - application.add_handler(CommandHandler("help", help_command)) - application.add_handler(CommandHandler("check", check_homework)) - application.add_handler(CommandHandler("webinar", check_webinar)) - - # Регистрируем обработчик ошибок - application.add_error_handler(error_handler) - - # Запускаем бота - logger.info("Lessons Bot started!") - logger.info(f"PHPSESSID Bot URL: {config.PHPSESSID_BOT_URL}") - logger.info(f"n8n Webhook URL: {config.N8N_WEBHOOK_URL}") - - application.run_polling(allowed_updates=Update.ALL_TYPES) - - -if __name__ == '__main__': - main() \ No newline at end of file diff --git a/edu_master/lessons_bot/requirements.txt b/edu_master/lessons_bot/requirements.txt deleted file mode 100644 index 9753745..0000000 --- a/edu_master/lessons_bot/requirements.txt +++ /dev/null @@ -1,5 +0,0 @@ -python-telegram-bot==20.7 -requests==2.31.0 -beautifulsoup4==4.12.2 -python-dotenv==1.0.0 -lxml==4.9.3 diff --git a/edu_master/lessons_bot/utils.py b/edu_master/lessons_bot/utils.py deleted file mode 100644 index 7e3c57b..0000000 --- a/edu_master/lessons_bot/utils.py +++ /dev/null @@ -1,258 +0,0 @@ -import logging -import requests -from bs4 import BeautifulSoup -from typing import Optional, Dict, List -import config - -logger = logging.getLogger(__name__) - - -def get_phpsessid() -> Optional[str]: - """ - Получает валидный PHPSESSID через phpsessid-bot - - Returns: - str: PHPSESSID или None в случае ошибки - """ - try: - url = f"{config.PHPSESSID_BOT_URL}/get-session" - logger.info(f"Requesting PHPSESSID from {url}") - - response = requests.post(url, timeout=10) - - if response.status_code == 200: - data = response.json() - if data.get('success'): - phpsessid = data.get('phpsessid') - logger.info(f"Got PHPSESSID: {phpsessid[:10]}...") - return phpsessid - else: - logger.error(f"Failed to get PHPSESSID: {data.get('error')}") - return None - else: - logger.error(f"PHPSESSID bot returned status {response.status_code}") - return None - - except Exception as e: - logger.error(f"Error getting PHPSESSID: {e}", exc_info=True) - return None - - -def parse_webinar_table(html_content: str) -> List[Dict[str, str]]: - """ - Парсит таблицу с вебинарами - - Args: - html_content: HTML контент страницы - - Returns: - List[Dict]: Список вебинаров или пустой список - """ - try: - soup = BeautifulSoup(html_content, 'html.parser') - - # Находим таблицу с вебинарами - meetings_div = soup.find('div', {'id': 'meetings'}) - if not meetings_div: - logger.warning("meetings div not found") - return [] - - table = meetings_div.find('table', {'class': 'table table-zebra'}) - if not table: - logger.warning("table not found") - return [] - - tbody = table.find('tbody') - if not tbody: - logger.warning("tbody not found") - return [] - - rows = tbody.find_all('tr') - if not rows: - return [] - - # Проверяем на сообщение "Жодного онлайн уроку зараз" - first_row = rows[0] - td = first_row.find('td') - if td and 'Жодного онлайн уроку зараз' in td.get_text(strip=True): - logger.info("No webinars available") - return [] - - # Парсим активные вебинары - webinars = [] - for row in rows: - tds = row.find_all('td') - if len(tds) >= 4: - webinar = { - 'topic': tds[0].get_text(strip=True), - 'course': tds[1].get_text(strip=True), - 'teacher': tds[2].get_text(strip=True), - 'join_link': tds[3].find('a')['href'] if tds[3].find('a') else '' - } - webinars.append(webinar) - - logger.info(f"Parsed {len(webinars)} webinars") - return webinars - - except Exception as e: - logger.error(f"Error parsing webinar table: {e}", exc_info=True) - return [] - - -def fetch_webinars_with_playwright() -> Optional[List[Dict[str, str]]]: - """ - Получает список активных вебинаров используя Playwright для динамического контента - - Returns: - List[Dict]: Список вебинаров или None в случае ошибки - """ - # Получаем PHPSESSID - phpsessid = get_phpsessid() - if not phpsessid: - logger.error("Failed to get PHPSESSID") - return None - - try: - # Подготавливаем cookies для Playwright - cookies = [ - { - 'name': 'PHPSESSID', - 'value': phpsessid, - 'domain': config.EDU_HOST, - 'path': '/' - } - ] - - # Запрос к Playwright серверу - playwright_request = { - 'url': config.EDU_WEBINAR_URL, - 'cookies': cookies, - 'wait_until': 'networkidle', # Ждем пока сеть успокоится - 'wait_time': config.WEBINAR_WAIT_TIME * 1000, # Дополнительное ожидание в миллисекундах - 'user_agent': 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/141.0.0.0 Safari/537.36' - } - - headers = { - 'Authorization': f'Bearer {config.PLAYWRIGHT_API_KEY}', - 'Content-Type': 'application/json' - } - - logger.info(f"Fetching webinars via Playwright from {config.EDU_WEBINAR_URL}") - logger.info(f"Will wait {config.WEBINAR_WAIT_TIME} seconds for dynamic content") - - response = requests.post( - f"{config.PLAYWRIGHT_SERVER}/render", - json=playwright_request, - headers=headers, - timeout=30 - ) - - if response.status_code != 200: - logger.error(f"Playwright server returned status {response.status_code}") - logger.error(f"Response: {response.text}") - return None - - result = response.json() - html_content = result.get('html', '') - - if not html_content: - logger.error("No HTML content in Playwright response") - return None - - # Парсим таблицу - webinars = parse_webinar_table(html_content) - return webinars - - except Exception as e: - logger.error(f"Error fetching webinars via Playwright: {e}", exc_info=True) - return None - - -def fetch_webinars() -> Optional[List[Dict[str, str]]]: - """ - Получает список активных вебинаров - Сначала пробует через Playwright (для динамического контента), - при неудаче - через обычный requests - - Returns: - List[Dict]: Список вебинаров или None в случае ошибки - """ - # Пробуем через Playwright - logger.info("Attempting to fetch via Playwright for dynamic content") - webinars = fetch_webinars_with_playwright() - - if webinars is not None: - return webinars - - # Fallback на обычный requests - logger.warning("Playwright fetch failed, falling back to simple requests") - - # Получаем PHPSESSID - phpsessid = get_phpsessid() - if not phpsessid: - logger.error("Failed to get PHPSESSID") - return None - - # Запрашиваем страницу с вебинарами - try: - headers = { - 'User-Agent': 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/141.0.0.0 Safari/537.36', - 'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8', - 'Accept-Language': 'ru-RU,ru;q=0.9,uk;q=0.8', - 'Referer': f'https://{config.EDU_HOST}/' - } - - cookies = { - 'PHPSESSID': phpsessid - } - - logger.info(f"Fetching webinars from {config.EDU_WEBINAR_URL}") - response = requests.get( - config.EDU_WEBINAR_URL, - headers=headers, - cookies=cookies, - timeout=15 - ) - - if response.status_code != 200: - logger.error(f"Failed to fetch webinars page: {response.status_code}") - return None - - # Парсим таблицу - webinars = parse_webinar_table(response.text) - return webinars - - except Exception as e: - logger.error(f"Error fetching webinars: {e}", exc_info=True) - return None - - -def format_webinar_message(webinars: List[Dict[str, str]]) -> str: - """ - Форматирует список вебинаров для отправки в Telegram - - Args: - webinars: Список вебинаров - - Returns: - str: Отформатированное сообщение - """ - if not webinars: - return "📭 Жодного онлайн уроку зараз" - - message = "🎓 Активні онлайн уроки:\n\n" - - for i, webinar in enumerate(webinars, 1): - message += f"{i}. {webinar['topic']}\n" - message += f"📚 Курс: {webinar['course']}\n" - message += f"👨‍🏫 Вчитель: {webinar['teacher']}\n" - - if webinar['join_link']: - full_link = webinar['join_link'] - if not full_link.startswith('http'): - full_link = f"https://{config.EDU_HOST}{webinar['join_link']}" - message += f"🔗 Увійти до уроку\n" - - message += "\n" - - return message \ No newline at end of file diff --git a/edu_master/nginx/entrypoint.sh b/edu_master/nginx/entrypoint.sh deleted file mode 100644 index 349f084..0000000 --- a/edu_master/nginx/entrypoint.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -set -e - -# Replace environment variables in the Nginx configuration template -envsubst '${MINIO_PRIVATE_BUCKET} ${MINIO_PUBLIC_BUCKET}' < /etc/nginx/conf.d/default.conf.template > /etc/nginx/conf.d/default.conf - -# Start Nginx -exec nginx -g 'daemon off;' diff --git a/edu_master/nginx/nginx.conf b/edu_master/nginx/nginx.conf deleted file mode 100644 index 84925e2..0000000 --- a/edu_master/nginx/nginx.conf +++ /dev/null @@ -1,87 +0,0 @@ -server { - listen 80; - server_name localhost; - client_max_body_size 100M; - - # Frontend - location / { - proxy_pass http://frontend:80; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - } - - # API - location /api/ { - proxy_pass http://app:9000; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - } - - # MCP - location ~ ^/(sse|messages) { - proxy_pass http://mcp:3000; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - - - # Important SSE settings - proxy_http_version 1.1; - proxy_set_header Connection ""; - - # Disable buffering so events are sent immediately - proxy_buffering off; - proxy_cache off; - - # Increase timeouts so connection stays open - proxy_read_timeout 3600s; - proxy_send_timeout 3600s; - } - - - # MinIO private bucket - location /${MINIO_PRIVATE_BUCKET}/ { - proxy_pass http://minio:9000/${MINIO_PRIVATE_BUCKET}/; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_buffering off; - } - - # MinIO public bucket - location /${MINIO_PUBLIC_BUCKET}/ { - proxy_pass http://minio:9000/${MINIO_PUBLIC_BUCKET}/; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_buffering off; - } - - # MinIO API - for direct S3 operations - # location /minio/api/ { - # proxy_pass http://minio:9000/; - # proxy_set_header Host $host; - # proxy_set_header X-Real-IP $remote_addr; - # proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - # proxy_set_header X-Forwarded-Proto $scheme; - # proxy_buffering off; - # } - - # MinIO Console - location /minio-console/ { - proxy_pass http://minio:9001/; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - # Rewrite location headers - proxy_redirect / /minio-console/; - } -} \ No newline at end of file diff --git a/edu_master/phpsessid-bot/Dockerfile b/edu_master/phpsessid-bot/Dockerfile new file mode 100644 index 0000000..4ef38ab --- /dev/null +++ b/edu_master/phpsessid-bot/Dockerfile @@ -0,0 +1,12 @@ +FROM python:3.11-slim + +WORKDIR /app + +# Install dependencies +RUN pip install requests + +# Copy application code +COPY . . + +# Run the bot +CMD ["python", "bot.py"] diff --git a/edu_master/phpsessid-bot/bot.py b/edu_master/phpsessid-bot/bot.py new file mode 100644 index 0000000..d0f1ca0 --- /dev/null +++ b/edu_master/phpsessid-bot/bot.py @@ -0,0 +1,103 @@ +import os +import time +import requests +import logging +from datetime import datetime + +# Configure logging +logging.basicConfig( + level=logging.INFO, + format='%(asctime)s - %(levelname)s - %(message)s' +) +logger = logging.getLogger(__name__) + +# Load configuration +LOGIN = os.getenv('EDU_LOGIN') +PASSWORD = os.getenv('EDU_PASSWORD') +URL_LOGIN = os.getenv('EDU_URL_LOGIN', 'https://edu.edu.vn.ua/user/login') +URL_VERIFY = os.getenv('EDU_URL_VERIFY', 'https://edu.edu.vn.ua/course/userlist') +INTERVAL = int(os.getenv('EDU_INTERVAL', 10)) +USER_AGENT = os.getenv('EDU_USER_AGENT', 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/142.0.0.0 Safari/537.36') +INITIAL_PHPSESSID = os.getenv('EDU_PHPSESSID') + +SUCCESS_FILE = '/tmp/last_success' + +def touch_success_file(): + """Updates the timestamp of the success file for healthchecks.""" + try: + with open(SUCCESS_FILE, 'w') as f: + f.write(str(datetime.now().timestamp())) + except Exception as e: + logger.error(f"Failed to touch success file: {e}") + +def main(): + logger.info("Starting Session Keeper Bot") + + 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) + + # If an initial PHPSESSID is provided, set it in the session + if INITIAL_PHPSESSID: + logger.info(f"Setting initial PHPSESSID: {INITIAL_PHPSESSID}") + session.cookies.set('PHPSESSID', INITIAL_PHPSESSID, domain='edu.edu.vn.ua') + + 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() + elif verify_response.status_code == 302: + logger.warning("Session verification FAILED (302 Redirect). Session might be invalid.") + else: + logger.warning(f"Session verification returned unexpected status: {verify_response.status_code}") + + except Exception as e: + logger.error(f"An error occurred: {e}") + + logger.info(f"Sleeping for {INTERVAL} minutes...") + time.sleep(INTERVAL * 60) + +if __name__ == "__main__": + main() diff --git a/edu_master/phpsessid_bot/Dockerfile b/edu_master/phpsessid_bot/Dockerfile deleted file mode 100644 index 6506397..0000000 --- a/edu_master/phpsessid_bot/Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -FROM python:3.11-slim - -WORKDIR /app - -# Устанавливаем зависимости -RUN pip install --no-cache-dir flask requests - -# Копируем код бота -COPY main.py . - -# Открываем порт -EXPOSE 5000 - -# Запускаем бот -CMD ["python", "-u", "main.py"] diff --git a/edu_master/phpsessid_bot/main.py b/edu_master/phpsessid_bot/main.py deleted file mode 100644 index 50afec9..0000000 --- a/edu_master/phpsessid_bot/main.py +++ /dev/null @@ -1,216 +0,0 @@ -import os -import logging -from flask import Flask, request, jsonify -import requests -from datetime import datetime - -# Настройка логирования -logging.basicConfig( - level=logging.INFO, - format='%(asctime)s - %(name)s - %(levelname)s - %(message)s' -) -logger = logging.getLogger(__name__) - -app = Flask(__name__) - -# Конфигурация из переменных окружения -EDU_HOST = os.getenv('EDU_HOST', 'edu.edu.vn.ua') -EDU_LOGIN = os.getenv('EDU_LOGIN', '') -EDU_PASSWORD = os.getenv('EDU_PASSWORD', '') -BOT_PORT = int(os.getenv('BOT_PORT', '5000')) -BOT_HOST = os.getenv('BOT_HOST', '0.0.0.0') - -# Кэш для хранения актуальной сессии -session_cache = { - 'phpsessid': None, - 'expires_at': None -} - - -def login_and_get_session(): - """ - Выполняет логин и возвращает новый PHPSESSID - """ - url = f"https://{EDU_HOST}/user/login" - - headers = { - 'Cache-Control': 'max-age=0', - 'Sec-Ch-Ua': '"Chromium";v="141", "Not?A_Brand";v="8"', - 'Sec-Ch-Ua-Mobile': '?0', - 'Sec-Ch-Ua-Platform': '"Linux"', - 'Accept-Language': 'ru-RU,ru;q=0.9', - 'Origin': f'https://{EDU_HOST}', - 'Content-Type': 'application/x-www-form-urlencoded', - 'Upgrade-Insecure-Requests': '1', - 'User-Agent': 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/141.0.0.0 Safari/537.36', - 'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7', - 'Sec-Fetch-Site': 'same-origin', - 'Sec-Fetch-Mode': 'navigate', - 'Sec-Fetch-User': '?1', - 'Sec-Fetch-Dest': 'document', - 'Referer': f'https://{EDU_HOST}/', - 'Accept-Encoding': 'gzip, deflate, br', - 'Priority': 'u=0, i' - } - - data = { - 'login': EDU_LOGIN, - 'password': EDU_PASSWORD - } - - try: - logger.info(f"Attempting login to {url}") - response = requests.post( - url, - data=data, - headers=headers, - allow_redirects=False, - timeout=10 - ) - - # Получаем PHPSESSID из cookies - phpsessid = response.cookies.get('PHPSESSID') - - if phpsessid: - logger.info(f"Login successful, got PHPSESSID: {phpsessid[:10]}...") - return { - 'success': True, - 'phpsessid': phpsessid, - 'status_code': response.status_code - } - else: - logger.warning(f"Login failed: no PHPSESSID in response. Status: {response.status_code}") - return { - 'success': False, - 'error': 'No PHPSESSID in response', - 'status_code': response.status_code - } - - except requests.exceptions.RequestException as e: - logger.error(f"Login request failed: {str(e)}") - return { - 'success': False, - 'error': str(e) - } - - -def validate_phpsessid(phpsessid): - """ - Проверяет валидность существующего PHPSESSID - """ - url = f"https://{EDU_HOST}/" - - headers = { - 'User-Agent': 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/141.0.0.0 Safari/537.36', - 'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8' - } - - cookies = { - 'PHPSESSID': phpsessid - } - - try: - response = requests.get(url, headers=headers, cookies=cookies, timeout=10) - - # Проверяем, не редиректит ли на страницу логина - is_valid = response.status_code == 200 and '/user/login' not in response.url - - return { - 'valid': is_valid, - 'status_code': response.status_code, - 'url': response.url - } - except requests.exceptions.RequestException as e: - logger.error(f"Validation request failed: {str(e)}") - return { - 'valid': False, - 'error': str(e) - } - - -@app.route('/health', methods=['GET']) -def health(): - """Health check endpoint""" - return jsonify({'status': 'ok', 'timestamp': datetime.now().isoformat()}) - - -@app.route('/get-session', methods=['POST', 'GET']) -def get_session(): - """ - Основной endpoint для получения валидного PHPSESSID - Возвращает кэшированную сессию или создает новую - """ - result = login_and_get_session() - - if result['success']: - session_cache['phpsessid'] = result['phpsessid'] - session_cache['last_updated'] = datetime.now().isoformat() - - return jsonify({ - 'success': True, - 'phpsessid': result['phpsessid'], - 'timestamp': datetime.now().isoformat() - }) - else: - return jsonify({ - 'success': False, - 'error': result.get('error', 'Login failed'), - 'timestamp': datetime.now().isoformat() - }), 400 - - -@app.route('/validate-session', methods=['POST']) -def validate_session(): - """ - Проверяет валидность переданного PHPSESSID - """ - data = request.get_json() or {} - phpsessid = data.get('phpsessid') or request.args.get('phpsessid') - - if not phpsessid: - return jsonify({ - 'success': False, - 'error': 'PHPSESSID not provided' - }), 400 - - validation_result = validate_phpsessid(phpsessid) - - return jsonify({ - 'success': True, - 'valid': validation_result.get('valid', False), - 'details': validation_result, - 'timestamp': datetime.now().isoformat() - }) - - -@app.route('/refresh-session', methods=['POST', 'GET']) -def refresh_session(): - """ - Принудительно обновляет сессию - """ - result = login_and_get_session() - - if result['success']: - return jsonify({ - 'success': True, - 'phpsessid': result['phpsessid'], - 'message': 'Session refreshed successfully', - 'timestamp': datetime.now().isoformat() - }) - else: - return jsonify({ - 'success': False, - 'error': result.get('error', 'Failed to refresh session'), - 'timestamp': datetime.now().isoformat() - }), 400 - - -if __name__ == '__main__': - if not EDU_LOGIN or not EDU_PASSWORD: - logger.error("EDU_LOGIN and EDU_PASSWORD must be set!") - exit(1) - - logger.info(f"Starting PHPSESSID validator bot on {BOT_HOST}:{BOT_PORT}") - logger.info(f"Target host: {EDU_HOST}") - - app.run(host=BOT_HOST, port=BOT_PORT, debug=False) \ No newline at end of file diff --git a/edu_master/phpsessid_bot/requirements.txt b/edu_master/phpsessid_bot/requirements.txt deleted file mode 100644 index 4614e8a..0000000 --- a/edu_master/phpsessid_bot/requirements.txt +++ /dev/null @@ -1,3 +0,0 @@ -flask==3.0.0 -requests==2.31.0 -Werkzeug==3.0.1 From bfbe841154722a7bfd6d97956a523bcf5ab11fc8 Mon Sep 17 00:00:00 2001 From: mr-forust Date: Wed, 26 Nov 2025 20:53:53 +0100 Subject: [PATCH 055/100] feat: redis integration --- edu_master/.env.example | 16 ++++++---- edu_master/compose.yaml | 45 +++++++++++++++++++++++++++-- edu_master/phpsessid-bot/Dockerfile | 5 +++- edu_master/phpsessid-bot/bot.py | 31 +++++++++++++++----- 4 files changed, 80 insertions(+), 17 deletions(-) diff --git a/edu_master/.env.example b/edu_master/.env.example index 70573f0..bfb8684 100644 --- a/edu_master/.env.example +++ b/edu_master/.env.example @@ -1,7 +1,13 @@ -EDU_LOGIN=login -EDU_PASSWORD=password +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 -EDU_INTERVAL=10 -EDU_USER_AGENT="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/142.0.0.0 Safari/537.36" -EDU_PHPSESSID= +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_TELEGRAM_CHAT_ID=your_telegram_chat_id_here diff --git a/edu_master/compose.yaml b/edu_master/compose.yaml index 13284c6..5b934f7 100644 --- a/edu_master/compose.yaml +++ b/edu_master/compose.yaml @@ -1,10 +1,49 @@ services: + redis: + image: redis:alpine + restart: unless-stopped + volumes: + - redis-data:/data + ports: + - "6379:6379" + healthcheck: + test: [ "CMD", "redis-cli", "ping" ] + interval: 5s + timeout: 3s + retries: 5 + + playwright-service: + image: mcr.microsoft.com/playwright:v1.56.0-noble + restart: unless-stopped + command: npx -y playwright run-server --port 3000 --path /ws + ports: + - "3000:3000" + session-keeper: build: ./phpsessid-bot env_file: .env restart: unless-stopped + depends_on: + redis: + condition: service_healthy healthcheck: - test: ["CMD-SHELL", "test $(find /tmp/last_success -mmin -15)"] - interval: 1m + test: [ "CMD-SHELL", "redis-cli -h redis EXISTS EDU_PHPSESSID | grep -q 1" ] + interval: 30s timeout: 5s - retries: 3 + retries: 10 + start_period: 60s + + webinar-checker: + build: ./webinar-checker + 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: diff --git a/edu_master/phpsessid-bot/Dockerfile b/edu_master/phpsessid-bot/Dockerfile index 4ef38ab..b66780c 100644 --- a/edu_master/phpsessid-bot/Dockerfile +++ b/edu_master/phpsessid-bot/Dockerfile @@ -2,8 +2,11 @@ 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 +RUN pip install requests redis # Copy application code COPY . . diff --git a/edu_master/phpsessid-bot/bot.py b/edu_master/phpsessid-bot/bot.py index d0f1ca0..48aa466 100644 --- a/edu_master/phpsessid-bot/bot.py +++ b/edu_master/phpsessid-bot/bot.py @@ -2,6 +2,7 @@ import os import time import requests import logging +import redis from datetime import datetime # Configure logging @@ -16,9 +17,10 @@ LOGIN = os.getenv('EDU_LOGIN') PASSWORD = os.getenv('EDU_PASSWORD') URL_LOGIN = os.getenv('EDU_URL_LOGIN', 'https://edu.edu.vn.ua/user/login') URL_VERIFY = os.getenv('EDU_URL_VERIFY', 'https://edu.edu.vn.ua/course/userlist') -INTERVAL = int(os.getenv('EDU_INTERVAL', 10)) -USER_AGENT = os.getenv('EDU_USER_AGENT', 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/142.0.0.0 Safari/537.36') -INITIAL_PHPSESSID = os.getenv('EDU_PHPSESSID') +INTERVAL = int(os.getenv('PHPSESSID_INTERVAL', 10)) +USER_AGENT = os.getenv('USER_AGENT', 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/142.0.0.0 Safari/537.36') +REDIS_HOST = os.getenv('REDIS_HOST', 'redis') +REDIS_PORT = int(os.getenv('REDIS_PORT', 6379)) SUCCESS_FILE = '/tmp/last_success' @@ -33,6 +35,15 @@ def touch_success_file(): 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 @@ -54,11 +65,6 @@ def main(): } session.headers.update(headers) - # If an initial PHPSESSID is provided, set it in the session - if INITIAL_PHPSESSID: - logger.info(f"Setting initial PHPSESSID: {INITIAL_PHPSESSID}") - session.cookies.set('PHPSESSID', INITIAL_PHPSESSID, domain='edu.edu.vn.ua') - while True: try: logger.info("Attempting login...") @@ -88,6 +94,15 @@ def main(): 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: From cb92bff0c5efce777ffc96c352f5b59b8bd1045f Mon Sep 17 00:00:00 2001 From: mr-forust Date: Wed, 26 Nov 2025 21:08:43 +0100 Subject: [PATCH 056/100] feat: basic webinar checker bot --- edu_master/compose.yaml | 4 +- edu_master/webinar-checker/Dockerfile | 10 ++ edu_master/webinar-checker/checker.py | 147 ++++++++++++++++++++++++++ 3 files changed, 159 insertions(+), 2 deletions(-) create mode 100644 edu_master/webinar-checker/Dockerfile create mode 100644 edu_master/webinar-checker/checker.py diff --git a/edu_master/compose.yaml b/edu_master/compose.yaml index 5b934f7..e0f4e9b 100644 --- a/edu_master/compose.yaml +++ b/edu_master/compose.yaml @@ -13,9 +13,9 @@ services: retries: 5 playwright-service: - image: mcr.microsoft.com/playwright:v1.56.0-noble + image: mcr.microsoft.com/playwright:v1.56.0-jammy restart: unless-stopped - command: npx -y playwright run-server --port 3000 --path /ws + command: npx -y playwright@1.56.0 run-server --port 3000 --path /ws ports: - "3000:3000" diff --git a/edu_master/webinar-checker/Dockerfile b/edu_master/webinar-checker/Dockerfile new file mode 100644 index 0000000..67f5496 --- /dev/null +++ b/edu_master/webinar-checker/Dockerfile @@ -0,0 +1,10 @@ +FROM python:3.11-slim + +WORKDIR /app + +# Install dependencies +RUN pip install --upgrade pip && pip install playwright==1.56.0 redis requests + +COPY checker.py . + +CMD ["python", "checker.py"] diff --git a/edu_master/webinar-checker/checker.py b/edu_master/webinar-checker/checker.py new file mode 100644 index 0000000..3f9e913 --- /dev/null +++ b/edu_master/webinar-checker/checker.py @@ -0,0 +1,147 @@ +import os +import time +import logging +import redis +import requests +from playwright.sync_api import sync_playwright + +# Configure logging +logging.basicConfig( + level=logging.INFO, + format='%(asctime)s - %(levelname)s - %(message)s' +) +logger = logging.getLogger(__name__) + +# Load configuration +WEBINAR_URL = os.getenv('WEBINAR_URL', 'https://edu.edu.vn.ua/webinar/useractive') +WEBINAR_CHECK_INTERVAL = int(os.getenv('WEBINAR_CHECK_INTERVAL', 60)) +REDIS_HOST = os.getenv('REDIS_HOST', 'redis') +REDIS_PORT = int(os.getenv('REDIS_PORT', 6379)) +PLAYWRIGHT_WS = os.getenv('PLAYWRIGHT_WS', 'ws://playwright-service:3000/ws') +USER_AGENT = os.getenv('USER_AGENT', 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/142.0.0.0 Safari/537.36') +WEBINAR_TELEGRAM_TOKEN = os.getenv('WEBINAR_TELEGRAM_TOKEN') +WEBINAR_TELEGRAM_CHAT_ID = os.getenv('WEBINAR_TELEGRAM_CHAT_ID') + +def send_telegram_message(message): + """Send message to Telegram.""" + if not WEBINAR_TELEGRAM_TOKEN or not WEBINAR_TELEGRAM_CHAT_ID: + logger.warning("Telegram credentials not configured. Skipping message.") + return + + try: + url = f"https://api.telegram.org/bot{WEBINAR_TELEGRAM_TOKEN}/sendMessage" + payload = { + 'chat_id': WEBINAR_TELEGRAM_CHAT_ID, + 'text': message, + 'parse_mode': 'HTML' + } + response = requests.post(url, json=payload) + if response.status_code == 200: + logger.info("Telegram message sent successfully.") + else: + logger.error(f"Failed to send Telegram message: {response.text}") + except Exception as e: + logger.error(f"Error sending Telegram message: {e}") + +def check_webinars(redis_client): + """Check for active webinars and notify via Telegram.""" + + # Get PHPSESSID from Redis + phpsessid = redis_client.get('EDU_PHPSESSID') + if not phpsessid: + logger.warning("PHPSESSID not found in Redis. Waiting for session-keeper to provide it.") + return + + logger.info(f"Using PHPSESSID from Redis: {phpsessid}") + + with sync_playwright() as p: + try: + # Connect to remote Playwright server + browser = p.chromium.connect(PLAYWRIGHT_WS) + logger.info(f"Connected to Playwright server at {PLAYWRIGHT_WS}") + + context = browser.new_context( + user_agent=USER_AGENT, + viewport={'width': 1280, 'height': 720} + ) + + # Set PHPSESSID cookie + context.add_cookies([{ + 'name': 'PHPSESSID', + 'value': phpsessid, + 'domain': 'edu.edu.vn.ua', + 'path': '/' + }]) + + page = context.new_page() + + try: + logger.info(f"Navigating to {WEBINAR_URL}...") + page.goto(WEBINAR_URL, wait_until='domcontentloaded') + + # Wait for the table to load (dynamic content) + try: + page.wait_for_selector('#meetings table', timeout=10000) + except Exception: + logger.error("Timeout waiting for #meetings table. Page might not have loaded correctly.") + return + + content = page.content() + + if "Жодного онлайн уроку зараз" in content: + logger.info("Webinars check: No active webinars.") + else: + # Webinars found! + logger.info("!!! WEBINAR FOUND !!!") + + # Extract details + rows = page.locator('#meetings table tbody tr') + count = rows.count() + + webinar_details = [] + if count > 0: + for i in range(count): + text = rows.nth(i).inner_text() + # Skip the "no webinars" row + if "Жодного онлайн уроку зараз" not in text: + webinar_details.append(text.strip()) + + # Send Telegram notification (Russian) + if webinar_details: + message = "🎓 Найден вебинар!\n\n" + for detail in webinar_details: + message += f"📌 {detail}\n\n" + send_telegram_message(message) + else: + send_telegram_message("🎓 Найден вебинар!\n\nДетали не удалось извлечь.") + + except Exception as e: + logger.error(f"An error occurred during check: {e}") + finally: + browser.close() + + except Exception as e: + logger.error(f"Failed to connect to Playwright server: {e}") + +def main(): + logger.info("Starting Webinar Checker 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 + + # Send startup message (Russian) + send_telegram_message("🤖 Бот запущен\n\nМониторинг вебинаров активирован...") + + while True: + check_webinars(redis_client) + logger.info(f"Sleeping for {WEBINAR_CHECK_INTERVAL} seconds...") + time.sleep(WEBINAR_CHECK_INTERVAL) + +if __name__ == "__main__": + main() From d4e0e7f37a6d900a1e45454e48259c7ca7ab6e73 Mon Sep 17 00:00:00 2001 From: mr-forust Date: Wed, 26 Nov 2025 22:12:03 +0100 Subject: [PATCH 057/100] feat: telegram webianr checker bot --- edu_master/.env.example | 2 +- edu_master/webinar-checker/Dockerfile | 2 +- edu_master/webinar-checker/checker.py | 322 +++++++++++++++++--------- 3 files changed, 217 insertions(+), 109 deletions(-) diff --git a/edu_master/.env.example b/edu_master/.env.example index bfb8684..e0c4a1e 100644 --- a/edu_master/.env.example +++ b/edu_master/.env.example @@ -10,4 +10,4 @@ REDIS_HOST=redis REDIS_PORT=6379 PLAYWRIGHT_WS=ws://playwright-service:3000/ws WEBINAR_TELEGRAM_TOKEN=your_telegram_bot_token_here -WEBINAR_TELEGRAM_CHAT_ID=your_telegram_chat_id_here +WEBINAR_ADMIN_ID=123456789 diff --git a/edu_master/webinar-checker/Dockerfile b/edu_master/webinar-checker/Dockerfile index 67f5496..ec581f7 100644 --- a/edu_master/webinar-checker/Dockerfile +++ b/edu_master/webinar-checker/Dockerfile @@ -3,7 +3,7 @@ FROM python:3.11-slim WORKDIR /app # Install dependencies -RUN pip install --upgrade pip && pip install playwright==1.56.0 redis requests +RUN pip install --upgrade pip && pip install playwright==1.56.0 redis requests "python-telegram-bot[job-queue]" COPY checker.py . diff --git a/edu_master/webinar-checker/checker.py b/edu_master/webinar-checker/checker.py index 3f9e913..5ecef74 100644 --- a/edu_master/webinar-checker/checker.py +++ b/edu_master/webinar-checker/checker.py @@ -1,9 +1,10 @@ import os -import time import logging import redis -import requests -from playwright.sync_api import sync_playwright + +from telegram import Update, InlineKeyboardButton, InlineKeyboardMarkup +from telegram.ext import Application, CommandHandler, CallbackQueryHandler, ContextTypes, JobQueue +from playwright.async_api import async_playwright # Configure logging logging.basicConfig( @@ -20,128 +21,235 @@ REDIS_PORT = int(os.getenv('REDIS_PORT', 6379)) PLAYWRIGHT_WS = os.getenv('PLAYWRIGHT_WS', 'ws://playwright-service:3000/ws') USER_AGENT = os.getenv('USER_AGENT', 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/142.0.0.0 Safari/537.36') WEBINAR_TELEGRAM_TOKEN = os.getenv('WEBINAR_TELEGRAM_TOKEN') -WEBINAR_TELEGRAM_CHAT_ID = os.getenv('WEBINAR_TELEGRAM_CHAT_ID') +ADMIN_ID = int(os.getenv('WEBINAR_ADMIN_ID', '0')) -def send_telegram_message(message): - """Send message to Telegram.""" - if not WEBINAR_TELEGRAM_TOKEN or not WEBINAR_TELEGRAM_CHAT_ID: - logger.warning("Telegram credentials not configured. Skipping message.") +# Redis Keys +KEY_WHITELIST = "bot:whitelist" +KEY_WHITELIST_ENABLED = "bot:whitelist_enabled" +KEY_SUBSCRIBERS = "bot:subscribers" +KEY_PHPSESSID = "EDU_PHPSESSID" + +# 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) + +# --- 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)) + +def get_admin_keyboard(): + """Generate admin panel keyboard.""" + whitelist_enabled = redis_client.get(KEY_WHITELIST_ENABLED) != "0" + toggle_text = "🔒 Disable Whitelist" if whitelist_enabled else "🔓 Enable Whitelist" + + keyboard = [ + [InlineKeyboardButton(toggle_text, callback_data="toggle_whitelist")], + [InlineKeyboardButton("📋 View Whitelist", callback_data="view_whitelist")], + [InlineKeyboardButton("👥 View Subscribers", callback_data="view_subscribers")], + [InlineKeyboardButton("🔄 Force Check", callback_data="force_check")] + ] + return InlineKeyboardMarkup(keyboard) + +# --- Command Handlers --- + +async def start(update: Update, context: ContextTypes.DEFAULT_TYPE): + """Handle /start command.""" + user = update.effective_user + logger.info(f"User {user.id} ({user.username}) started the bot.") + + if not is_whitelisted(user.id): + await update.message.reply_text("⛔ Access denied. You are not on the whitelist.") return + + # Add to subscribers + redis_client.sadd(KEY_SUBSCRIBERS, user.id) + + msg = ( + f"👋 Hello {user.first_name}!\n\n" + "I am the Webinar Checker Bot. I will notify you when a new webinar appears.\n" + "You have been subscribed to notifications." + ) + + if user.id == ADMIN_ID: + msg += "\n\n👑 Admin Mode Active" + await update.message.reply_text(msg, parse_mode='HTML', reply_markup=get_admin_keyboard()) + else: + await update.message.reply_text(msg, parse_mode='HTML') + +async def help_command(update: Update, context: ContextTypes.DEFAULT_TYPE): + """Handle /help command.""" + msg = ( + "🤖 Bot Help\n\n" + "/start - Subscribe to notifications\n" + "/help - Show this message\n" + ) + if update.effective_user.id == ADMIN_ID: + msg += "\nAdmin Commands:\nUse the panel below to manage settings." + await update.message.reply_text(msg, parse_mode='HTML', reply_markup=get_admin_keyboard()) + else: + await update.message.reply_text(msg, parse_mode='HTML') + +# --- 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("⛔ 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 = "Disabled" if new_state == "0" else "Enabled" + await query.edit_message_reply_markup(reply_markup=get_admin_keyboard()) + await query.message.reply_text(f"✅ Whitelist {state_text}") + + elif data == "view_whitelist": + members = redis_client.smembers(KEY_WHITELIST) + msg = "📋 Whitelist:\n" + ("\n".join(members) if members else "Empty") + await query.message.reply_text(msg, parse_mode='HTML') + + elif data == "view_subscribers": + subs = redis_client.smembers(KEY_SUBSCRIBERS) + msg = "👥 Subscribers:\n" + ("\n".join(subs) if subs else "Empty") + await query.message.reply_text(msg, parse_mode='HTML') + + elif data == "force_check": + await query.message.reply_text("🔄 Running immediate check...") + await check_webinars_job(context) + +# --- Webinar Checking Job --- + +async def check_webinars_job(context: ContextTypes.DEFAULT_TYPE): + """Background job to check for webinars using Async Playwright.""" + logger.info("Running webinar check...") + + phpsessid = redis_client.get(KEY_PHPSESSID) + if not phpsessid: + logger.warning("PHPSESSID missing. Skipping check.") + return + + webinar_details = [] try: - url = f"https://api.telegram.org/bot{WEBINAR_TELEGRAM_TOKEN}/sendMessage" - payload = { - 'chat_id': WEBINAR_TELEGRAM_CHAT_ID, - 'text': message, - 'parse_mode': 'HTML' - } - response = requests.post(url, json=payload) - if response.status_code == 200: - logger.info("Telegram message sent successfully.") - else: - logger.error(f"Failed to send Telegram message: {response.text}") - except Exception as e: - logger.error(f"Error sending Telegram message: {e}") - -def check_webinars(redis_client): - """Check for active webinars and notify via Telegram.""" - - # Get PHPSESSID from Redis - phpsessid = redis_client.get('EDU_PHPSESSID') - if not phpsessid: - logger.warning("PHPSESSID not found in Redis. Waiting for session-keeper to provide it.") - return - - logger.info(f"Using PHPSESSID from Redis: {phpsessid}") - - with sync_playwright() as p: - try: - # Connect to remote Playwright server - browser = p.chromium.connect(PLAYWRIGHT_WS) - logger.info(f"Connected to Playwright server at {PLAYWRIGHT_WS}") - - context = browser.new_context( - user_agent=USER_AGENT, - viewport={'width': 1280, 'height': 720} - ) - - # Set PHPSESSID cookie - context.add_cookies([{ - 'name': 'PHPSESSID', - 'value': phpsessid, - 'domain': 'edu.edu.vn.ua', - 'path': '/' - }]) - - page = context.new_page() + async with async_playwright() as p: + # Connect to remote Playwright service + browser = await p.chromium.connect(PLAYWRIGHT_WS) try: - logger.info(f"Navigating to {WEBINAR_URL}...") - page.goto(WEBINAR_URL, wait_until='domcontentloaded') + # 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() - # Wait for the table to load (dynamic content) try: - page.wait_for_selector('#meetings table', timeout=10000) - except Exception: - logger.error("Timeout waiting for #meetings table. Page might not have loaded correctly.") - return - - content = page.content() - - if "Жодного онлайн уроку зараз" in content: - logger.info("Webinars check: No active webinars.") - else: - # Webinars found! - logger.info("!!! WEBINAR FOUND !!!") + # Navigate to webinar page + await page.goto(WEBINAR_URL, wait_until='domcontentloaded') - # Extract details - rows = page.locator('#meetings table tbody tr') - count = rows.count() + # Wait for the table to load + await page.wait_for_selector('#meetings table', timeout=10000) - webinar_details = [] - if count > 0: + # 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): - text = rows.nth(i).inner_text() - # Skip the "no webinars" row + text = await rows.nth(i).inner_text() if "Жодного онлайн уроку зараз" not in text: webinar_details.append(text.strip()) - - # Send Telegram notification (Russian) - if webinar_details: - message = "🎓 Найден вебинар!\n\n" - for detail in webinar_details: - message += f"📌 {detail}\n\n" - send_telegram_message(message) else: - send_telegram_message("🎓 Найден вебинар!\n\nДетали не удалось извлечь.") - - except Exception as e: - logger.error(f"An error occurred during check: {e}") + logger.info("No webinars found (expected message present)") + + except Exception as e: + logger.error(f"Error checking page: {e}") + finally: + await page.close() + await context_browser.close() + finally: - browser.close() + await browser.close() - except Exception as e: - logger.error(f"Failed to connect to Playwright server: {e}") + except Exception as e: + logger.error(f"Playwright error: {e}") + return + + # Notify subscribers if webinars found + if webinar_details: + message = "🎓 Найден вебинар!\n\n" + "\n\n".join([f"📌 {d}" for d in webinar_details]) + subscribers = redis_client.smembers(KEY_SUBSCRIBERS) + + for sub_id in subscribers: + try: + 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}") + +# --- Main --- def main(): - logger.info("Starting Webinar Checker 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}") + if not WEBINAR_TELEGRAM_TOKEN: + logger.error("WEBINAR_TELEGRAM_TOKEN is missing!") return - - # Send startup message (Russian) - send_telegram_message("🤖 Бот запущен\n\nМониторинг вебинаров активирован...") - - while True: - check_webinars(redis_client) - logger.info(f"Sleeping for {WEBINAR_CHECK_INTERVAL} seconds...") - time.sleep(WEBINAR_CHECK_INTERVAL) + + # 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("help", help_command)) + 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() + main() \ No newline at end of file From 8fae8bf75d94dae2de85dae7e2840c33895d6994 Mon Sep 17 00:00:00 2001 From: mr-forust Date: Wed, 26 Nov 2025 22:25:47 +0100 Subject: [PATCH 058/100] feat: add admin commands to manage whitelist, extended webinar reporting --- edu_master/webinar-checker/checker.py | 74 +++++++++++++++++++++++++-- 1 file changed, 69 insertions(+), 5 deletions(-) diff --git a/edu_master/webinar-checker/checker.py b/edu_master/webinar-checker/checker.py index 5ecef74..d09c9fe 100644 --- a/edu_master/webinar-checker/checker.py +++ b/edu_master/webinar-checker/checker.py @@ -98,11 +98,59 @@ async def help_command(update: Update, context: ContextTypes.DEFAULT_TYPE): "/help - Show this message\n" ) if update.effective_user.id == ADMIN_ID: - msg += "\nAdmin Commands:\nUse the panel below to manage settings." + msg += ( + "\nAdmin Commands:\n" + "/adduser [user_id] - Add user to whitelist\n" + "/removeuser [user_id] - Remove user from whitelist\n" + "Or use the panel below to manage settings." + ) await update.message.reply_text(msg, parse_mode='HTML', reply_markup=get_admin_keyboard()) else: await update.message.reply_text(msg, parse_mode='HTML') +async def add_user(update: Update, context: ContextTypes.DEFAULT_TYPE): + """Add user to whitelist (admin only).""" + if update.effective_user.id != ADMIN_ID: + await update.message.reply_text("⛔ Admin only!") + return + + if not context.args: + await update.message.reply_text("Usage: /adduser [user_id]") + return + + try: + user_id = int(context.args[0]) + redis_client.sadd(KEY_WHITELIST, str(user_id)) + await update.message.reply_text(f"✅ User {user_id} added to whitelist") + logger.info(f"Admin added user {user_id} to whitelist") + except ValueError: + await update.message.reply_text("❌ Invalid user ID. Must be a number.") + +async def remove_user(update: Update, context: ContextTypes.DEFAULT_TYPE): + """Remove user from whitelist (admin only).""" + if update.effective_user.id != ADMIN_ID: + await update.message.reply_text("⛔ Admin only!") + return + + if not context.args: + await update.message.reply_text("Usage: /removeuser [user_id]") + return + + try: + user_id = int(context.args[0]) + if str(user_id) == str(ADMIN_ID): + await update.message.reply_text("❌ Cannot remove admin from whitelist") + return + + removed = redis_client.srem(KEY_WHITELIST, str(user_id)) + if removed: + await update.message.reply_text(f"✅ User {user_id} removed from whitelist") + logger.info(f"Admin removed user {user_id} from whitelist") + else: + await update.message.reply_text(f"⚠️ User {user_id} was not in whitelist") + except ValueError: + await update.message.reply_text("❌ Invalid user ID. Must be a number.") + # --- Admin Callbacks --- async def admin_callback(update: Update, context: ContextTypes.DEFAULT_TYPE): @@ -137,18 +185,29 @@ async def admin_callback(update: Update, context: ContextTypes.DEFAULT_TYPE): elif data == "force_check": await query.message.reply_text("🔄 Running immediate check...") - await check_webinars_job(context) + result = await check_webinars_job(context) + + if result is None: + await query.message.reply_text("❌ Check failed. See logs for details.") + elif result == 0: + await query.message.reply_text("✅ Check completed. No webinars found.") + else: + await query.message.reply_text(f"✅ Check completed. Found {result} webinar(s)!") # --- Webinar Checking Job --- async def check_webinars_job(context: ContextTypes.DEFAULT_TYPE): - """Background job to check for webinars using Async Playwright.""" + """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.") - return + return None webinar_details = [] @@ -199,6 +258,7 @@ async def check_webinars_job(context: ContextTypes.DEFAULT_TYPE): except Exception as e: logger.error(f"Error checking page: {e}") + return None finally: await page.close() await context_browser.close() @@ -208,7 +268,7 @@ async def check_webinars_job(context: ContextTypes.DEFAULT_TYPE): except Exception as e: logger.error(f"Playwright error: {e}") - return + return None # Notify subscribers if webinars found if webinar_details: @@ -221,6 +281,8 @@ async def check_webinars_job(context: ContextTypes.DEFAULT_TYPE): logger.info(f"Notification sent to {sub_id}") except Exception as e: logger.error(f"Failed to send to {sub_id}: {e}") + + return len(webinar_details) # --- Main --- @@ -242,6 +304,8 @@ def main(): # Handlers app.add_handler(CommandHandler("start", start)) app.add_handler(CommandHandler("help", help_command)) + app.add_handler(CommandHandler("adduser", add_user)) + app.add_handler(CommandHandler("removeuser", remove_user)) app.add_handler(CallbackQueryHandler(admin_callback)) # Job Queue From 380288d1036851df6ee477d2aeafed8d7d289c1b Mon Sep 17 00:00:00 2001 From: mr-forust Date: Wed, 26 Nov 2025 22:55:16 +0100 Subject: [PATCH 059/100] fix: port conflicts --- edu_master/compose.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/edu_master/compose.yaml b/edu_master/compose.yaml index e0f4e9b..09cc10e 100644 --- a/edu_master/compose.yaml +++ b/edu_master/compose.yaml @@ -4,8 +4,6 @@ services: restart: unless-stopped volumes: - redis-data:/data - ports: - - "6379:6379" healthcheck: test: [ "CMD", "redis-cli", "ping" ] interval: 5s @@ -16,8 +14,6 @@ services: 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 - ports: - - "3000:3000" session-keeper: build: ./phpsessid-bot From 5b1fa11b5e6c3a8f20b1849f1c25796062e1aee2 Mon Sep 17 00:00:00 2001 From: mr-forust Date: Thu, 27 Nov 2025 02:09:55 +0100 Subject: [PATCH 060/100] chore: switching to latest release of portainer --- portainer/compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/portainer/compose.yaml b/portainer/compose.yaml index aefd9d6..8d255c5 100644 --- a/portainer/compose.yaml +++ b/portainer/compose.yaml @@ -1,7 +1,7 @@ services: portainer: container_name: portainer - image: portainer/portainer-ce:lts + image: portainer/portainer-ce:latest restart: always volumes: - /var/run/docker.sock:/var/run/docker.sock From a54b7b000fca552f47717e2f314fef566cac9161 Mon Sep 17 00:00:00 2001 From: mr-forust Date: Thu, 27 Nov 2025 15:50:12 +0100 Subject: [PATCH 061/100] fix: add timeout for playwright to load page and debug response saving --- edu_master/webinar-checker/checker.py | 34 +++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/edu_master/webinar-checker/checker.py b/edu_master/webinar-checker/checker.py index d09c9fe..e0217f2 100644 --- a/edu_master/webinar-checker/checker.py +++ b/edu_master/webinar-checker/checker.py @@ -3,17 +3,17 @@ import logging import redis from telegram import Update, InlineKeyboardButton, InlineKeyboardMarkup -from telegram.ext import Application, CommandHandler, CallbackQueryHandler, ContextTypes, JobQueue +from telegram.ext import Application, CommandHandler, CallbackQueryHandler, ContextTypes from playwright.async_api import async_playwright -# Configure logging +# Logger logging.basicConfig( level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s' ) logger = logging.getLogger(__name__) -# Load configuration +# Load environment variables WEBINAR_URL = os.getenv('WEBINAR_URL', 'https://edu.edu.vn.ua/webinar/useractive') WEBINAR_CHECK_INTERVAL = int(os.getenv('WEBINAR_CHECK_INTERVAL', 60)) REDIS_HOST = os.getenv('REDIS_HOST', 'redis') @@ -207,9 +207,17 @@ async def check_webinars_job(context: ContextTypes.DEFAULT_TYPE): 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 webinar_details = [] + content = "" try: async with async_playwright() as p: @@ -237,6 +245,7 @@ async def check_webinars_job(context: ContextTypes.DEFAULT_TYPE): # 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() @@ -257,7 +266,14 @@ async def check_webinars_job(context: ContextTypes.DEFAULT_TYPE): logger.info("No webinars found (expected message present)") except Exception as e: - logger.error(f"Error checking page: {e}") + logger.error(f"Error checking page: {e}. Saving content for debug.") + # If page content is available, save it on error + try: + if page and not content: + content = await page.content() + except Exception: + pass # Ignore error during content retrieval on check error + return None finally: await page.close() @@ -269,6 +285,16 @@ async def check_webinars_job(context: ContextTypes.DEFAULT_TYPE): except Exception as e: logger.error(f"Playwright error: {e}") return None + + # --- DEBUG LOGGING (Saving last response content) --- + if not webinar_details 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}") + # ----------------------------------------------------- # Notify subscribers if webinars found if webinar_details: From 3bcabcce4b9f80ff0888d5376dfe5eff5752b2b0 Mon Sep 17 00:00:00 2001 From: mr-forust Date: Thu, 27 Nov 2025 16:33:15 +0100 Subject: [PATCH 062/100] feat: notify on new webinar, storing N last webinars in redis --- edu_master/webinar-checker/checker.py | 103 ++++++++++++++++++++++---- 1 file changed, 88 insertions(+), 15 deletions(-) diff --git a/edu_master/webinar-checker/checker.py b/edu_master/webinar-checker/checker.py index e0217f2..6eb5f50 100644 --- a/edu_master/webinar-checker/checker.py +++ b/edu_master/webinar-checker/checker.py @@ -1,6 +1,7 @@ import os import logging import redis +import json from telegram import Update, InlineKeyboardButton, InlineKeyboardMarkup from telegram.ext import Application, CommandHandler, CallbackQueryHandler, ContextTypes @@ -28,6 +29,7 @@ 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 5 webinars # Initialize Redis try: @@ -196,6 +198,30 @@ async def admin_callback(update: Update, context: ContextTypes.DEFAULT_TYPE): # --- Webinar Checking Job --- +def get_webinar_key(name: str, url: str) -> str: + """Generate unique key for a webinar based on name and URL.""" + return f"{name}|{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 5 most recent webinar keys in Redis.""" + # Keep only last 5 + webinar_keys = webinar_keys[-5:] + try: + redis_client.set(KEY_WEBINAR_HISTORY, json.dumps(webinar_keys)) + logger.info(f"Stored {len(webinar_keys)} webinar(s) in history") + 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. @@ -216,7 +242,7 @@ async def check_webinars_job(context: ContextTypes.DEFAULT_TYPE): # --------------------- return None - webinar_details = [] + current_webinars = [] # List of dicts with name, url, and formatted text content = "" try: @@ -259,9 +285,26 @@ async def check_webinars_job(context: ContextTypes.DEFAULT_TYPE): count = await rows.count() for i in range(count): - text = await rows.nth(i).inner_text() + row = rows.nth(i) + text = await row.inner_text() + if "Жодного онлайн уроку зараз" not in text: - webinar_details.append(text.strip()) + # 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)") @@ -287,7 +330,7 @@ async def check_webinars_job(context: ContextTypes.DEFAULT_TYPE): return None # --- DEBUG LOGGING (Saving last response content) --- - if not webinar_details and content: #if no webinars found, save the page 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) @@ -296,19 +339,49 @@ async def check_webinars_job(context: ContextTypes.DEFAULT_TYPE): logger.error(f"Failed to write debug HTML: {e}") # ----------------------------------------------------- - # Notify subscribers if webinars found - if webinar_details: - message = "🎓 Найден вебинар!\n\n" + "\n\n".join([f"📌 {d}" for d in webinar_details]) - subscribers = redis_client.smembers(KEY_SUBSCRIBERS) + # 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}") - for sub_id in subscribers: - try: - 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}") + # Find new webinars (not in history) + new_webinars = [] + current_keys = [] + + for webinar in current_webinars: + key = get_webinar_key(webinar['name'], 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: + message = "🎓 Новий вебінар!\n\n" + "\n\n".join([ + f"📌 {w['name']}\n🔗 https://edu.edu.vn.ua{w['url']}" + for w in 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: + 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(webinar_details) + return len(current_webinars) # --- Main --- From 6cb49be951ee93f39ecb3a33d614a56d577a1a42 Mon Sep 17 00:00:00 2001 From: mr-forust Date: Thu, 27 Nov 2025 18:58:17 +0100 Subject: [PATCH 063/100] chore: update gitignore, add translations --- .gitignore | 31 ++- edu_master/webinar-checker/checker.py | 277 +++++++++++++++++++++----- userbot/.gitignore | 11 +- 3 files changed, 254 insertions(+), 65 deletions(-) diff --git a/.gitignore b/.gitignore index f29520c..f36e287 100644 --- a/.gitignore +++ b/.gitignore @@ -29,8 +29,35 @@ traefik/certs/* # Python .python-version -.venv/ venv/ +pyc +unknown_errors.txt +moonlogs.txt +thumb.jpg +antipm_pic.jpg +musicbot/ +.trunk/ +previous_profiles/ +.python-version +/modules/__pycache__/ +__pycache__/ +*.session +*.session-old +*.db +*.sqlite3 +*-journal +/venv/ +.venv/ -#DataSecurity +# DataSecurity replacements.txt + +# Vscode +.vscode + +# Git +.gitattributes + +# Misc +.DS_Store +.idea \ No newline at end of file diff --git a/edu_master/webinar-checker/checker.py b/edu_master/webinar-checker/checker.py index 6eb5f50..0477481 100644 --- a/edu_master/webinar-checker/checker.py +++ b/edu_master/webinar-checker/checker.py @@ -40,6 +40,156 @@ except Exception as e: logger.error(f"Failed to connect to Redis: {e}") exit(1) +# --- Translations --- + +TRANSLATIONS = { + 'ru': { + 'welcome': "👋 Привет, {name}!\n\nЯ бот-уведомитель о вебинарах. Я буду сообщать вам, когда появится новый вебинар.\nВы подписаны на уведомления.", + 'welcome_admin': "\n\n👑 Режим администратора активен", + 'access_denied': "⛔ Доступ запрещен. Вас нет в белом списке.", + 'help_title': "🤖 Помощь по боту\n\n", + 'help_commands': "/start - Подписаться на уведомления\n/help - Показать это сообщение\n/language - Сменить язык", + 'help_admin': "\nКоманды администратора:\n/adduser [user_id] - Добавить пользователя в белый список\n/removeuser [user_id] - Удалить пользователя из белого списка\nИли используйте панель ниже для управления настройками.", + 'admin_only': "⛔ Только для администратора!", + 'user_added': "✅ Пользователь {user_id} добавлен в белый список", + 'user_removed': "✅ Пользователь {user_id} удален из белого списка", + 'user_not_in_whitelist': "⚠️ Пользователь {user_id} не был в белом списке", + 'cannot_remove_admin': "❌ Невозможно удалить администратора из белого списка", + 'invalid_user_id': "❌ Неверный ID пользователя. Должно быть число.", + 'usage_adduser': "Использование: /adduser [user_id]", + 'usage_removeuser': "Использование: /removeuser [user_id]", + 'whitelist_enabled': "✅ Белый список включен", + 'whitelist_disabled': "✅ Белый список отключен", + 'whitelist_title': "📋 Белый список:\n", + 'subscribers_title': "👥 Подписчики:\n", + 'empty': "Пусто", + 'force_check_running': "🔄 Запускаю проверку...", + 'check_failed': "❌ Проверка не удалась. Смотрите логи.", + 'check_completed_none': "✅ Проверка завершена. Вебинаров не найдено.", + 'check_completed': "✅ Проверка завершена. Найдено {count} вебинар(ов)!", + 'toggle_whitelist_disable': "🔒 Отключить белый список", + 'toggle_whitelist_enable': "🔓 Включить белый список", + 'view_whitelist': "📋 Посмотреть белый список", + 'view_subscribers': "👥 Посмотреть подписчиков", + 'force_check': "🔄 Принудительная проверка", + 'webinar_found': "🎓 Новый вебинар!\n\n", + 'webinar_item': "📌 {name}\n🔗 https://edu.edu.vn.ua{url}", + 'select_language': "🌐 Выберите язык / Оберіть мову / Select language:", + 'language_changed': "✅ Язык изменен на русский", + 'flag_ru': "🇷🇺 Русский", + 'flag_uk': "🇺🇦 Українська", + 'flag_en': "🇬🇧 English", + }, + 'uk': { + 'welcome': "👋 Привіт, {name}!\n\nЯ бот-сповіщувач про вебінари. Я повідомлятиму вас, коли з'явиться новий вебінар.\nВи підписані на сповіщення.", + 'welcome_admin': "\n\n👑 Режим адміністратора активний", + 'access_denied': "⛔ Доступ заборонено. Вас немає в білому списку.", + 'help_title': "🤖 Довідка по боту\n\n", + 'help_commands': "/start - Підписатися на сповіщення\n/help - Показати це повідомлення\n/language - Змінити мову", + 'help_admin': "\nКоманди адміністратора:\n/adduser [user_id] - Додати користувача до білого списку\n/removeuser [user_id] - Видалити користувача з білого списку\nАбо використовуйте панель нижче для керування налаштуваннями.", + 'admin_only': "⛔ Тільки для адміністратора!", + 'user_added': "✅ Користувач {user_id} доданий до білого списку", + 'user_removed': "✅ Користувач {user_id} видалений з білого списку", + 'user_not_in_whitelist': "⚠️ Користувач {user_id} не був у білому списку", + 'cannot_remove_admin': "❌ Неможливо видалити адміністратора з білого списку", + 'invalid_user_id': "❌ Невірний ID користувача. Має бути число.", + 'usage_adduser': "Використання: /adduser [user_id]", + 'usage_removeuser': "Використання: /removeuser [user_id]", + 'whitelist_enabled': "✅ Білий список увімкнено", + 'whitelist_disabled': "✅ Білий список вимкнено", + 'whitelist_title': "📋 Білий список:\n", + 'subscribers_title': "👥 Підписники:\n", + 'empty': "Порожньо", + 'force_check_running': "🔄 Запускаю перевірку...", + 'check_failed': "❌ Перевірка не вдалася. Дивіться логи.", + 'check_completed_none': "✅ Перевірка завершена. Вебінарів не знайдено.", + 'check_completed': "✅ Перевірка завершена. Знайдено {count} вебінар(ів)!", + 'toggle_whitelist_disable': "🔒 Вимкнути білий список", + 'toggle_whitelist_enable': "🔓 Увімкнути білий список", + 'view_whitelist': "📋 Переглянути білий список", + 'view_subscribers': "👥 Переглянути підписників", + 'force_check': "🔄 Примусова перевірка", + 'webinar_found': "🎓 Новий вебінар!\n\n", + 'webinar_item': "📌 {name}\n🔗 https://edu.edu.vn.ua{url}", + 'select_language': "🌐 Виберіть мову / Выберите язык / Select language:", + 'language_changed': "✅ Мову змінено на українську", + 'flag_ru': "🇷🇺 Русский", + 'flag_uk': "🇺🇦 Українська", + 'flag_en': "🇬🇧 English", + }, + 'en': { + 'welcome': "👋 Hello, {name}!\n\nI am the Webinar Checker Bot. I will notify you when a new webinar appears.\nYou have been subscribed to notifications.", + 'welcome_admin': "\n\n👑 Admin Mode Active", + 'access_denied': "⛔ Access denied. You are not on the whitelist.", + 'help_title': "🤖 Bot Help\n\n", + 'help_commands': "/start - Subscribe to notifications\n/help - Show this message\n/language - Change language", + 'help_admin': "\nAdmin Commands:\n/adduser [user_id] - Add user to whitelist\n/removeuser [user_id] - Remove user from whitelist\nOr use the panel below to manage settings.", + 'admin_only': "⛔ Admin only!", + 'user_added': "✅ User {user_id} added to whitelist", + 'user_removed': "✅ User {user_id} removed from whitelist", + 'user_not_in_whitelist': "⚠️ User {user_id} was not in whitelist", + 'cannot_remove_admin': "❌ Cannot remove admin from whitelist", + 'invalid_user_id': "❌ Invalid user ID. Must be a number.", + 'usage_adduser': "Usage: /adduser [user_id]", + 'usage_removeuser': "Usage: /removeuser [user_id]", + 'whitelist_enabled': "✅ Whitelist Enabled", + 'whitelist_disabled': "✅ Whitelist Disabled", + 'whitelist_title': "📋 Whitelist:\n", + 'subscribers_title': "👥 Subscribers:\n", + 'empty': "Empty", + 'force_check_running': "🔄 Running immediate check...", + 'check_failed': "❌ Check failed. See logs for details.", + 'check_completed_none': "✅ Check completed. No webinars found.", + 'check_completed': "✅ Check completed. Found {count} webinar(s)!", + 'toggle_whitelist_disable': "🔒 Disable Whitelist", + 'toggle_whitelist_enable': "🔓 Enable Whitelist", + 'view_whitelist': "📋 View Whitelist", + 'view_subscribers': "👥 View Subscribers", + 'force_check': "🔄 Force Check", + 'webinar_found': "🎓 New webinar found!\n\n", + 'webinar_item': "📌 {name}\n🔗 https://edu.edu.vn.ua{url}", + 'select_language': "🌐 Select language / Виберіть мову / Выберите язык:", + 'language_changed': "✅ Language changed to English", + 'flag_ru': "🇷🇺 Русский", + 'flag_uk': "🇺🇦 Українська", + 'flag_en': "🇬🇧 English", + } +} + +# --- 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: @@ -53,16 +203,16 @@ def is_whitelisted(user_id: int) -> bool: return redis_client.sismember(KEY_WHITELIST, str(user_id)) -def get_admin_keyboard(): +def get_admin_keyboard(user_id: int): """Generate admin panel keyboard.""" whitelist_enabled = redis_client.get(KEY_WHITELIST_ENABLED) != "0" - toggle_text = "🔒 Disable Whitelist" if whitelist_enabled else "🔓 Enable Whitelist" + 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("📋 View Whitelist", callback_data="view_whitelist")], - [InlineKeyboardButton("👥 View Subscribers", callback_data="view_subscribers")], - [InlineKeyboardButton("🔄 Force Check", callback_data="force_check")] + [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) @@ -74,84 +224,84 @@ async def start(update: Update, context: ContextTypes.DEFAULT_TYPE): logger.info(f"User {user.id} ({user.username}) started the bot.") if not is_whitelisted(user.id): - await update.message.reply_text("⛔ Access denied. You are not on the whitelist.") + await update.message.reply_text(t(user.id, 'access_denied')) return # Add to subscribers redis_client.sadd(KEY_SUBSCRIBERS, user.id) - msg = ( - f"👋 Hello {user.first_name}!\n\n" - "I am the Webinar Checker Bot. I will notify you when a new webinar appears.\n" - "You have been subscribed to notifications." - ) + msg = t(user.id, 'welcome', name=user.first_name) if user.id == ADMIN_ID: - msg += "\n\n👑 Admin Mode Active" - await update.message.reply_text(msg, parse_mode='HTML', reply_markup=get_admin_keyboard()) + msg += t(user.id, 'welcome_admin') + await update.message.reply_text(msg, parse_mode='HTML', reply_markup=get_admin_keyboard(user.id)) else: await update.message.reply_text(msg, parse_mode='HTML') async def help_command(update: Update, context: ContextTypes.DEFAULT_TYPE): """Handle /help command.""" - msg = ( - "🤖 Bot Help\n\n" - "/start - Subscribe to notifications\n" - "/help - Show this message\n" - ) - if update.effective_user.id == ADMIN_ID: - msg += ( - "\nAdmin Commands:\n" - "/adduser [user_id] - Add user to whitelist\n" - "/removeuser [user_id] - Remove user from whitelist\n" - "Or use the panel below to manage settings." - ) - await update.message.reply_text(msg, parse_mode='HTML', reply_markup=get_admin_keyboard()) + user_id = update.effective_user.id + msg = t(user_id, 'help_title') + t(user_id, 'help_commands') + + if user_id == ADMIN_ID: + msg += t(user_id, 'help_admin') + await update.message.reply_text(msg, parse_mode='HTML', reply_markup=get_admin_keyboard(user_id)) else: await update.message.reply_text(msg, parse_mode='HTML') +async def language_command(update: Update, context: ContextTypes.DEFAULT_TYPE): + """Handle /language command.""" + user_id = update.effective_user.id + await update.message.reply_text( + t(user_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).""" - if update.effective_user.id != ADMIN_ID: - await update.message.reply_text("⛔ 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("Usage: /adduser [user_id]") + 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(f"✅ User {user_id} added to whitelist") + 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("❌ Invalid user ID. Must be a number.") + 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).""" - if update.effective_user.id != ADMIN_ID: - await update.message.reply_text("⛔ 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("Usage: /removeuser [user_id]") + 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("❌ Cannot remove admin from whitelist") + 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(f"✅ User {user_id} removed from whitelist") + 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(f"⚠️ User {user_id} was not in whitelist") + await update.message.reply_text(t(admin_id, 'user_not_in_whitelist', user_id=user_id)) except ValueError: - await update.message.reply_text("❌ Invalid user ID. Must be a number.") + await update.message.reply_text(t(admin_id, 'invalid_user_id')) # --- Admin Callbacks --- @@ -161,7 +311,7 @@ async def admin_callback(update: Update, context: ContextTypes.DEFAULT_TYPE): user_id = query.from_user.id if user_id != ADMIN_ID: - await query.answer("⛔ Admin only!", show_alert=True) + await query.answer(t(user_id, 'admin_only'), show_alert=True) return await query.answer() @@ -171,30 +321,45 @@ async def admin_callback(update: Update, context: ContextTypes.DEFAULT_TYPE): 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 = "Disabled" if new_state == "0" else "Enabled" - await query.edit_message_reply_markup(reply_markup=get_admin_keyboard()) - await query.message.reply_text(f"✅ Whitelist {state_text}") + 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 = "📋 Whitelist:\n" + ("\n".join(members) if members else "Empty") + 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 = "👥 Subscribers:\n" + ("\n".join(subs) if subs else "Empty") + 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("🔄 Running immediate 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("❌ Check failed. See logs for details.") + await query.message.reply_text(t(user_id, 'check_failed')) elif result == 0: - await query.message.reply_text("✅ Check completed. No webinars found.") + await query.message.reply_text(t(user_id, 'check_completed_none')) else: - await query.message.reply_text(f"✅ Check completed. Found {result} webinar(s)!") + 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 --- @@ -364,16 +529,18 @@ async def check_webinars_job(context: ContextTypes.DEFAULT_TYPE): # Notify subscribers ONLY about NEW webinars if new_webinars: - message = "🎓 Новий вебінар!\n\n" + "\n\n".join([ - f"📌 {w['name']}\n🔗 https://edu.edu.vn.ua{w['url']}" - for w in 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 + 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: @@ -403,8 +570,12 @@ def main(): # Handlers app.add_handler(CommandHandler("start", start)) 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)) + + # Callback handlers - language selection first, then admin panel + app.add_handler(CallbackQueryHandler(language_callback, pattern="^lang_")) app.add_handler(CallbackQueryHandler(admin_callback)) # Job Queue diff --git a/userbot/.gitignore b/userbot/.gitignore index 64097b5..fccd91b 100644 --- a/userbot/.gitignore +++ b/userbot/.gitignore @@ -1,5 +1,6 @@ .DS_Store .gitattributes + .vscode /modules/__pycache__/ __pycache__/ @@ -12,14 +13,4 @@ __pycache__/ .venv/ /downloads/ /Downloads/ -/modules/custom_modules -.idea config.ini -unknown_errors.txt -moonlogs.txt -thumb.jpg -antipm_pic.jpg -musicbot/ -.trunk/ -previous_profiles/ -.python-version \ No newline at end of file From 6f2f70ad095076555f3b24e49cf623350162ef24 Mon Sep 17 00:00:00 2001 From: mr-forust Date: Fri, 28 Nov 2025 08:16:04 +0100 Subject: [PATCH 064/100] chore: ingore streaming services --- .gitignore | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.gitignore b/.gitignore index f36e287..166fda0 100644 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,15 @@ metube/MeTube_downloads uptime-kuma/data/ termix/termix-data/* +# Steaming services files +streaming/jellyfin/* +streaming/jellyseerr/* +streaming/sonarr/* +streaming/radarr/* +streaming/data/* +streaming/qbittorrent/* +streaming/prowlarr/* + # Homepage homepage/files/assets/images/team/* From 2d05a1911c575efaf8989de29aa2a185f7ec0ca8 Mon Sep 17 00:00:00 2001 From: mr-forust Date: Sun, 30 Nov 2025 03:28:41 +0100 Subject: [PATCH 065/100] feat: cloudflare IP sync (ddns) --- .gitignore | 3 ++- cfddns/compose.yaml | 13 +++++++++++++ cfddns/config.json.example | 22 ++++++++++++++++++++++ 3 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 cfddns/compose.yaml create mode 100644 cfddns/config.json.example diff --git a/.gitignore b/.gitignore index 166fda0..ade6b3e 100644 --- a/.gitignore +++ b/.gitignore @@ -18,6 +18,7 @@ portainer/portainer_data/* metube/MeTube_downloads uptime-kuma/data/ termix/termix-data/* +cfddns/config.json # Steaming services files streaming/jellyfin/* @@ -69,4 +70,4 @@ replacements.txt # Misc .DS_Store -.idea \ No newline at end of file +.idea diff --git a/cfddns/compose.yaml b/cfddns/compose.yaml new file mode 100644 index 0000000..8c3a0f3 --- /dev/null +++ b/cfddns/compose.yaml @@ -0,0 +1,13 @@ +services: + cloudflare-ddns: + image: timothyjmiller/cloudflare-ddns:latest + container_name: cloudflare-ddns + security_opt: + - no-new-privileges:true + network_mode: 'host' + environment: + - PUID=1000 + - PGID=1000 + volumes: + - ./config.json:/config.json + restart: unless-stopped diff --git a/cfddns/config.json.example b/cfddns/config.json.example new file mode 100644 index 0000000..d290046 --- /dev/null +++ b/cfddns/config.json.example @@ -0,0 +1,22 @@ +{ + "cloudflare": [ + { + "authentication": { + "api_token": "API_TOKEN" + }, + "api_key": { + "api_key": "api_key_here", + "account_email": "your_email_here" + } + "zone_id": "your_zone-id", + "subdomains": [ + { "name": "", "proxied": true }, + { "name": "www", "proxied": true } + ] + } + ], + "a": true, + "aaaa": false, + "purgeUnknownRecords": false, + "ttl": 300 +} From 8b6815f31454f71d3a850e0c6f4444e3d39b3139 Mon Sep 17 00:00:00 2001 From: mr-forust Date: Mon, 1 Dec 2025 23:03:28 +0100 Subject: [PATCH 066/100] chore: gitignored temp folder for references --- .gitignore | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.gitignore b/.gitignore index ade6b3e..b6bc453 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,8 @@ sync.ffs_lock .env .env.anna .env.forust +.env.* +.env.*example # Volumes and data directories gitea/gitea-db/ @@ -71,3 +73,9 @@ replacements.txt # Misc .DS_Store .idea +<<<<<<< HEAD +======= + +# Temp files +edu_master/temp/ +>>>>>>> 1abf4a7 (chore: gitignored temp folder for references) From 1ec145d4cf38e8a6b5137daae3068849ba217aea Mon Sep 17 00:00:00 2001 From: mr-forust Date: Wed, 3 Dec 2025 00:30:06 +0100 Subject: [PATCH 067/100] chore: add xdfnx domain to team links --- homepage/files/index.html | 41 ++++++++++++++++++++++++++------------- 1 file changed, 27 insertions(+), 14 deletions(-) diff --git a/homepage/files/index.html b/homepage/files/index.html index 1573d24..3c2f5eb 100644 --- a/homepage/files/index.html +++ b/homepage/files/index.html @@ -1,5 +1,6 @@ + @@ -8,6 +9,7 @@ +
    @@ -22,23 +24,23 @@

    ./socials

    @@ -94,31 +96,41 @@

    ./xrock_team

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

    - +
    -
    +
    +
    MrForust
    -
    +
    +
    Anna~
    -
    +
    +
    Chernuha
    -
    +
    +
    p1ngvi
    - +
    -
    - xdfnx +
    +
    + xdfnx
    @@ -152,7 +164,7 @@
    • - +