From f48cbcc522b7c7370c47d502ed037fd92d4214c7 Mon Sep 17 00:00:00 2001 From: Bensuperpc Date: Fri, 22 Aug 2025 23:44:57 +0200 Subject: [PATCH] Add cyberchef and update config Signed-off-by: Bensuperpc --- Makefile | 17 ++++--- infrastructure/docker-compose.yml | 2 + .../caddy/config/website/cyberchef.caddy | 9 ++++ .../caddy/config/website/it-tools.caddy | 2 +- .../cyberchef/docker-compose.cyberchef.yml | 51 +++++++++++++++++++ .../services/homepage/config/proxmox.yaml | 4 ++ .../services/homepage/config/services.yaml | 6 +++ .../homepage/docker-compose.homepage.yml | 2 +- .../it-tools/docker-compose.it-tools.yml | 4 +- .../openssh/docker-compose.openssh.yml | 4 +- .../docker-compose.qbittorrent.yml | 3 ++ tools/docker_volumes_export.sh | 26 ++++------ 12 files changed, 102 insertions(+), 28 deletions(-) create mode 100644 infrastructure/services/caddy/config/website/cyberchef.caddy create mode 100644 infrastructure/services/cyberchef/docker-compose.cyberchef.yml create mode 100644 infrastructure/services/homepage/config/proxmox.yaml diff --git a/Makefile b/Makefile index 712a684..a022fe1 100644 --- a/Makefile +++ b/Makefile @@ -11,18 +11,21 @@ #// // #////////////////////////////////////////////////////////////// -ADMIN_SERVICES := openssh uptime-kuma yacht -BLOG_SERVICES := wordpress +ADMIN_SERVICES := openssh +#uptime-kuma yacht +#BLOG_SERVICES := wordpress #7DAYS_TO_DIE_SERVICES := 7daystodie_server 7daystodie_backup #MINECRAFT_SERVICES := minecraft_server minecraft_backup #SATISFACTORY_SERVICES := satisfactory_server satisfactory_backup -GIT_SERVICES := forgejo +#GIT_SERVICES := forgejo # forgejo-runner # gitea gitea-runner -IA_SERVICES := open-webui -SHARING_SERVICES := psitransfer picoshare privatebin projectsend jellyfin dufs syncthing -TORRENTS_SERVICES := qbittorrent transmission -UTILS_SERVICES := it-tools stirlingpdf omni-tools +#IA_SERVICES := open-webui +#SHARING_SERVICES := psitransfer picoshare privatebin projectsend jellyfin dufs syncthing +TORRENTS_SERVICES := qbittorrent +# transmission +UTILS_SERVICES := it-tools omni-tools cyberchef +# stirlingpdf MAIN_SERVICES := main_infrastructure caddy homepage PROJECT_DIRECTORY := infrastructure diff --git a/infrastructure/docker-compose.yml b/infrastructure/docker-compose.yml index 624d7ab..aa7e7a2 100644 --- a/infrastructure/docker-compose.yml +++ b/infrastructure/docker-compose.yml @@ -17,6 +17,8 @@ include: - services/it-tools/docker-compose.it-tools.yml # omni-tools - services/omni-tools/docker-compose.omni-tools.yml +# cyberchef + - services/cyberchef/docker-compose.cyberchef.yml # Jellyfin - services/jellyfin/docker-compose.jellyfin.yml # Openssh diff --git a/infrastructure/services/caddy/config/website/cyberchef.caddy b/infrastructure/services/caddy/config/website/cyberchef.caddy new file mode 100644 index 0000000..b4249e2 --- /dev/null +++ b/infrastructure/services/caddy/config/website/cyberchef.caddy @@ -0,0 +1,9 @@ +cyberchef.{$MAIN_DOMAIN} { + # Load balance between 2 instances + reverse_proxy { + to cyberchef0:8000 cyberchef1:8000 + lb_policy round_robin + lb_retries 3 + lb_try_interval 1s + } +} diff --git a/infrastructure/services/caddy/config/website/it-tools.caddy b/infrastructure/services/caddy/config/website/it-tools.caddy index fd2d8b7..1b0c170 100644 --- a/infrastructure/services/caddy/config/website/it-tools.caddy +++ b/infrastructure/services/caddy/config/website/it-tools.caddy @@ -1,7 +1,7 @@ it-tools.{$MAIN_DOMAIN} { # Load balance between 2 instances reverse_proxy { - to it-tools0:80 it-tools1:80 + to it-tools0:8080 it-tools1:8080 lb_policy round_robin lb_retries 3 lb_try_interval 1s diff --git a/infrastructure/services/cyberchef/docker-compose.cyberchef.yml b/infrastructure/services/cyberchef/docker-compose.cyberchef.yml new file mode 100644 index 0000000..4cc6b72 --- /dev/null +++ b/infrastructure/services/cyberchef/docker-compose.cyberchef.yml @@ -0,0 +1,51 @@ +services: + # cyberchef + cyberchef0: + image: mpepping/cyberchef:latest + container_name: cyberchef0 + profiles: + - cyberchef + restart: on-failure:5 + depends_on: + - caddy + networks: + - infra-network + read_only: false + security_opt: + - no-new-privileges:true + cap_drop: + - SYS_ADMIN + + deploy: + resources: + limits: + cpus: '0.5' + memory: 512M + reservations: + cpus: '0.001' + memory: 20M + + cyberchef1: + image: mpepping/cyberchef:latest + container_name: cyberchef1 + profiles: + - cyberchef + restart: on-failure:5 + depends_on: + - caddy + networks: + - infra-network + read_only: false + security_opt: + - no-new-privileges:true + cap_drop: + - SYS_ADMIN + + deploy: + resources: + limits: + cpus: '0.5' + memory: 512M + reservations: + cpus: '0.001' + memory: 20M diff --git a/infrastructure/services/homepage/config/proxmox.yaml b/infrastructure/services/homepage/config/proxmox.yaml new file mode 100644 index 0000000..9fd1836 --- /dev/null +++ b/infrastructure/services/homepage/config/proxmox.yaml @@ -0,0 +1,4 @@ +--- +# url: https://proxmox.host.or.ip:8006 +# token: username@pam!Token ID +# secret: secret diff --git a/infrastructure/services/homepage/config/services.yaml b/infrastructure/services/homepage/config/services.yaml index d425e15..ce1f594 100644 --- a/infrastructure/services/homepage/config/services.yaml +++ b/infrastructure/services/homepage/config/services.yaml @@ -84,6 +84,12 @@ description: Omni Tools ping: omni-tools.bensuperpc.org container: omni-tools0 + - cyberchef: + icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/cyberchef.png + href: https://cyberchef.bensuperpc.org/ + description: CyberChef + ping: cyberchef.bensuperpc.org + container: cyberchef0 - stirlingpdf: #icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/stirlingpdf.png href: https://stirlingpdf.bensuperpc.org/ diff --git a/infrastructure/services/homepage/docker-compose.homepage.yml b/infrastructure/services/homepage/docker-compose.homepage.yml index 15ce497..fe98017 100644 --- a/infrastructure/services/homepage/docker-compose.homepage.yml +++ b/infrastructure/services/homepage/docker-compose.homepage.yml @@ -15,7 +15,7 @@ services: - ./env/homepage.env volumes: - homepage_log:/app/logs - - ./config:/app/config:ro + - ./config:/app/config - ./image:/app/public/image:ro - /var/run/docker.sock:/var/run/docker.sock:ro # develop: diff --git a/infrastructure/services/it-tools/docker-compose.it-tools.yml b/infrastructure/services/it-tools/docker-compose.it-tools.yml index 12e914b..f124780 100644 --- a/infrastructure/services/it-tools/docker-compose.it-tools.yml +++ b/infrastructure/services/it-tools/docker-compose.it-tools.yml @@ -1,7 +1,7 @@ services: # it-tools it-tools0: - image: corentinth/it-tools:latest + image: ghcr.io/sharevb/it-tools:latest container_name: it-tools0 profiles: - it-tools @@ -26,7 +26,7 @@ services: memory: 20M it-tools1: - image: corentinth/it-tools:latest + image: ghcr.io/sharevb/it-tools:latest container_name: it-tools1 profiles: - it-tools diff --git a/infrastructure/services/openssh/docker-compose.openssh.yml b/infrastructure/services/openssh/docker-compose.openssh.yml index c04ccc4..cdd9283 100644 --- a/infrastructure/services/openssh/docker-compose.openssh.yml +++ b/infrastructure/services/openssh/docker-compose.openssh.yml @@ -14,8 +14,8 @@ services: volumes: - openssh_config:/config:rw - ./config/authorized_keys:/authorized_ssh_keys:ro - - public_data:/public:rw - - private_data:/private:rw + - public_data:/public_data:rw + - private_data:/private_data:rw - caddy_data:/caddy_data:rw - caddy_config:/caddy_config:rw - caddy_backup:/caddy_backup:rw diff --git a/infrastructure/services/qbittorrent/docker-compose.qbittorrent.yml b/infrastructure/services/qbittorrent/docker-compose.qbittorrent.yml index 166501f..4354537 100644 --- a/infrastructure/services/qbittorrent/docker-compose.qbittorrent.yml +++ b/infrastructure/services/qbittorrent/docker-compose.qbittorrent.yml @@ -13,6 +13,9 @@ services: environment: - PUID=${PUID:-1000} - PGID=${PGID:-1000} + ports: + - 6881:6881 + - 6881:6881/udp volumes: - qbittorrent_config:/config - public_data:/downloads diff --git a/tools/docker_volumes_export.sh b/tools/docker_volumes_export.sh index b8fe96b..5603980 100755 --- a/tools/docker_volumes_export.sh +++ b/tools/docker_volumes_export.sh @@ -7,14 +7,17 @@ volumes=( 7daystodie_server_save 7daystodie_server_config_lgsm 7daystodie_server_log -# 7daystodie_server_file + 7daystodie_server_file # satisfactory_server_config +# satisfactory_backup forgejo_data wordpress_db minecraft_proxy_data + minecraft_rcon_data + minecraft_server_data + minecraft_server_backup stirlingpdf_tessdata wordpress - gitea_db # wordpress_backup projectsend_share transmission_config @@ -22,33 +25,26 @@ volumes=( projectsend_db projectsend_config open-webui - minecraft_rcon_data jellyfin_cache caddy_backup -# satisfactory_backup + caddy_config + caddy_data homepage_log syncthing_config openssh_config - minecraft_server_backup qbittorrent_config - gitea_runner - gitea_config - minecraft_server_data ollama - caddy_data - forgejo_config stirlingpdf_config uptimekuma_data # private_data yacht_config transmission_watch - forgejo_db privatebin_data - caddy_config psitransfer_data - forgejo_certs - forgejo_runner - gitea_data +# gitea_db +# gitea_data +# gitea_runner +# gitea_config jellyfin_config picoshare_data forgejo_data