Add cyberchef and update config

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>

Makefile

@@ -11,18 +11,21 @@
 #//                                                          //
 #//////////////////////////////////////////////////////////////
 
-ADMIN_SERVICES := openssh uptime-kuma yacht
+ADMIN_SERVICES := openssh 
-BLOG_SERVICES := wordpress
+#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
+#IA_SERVICES := open-webui
-SHARING_SERVICES := psitransfer picoshare privatebin projectsend jellyfin dufs syncthing
+#SHARING_SERVICES := psitransfer picoshare privatebin projectsend jellyfin dufs syncthing
-TORRENTS_SERVICES := qbittorrent transmission
+TORRENTS_SERVICES := qbittorrent
-UTILS_SERVICES := it-tools stirlingpdf omni-tools
+# transmission
+UTILS_SERVICES := it-tools omni-tools cyberchef
+# stirlingpdf
 MAIN_SERVICES := main_infrastructure caddy homepage
 
 PROJECT_DIRECTORY := infrastructure

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

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
+	}
+}

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

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

infrastructure/services/homepage/config/proxmox.yaml

@@ -0,0 +1,4 @@
+---
+# url: https://proxmox.host.or.ip:8006
+# token: username@pam!Token ID
+# secret: secret

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/

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:

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

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
+      - public_data:/public_data:rw
-      - private_data:/private:rw
+      - private_data:/private_data:rw
       - caddy_data:/caddy_data:rw
       - caddy_config:/caddy_config:rw
       - caddy_backup:/caddy_backup:rw

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

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
+#    gitea_db
-    forgejo_runner
+#    gitea_data
-    gitea_data
+#    gitea_runner
+#    gitea_config
     jellyfin_config
     picoshare_data
     forgejo_data