diff --git a/Makefile b/Makefile index 4aa7fac..2fe5237 100644 --- a/Makefile +++ b/Makefile @@ -15,10 +15,10 @@ BLOG_SERVICES := wordpress TORRENTS_SERVICES := qbittorrent transmission SHARING_SERVICES := psitransfer picoshare privatebin projectsend jellyfin dufs gitea syncthing ADMIN_SERVICES := yacht uptime-kuma openssh -UTILS_SERVICES := it-tools stirlingpdf +UTILS_SERVICES := it-tools stirlingpdf omni-tools IA_SERVICES := open-webui # gitea-runner -GAME_SERVICES := mc-server mc-backup 7daystodie_server 7daystodie_backup satisfactory_server satisfactory_backup +#GAME_SERVICES := mc-server mc-backup 7daystodie_server 7daystodie_backup satisfactory_server satisfactory_backup PROJECT_DIRECTORY := infrastructure DOCKER_PROFILES := main_infrastructure caddy homepage $(BLOG_SERVICES) $(SHARING_SERVICES) $(TORRENTS_SERVICES) $(ADMIN_SERVICES) $(UTILS_SERVICES) $(IA_SERVICES) $(GAME_SERVICES) diff --git a/README.md b/README.md index a49549a..928f2e3 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,8 @@ If you have any **questions** or **suggestions**, feel free to open an issue or - [x] qbittorrent and transmission (Torrent client/server) - [x] SyncThing (File synchronization) - [x] PsiTransfer, ProjectSend, Picoshare (File sharing) -- [x] it-tools (Tools for IT) +- [x] it-tools and omni-tools (Tools for IT) +- [x] Open-WebUI (Local chatGPT) - [x] Privatebin (Pastebin) - [x] Yacht (Web interface for managing docker containers) - [X] [Satisfactory](https://github.com/bensuperpc/docker-satisfactory) @@ -92,6 +93,7 @@ And then, caddy will generate the certificate for you and renew it automatically | [syncthing.bensuperpc.org](https://syncthing.bensuperpc.org) | Sub | SyncThing for file synchronization | | [psitransfer.bensuperpc.org](https://psitransfer.bensuperpc.org) | Sub | PsiTransfer for file sharing | | [it-tools.bensuperpc.org](https://it-tools.bensuperpc.org) | Sub | Tools for IT | +| [omni-tools.bensuperpc.org](https://omni-tools.bensuperpc.org) | Sub | Tools for IT | | [privatebin.bensuperpc.org](https://privatebin.bensuperpc.org) | Sub | Pastebin | | [yacht.bensuperpc.org](https://yacht.bensuperpc.org) | Sub | Web interface for managing docker containers | | [projectsend.bensuperpc.org](https://projectsend.bensuperpc.org) | Sub | ProjectSend for file sharing | @@ -319,6 +321,7 @@ ssh -p 2222 admin@bensuperpc.org - [SyncThing](https://syncthing.net/) - [PsiTransfer](https://psitransfer.com/) - [It-tools](https://github.com/CorentinTh/it-tools) +- [Omni-tools](https://github.com/iib0011/omni-tools) - [Privatebin](https://github.com/PrivateBin/PrivateBin) - [ghost](https://ghost.org) - [Homepage Tuto](https://belginux.com/installer-homepage-avec-docker/) diff --git a/infrastructure/docker-compose.yml b/infrastructure/docker-compose.yml index 6ca0c76..ae3f587 100644 --- a/infrastructure/docker-compose.yml +++ b/infrastructure/docker-compose.yml @@ -13,6 +13,8 @@ include: - services/homepage/docker-compose.homepage.yml # It-tools - services/it-tools/docker-compose.it-tools.yml +# omni-tools + - services/omni-tools/docker-compose.omni-tools.yml # Jellyfin - services/jellyfin/docker-compose.jellyfin.yml # Openssh diff --git a/infrastructure/services/caddy/config/bensuperpc.org/Caddyfile b/infrastructure/services/caddy/config/bensuperpc.org/Caddyfile index f68eb58..ded3957 100644 --- a/infrastructure/services/caddy/config/bensuperpc.org/Caddyfile +++ b/infrastructure/services/caddy/config/bensuperpc.org/Caddyfile @@ -60,6 +60,16 @@ it-tools.{$MAIN_DOMAIN} { } } +omni-tools.{$MAIN_DOMAIN} { + # Load balance between 2 instances + reverse_proxy { + to omni-tools0:80 omni-tools1:80 + lb_policy round_robin + lb_retries 3 + lb_try_interval 1s + } +} + uptimekuma.{$MAIN_DOMAIN} { reverse_proxy uptime-kuma:3001 } @@ -106,10 +116,6 @@ syncthing.{$MAIN_DOMAIN} { } } -tools.{$MAIN_DOMAIN} { - redir https://it-tools.{$MAIN_DOMAIN} permanent -} - privatebin.{$MAIN_DOMAIN} { reverse_proxy privatebin:8080 } diff --git a/infrastructure/services/homepage/config/services.yaml b/infrastructure/services/homepage/config/services.yaml index 774c174..aefa155 100644 --- a/infrastructure/services/homepage/config/services.yaml +++ b/infrastructure/services/homepage/config/services.yaml @@ -78,6 +78,12 @@ description: IT Tools ping: it-tools.bensuperpc.org container: it-tools0 + - omni-tools: + icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/it-tools.png + href: https://omni-tools.bensuperpc.org/ + description: Omni Tools + ping: omni-tools.bensuperpc.org + container: omni-tools0 - stirlingpdf: #icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/stirlingpdf.png href: https://stirlingpdf.bensuperpc.org/ diff --git a/infrastructure/services/omni-tools/docker-compose.omni-tools.yml b/infrastructure/services/omni-tools/docker-compose.omni-tools.yml new file mode 100644 index 0000000..51dbc3d --- /dev/null +++ b/infrastructure/services/omni-tools/docker-compose.omni-tools.yml @@ -0,0 +1,51 @@ +services: + # omni-tools + omni-tools0: + image: iib0011/omni-tools:latest + container_name: omni-tools0 + profiles: + - omni-tools + 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 + + omni-tools1: + image: iib0011/omni-tools:latest + container_name: omni-tools1 + profiles: + - omni-tools + 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