ldapauth

.github/FUNDING.yml

@@ -1,4 +1,3 @@
-liberapay: marcpartensky
 patreon: marcpartensky
 github: marcpartensky
 custom:

.github/workflows/check-docker-compose.yml

@@ -23,5 +23,4 @@ jobs:
         run: make merge
       - name: Validate docker-compose.yml
         # run: docker-compose -f stacks/docker-compose.yml config
-        # run: /opt/validator/validator-cli.py -f stacks/docker-compose.yml
-        run: docker-compose -f stacks/docker-compose.yml ps
+        run: /opt/validator/validator-cli.py -f stacks/docker-compose.yml

.gitignore

@@ -10,32 +10,8 @@ data/authelia
 data/mx-puppet-discord
 data/matrix
 data/heimdall
+data/traefik
 data/pihole/etc-pihole
 data/pxe
-data/postgres/certs
-data/wireguard
-data/vaultwarden
-data/filebrowser
-data/focalboard
-data/openvpn_*
-data/mailcow
-data/dockvpn
-data/hydra
-data/yt-dlp
-data/mongo
-data/gpg
-data/redis
-data/fdroid
-data/grafana
-data/qbittorrent
-data/webdav
-data/pufferpanel
-data/dockge
-data/ocis
-data/owncloud
-data/wg-easy
-data/nextcloud
 data.tar.gz
-data.7z
-data.7z.gpg
 services/template.yml

Makefile

@@ -8,24 +8,9 @@ mswarm: merge
 	docker stack deploy -c stacks/docker-compose.yml vps
 down:
 	docker stack rm vps
-pull:
-	for file in services/*; do docker-compose -f $$file pull; done
 export:
-	7z a -p data.7z data
-import:
-	7z x -p data.7z
-sign:
-	gpg --encrypt --sign --recipient 'marc@marcpartensky.com' data.7z
-	# rm data.tgz
-networks:
-	docker network create --attachable caddy || true
-	docker network create --attachable ldap || true
-	docker network create --attachable postgres || true
-	docker network create --attachable mongo || true
-	docker network create --attachable vpn || true
-	docker network create --attachable redis || true
-	docker network create --subnet 172.22.1.0/24 --gateway 172.22.1.1 --attachable mailcow || true
-	docker network create --subnet 10.22.69.0/24 --gateway 10.22.69.1 --attachable pritunl || true
-node:
-	docker node update --label-add net=web contabo
-	docker node update --label-add net=none tower
+	tar cvzf data.tgz data
+	gpg --encrypt --recipient 'marc.partensky@gmail.com' data.tgz
+	rm data.tgz
+network:
+	docker network create --driver overlay --attachable caddy

README.md

@@ -1,56 +1,27 @@
-<!-- [![Docker Swarm Deployed](https://github.com/MarcPartensky/Docker/actions/workflows/docker-swarm-deploy.yml/badge.svg)](https://github.com/MarcPartensky/Docker/actions/workflows/docker-swarm-deploy.yml) -->
+[![Docker Swarm Deployed](https://github.com/MarcPartensky/Docker/actions/workflows/docker-swarm-deploy.yml/badge.svg)](https://github.com/MarcPartensky/Docker/actions/workflows/docker-swarm-deploy.yml)
 
 # Docker
-<!-- [![Docker Swarm Services](https://cdn.discordapp.com/attachments/809914059981586462/1042966875514077227/unknown.png)](https://swarm.marcpartensky.com) -->
-[![Heimdall Portal](https://i.imgur.com/RiHrnck.jpeg)](https://heimdall.marcpartensky.com)
-
-Visit my [cloud](https://heimdall.marcpartensky.com)!
-
-Over 150 docker compose files are in the `services` folder.
 
 ## Domains
-- https://adguard.marcpartensky.com
-- https://arch.marcpartensky.com
-- https://authentik.marcpartensky.com
-- https://cron.marcpartensky.com
-- https://dbdesigner.marcpartensky.com
-- https://dockge.marcpartensky.com
-- https://docuseal.marcpartensky.com
-- https://pad.marcpartensky.com
-- https://firefox.marcpartensky.com
-- https://file.marcpartensky.com
-- https://board.marcpartensky.com
+- https://marcpartensky.com
+- https://pandoc.marcpartensky.com
+- https://ialab.marcpartensky.com
+- https://notebook.marcpartensky.com
+- https://searx.marcpartensky.com
+- https://cloud.marcpartensky.com
+- https://wordpress.marcpartensky.com
 - https://git.marcpartensky.com
 - https://gitlab.marcpartensky.com
+- https://todolist.marcpartensky.com
+- https://api.todolist.marcpartensky.com
+- https://uml.marcpartensky.com
 - https://grafana.marcpartensky.com
-- https://heimdall.marcpartensky.com
-- https://homer.marcpartensky.com
-- https://jellyfin.marcpartensky.com
-- https://jenkins.marcpartensky.com
-- https://jupyterlab.marcpartensky.com
+- https://prometheus.marcpartensky.com
+- https://swarm.marcpartensky.com
+- https://auth.marcpartensky.com
+- https://seafile.marcpartensky.com
 - https://mail.marcpartensky.com
-- https://mcmyadmin.marcpartensky.com
-- https://storage.marcpartensky.com
-- https://pandoc.marcpartensky.com
-- https://paperless.marcpartensky.com
-- https://peertube.marcpartensky.com
-- https://pgadmin.marcpartensky.com
-- https://pgweb.marcpartensky.com
-- https://docker.marcpartensky.com
-- https://printer.marcpartensky.com
-- https://torrent.marcpartensky.com
-- https://rancher.marcpartensky.com
-- https://cv.marcpartensky.com
-- https://serge.marcpartensky.com
-- https://syncthing.marcpartensky.com
-- https://traefik.marcpartensky.com
-- https://vault.marcpartensky.com
-- https://terminal.marcpartensky.com
-- https://webshot.marcpartensky.com
-- https://marcpartensky.com
-- https://wger.marcpartensky.com
-- https://wss.marcpartensky.com
-- https://yt.marcpartensky.com
+- https://arch.marcpartensky.com
 <!-- - https://dns.marcpartensky.com -->
 <!-- - https://glou.marcpartensky.com -->
 <!-- - https://minecraft.marcpartensky.com -->

bin/docker-kit.sh

@@ -5,13 +5,10 @@ export COMPOSE_PATH_SEPARATOR=":"
 export COMPOSE_FILE=$(find $PROJECT_PATH/services/*.yml | xargs -I @ echo -n @:)
 export COMPOSE_FILE=${COMPOSE_FILE::-1}
 
-# tool=podman-compose
-tool=docker-compose
-
 
 if [ "$1" = "-f" ]
 then
-    $tool --file $@
+    docker-compose --file $@
     exit
 fi
 
@@ -19,10 +16,10 @@ if [ -f $PWD/docker-compose.yml ]
 then
     if [ "$#" = 0 ]
     then
-        $tool ps
+        docker-compose ps
         exit
     fi
-    $tool --file $PWD/docker-compose.yml $@
+    docker-compose --file $PWD/docker-compose.yml $@
     exit
 fi
 
@@ -32,19 +29,19 @@ then
     exit
 fi
 
-$tool $@
+docker-compose $@
 if [ "$1" = "up" ]
 then
     if [ "$2" = "-d" ]
     then
-        $tool logs -f ${@: 3}
+        docker-compose logs -f ${@: 3}
     else
-        $tool logs -f ${@: 2}
+        docker-compose logs -f ${@: 2}
     fi
 elif [ "$1" = "start" ]
 then
-    $tool logs -f ${@: 2}
+    docker-compose logs -f ${@: 2}
 elif [ "$1" = "restart" ]
 then
-    $tool logs -f ${@: 2}
+    docker-compose logs -f ${@: 2}
 fi

bin/docker-setup.sh

@@ -1,8 +1,5 @@
 #!/bin/sh
 
-# tool=podman-compose
-tool="docker compose"
-
 if [ $1 = merge ]
 then
     cat ./env/$2.txt | xargs -I @ echo ./services/@.yml | xargs ./bin/docker-merge.py > ./stacks/docker-compose.yml
@@ -29,7 +26,7 @@ config_files() {
 
 if [ -z $STACK ]
 then
-    cmd="$tool $(config_files) up -d --force-recreate"
+    cmd="docker compose $(config_files) up -d"
 else
     cmd="docker stack deploy $(config_files) $STACK"
 fi

data/adguard/AdGuardHome.yaml

@@ -1,196 +0,0 @@
-http:
-  pprof:
-    port: 6060
-    enabled: false
-  address: 0.0.0.0:3000
-  session_ttl: 720h
-users:
-  - name: marc
-    password: $2a$10$E9cknJr/bTLtSUJ9EaW8r.Gw30FX8Plm8jgq.LaYxMwiX4DEuDK7O
-auth_attempts: 5
-block_auth_min: 15
-http_proxy: ""
-language: ""
-theme: auto
-dns:
-  bind_hosts:
-    - 0.0.0.0
-  port: 53
-  anonymize_client_ip: false
-  ratelimit: 20
-  ratelimit_subnet_len_ipv4: 24
-  ratelimit_subnet_len_ipv6: 56
-  ratelimit_whitelist: []
-  refuse_any: true
-  upstream_dns:
-    - https://dns10.quad9.net/dns-query
-  upstream_dns_file: ""
-  bootstrap_dns:
-    - 9.9.9.10
-    - 149.112.112.10
-    - 2620:fe::10
-    - 2620:fe::fe:10
-  fallback_dns: []
-  upstream_mode: load_balance
-  fastest_timeout: 1s
-  allowed_clients: []
-  disallowed_clients: []
-  blocked_hosts:
-    - version.bind
-    - id.server
-    - hostname.bind
-  trusted_proxies:
-    - 127.0.0.0/8
-    - ::1/128
-  cache_size: 4194304
-  cache_ttl_min: 0
-  cache_ttl_max: 0
-  cache_optimistic: false
-  bogus_nxdomain: []
-  aaaa_disabled: false
-  enable_dnssec: false
-  edns_client_subnet:
-    custom_ip: ""
-    enabled: false
-    use_custom: false
-  max_goroutines: 300
-  handle_ddr: true
-  ipset: []
-  ipset_file: ""
-  bootstrap_prefer_ipv6: false
-  upstream_timeout: 10s
-  private_networks: []
-  use_private_ptr_resolvers: true
-  local_ptr_upstreams: []
-  use_dns64: false
-  dns64_prefixes: []
-  serve_http3: false
-  use_http3_upstreams: false
-  serve_plain_dns: true
-  hostsfile_enabled: true
-tls:
-  enabled: false
-  server_name: ""
-  force_https: false
-  port_https: 443
-  port_dns_over_tls: 853
-  port_dns_over_quic: 853
-  port_dnscrypt: 0
-  dnscrypt_config_file: ""
-  allow_unencrypted_doh: false
-  certificate_chain: ""
-  private_key: ""
-  certificate_path: ""
-  private_key_path: ""
-  strict_sni_check: false
-querylog:
-  dir_path: ""
-  ignored: []
-  interval: 2160h
-  size_memory: 1000
-  enabled: true
-  file_enabled: true
-statistics:
-  dir_path: ""
-  ignored: []
-  interval: 24h
-  enabled: true
-filters:
-  - enabled: true
-    url: https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt
-    name: AdGuard DNS filter
-    id: 1
-  - enabled: true
-    url: https://adaway.org/hosts.txt
-    name: AdAway Default Blocklist
-    id: 2
-  - enabled: true
-    url: https://raw.githubusercontent.com/crazy-max/WindowsSpyBlocker/master/data/hosts/spy.txt
-    name: WindowsSpyBlocker - Hosts spy rules
-    id: 1668812860
-  - enabled: true
-    url: https://malware-filter.gitlab.io/malware-filter/phishing-filter-agh.txt
-    name: Phishing URL Blocklist (PhishTank and OpenPhish)
-    id: 1668812861
-  - enabled: true
-    url: https://raw.githubusercontent.com/Perflyst/PiHoleBlocklist/master/SmartTV-AGH.txt
-    name: Perflyst and Dandelion Sprout's Smart-TV Blocklist
-    id: 1668812862
-  - enabled: true
-    url: https://raw.githubusercontent.com/mitchellkrogza/The-Big-List-of-Hacked-Malware-Web-Sites/master/hosts
-    name: The Big List of Hacked Malware Web Sites
-    id: 1668812863
-whitelist_filters: []
-user_rules: []
-dhcp:
-  enabled: false
-  interface_name: ""
-  local_domain_name: lan
-  dhcpv4:
-    gateway_ip: ""
-    subnet_mask: ""
-    range_start: ""
-    range_end: ""
-    lease_duration: 86400
-    icmp_timeout_msec: 1000
-    options: []
-  dhcpv6:
-    range_start: ""
-    lease_duration: 86400
-    ra_slaac_only: false
-    ra_allow_slaac: false
-filtering:
-  blocking_ipv4: ""
-  blocking_ipv6: ""
-  blocked_services:
-    schedule:
-      time_zone: UTC
-    ids: []
-  protection_disabled_until: null
-  safe_search:
-    enabled: false
-    bing: true
-    duckduckgo: true
-    google: true
-    pixabay: true
-    yandex: true
-    youtube: true
-  blocking_mode: default
-  parental_block_host: family-block.dns.adguard.com
-  safebrowsing_block_host: standard-block.dns.adguard.com
-  rewrites:
-    - domain: medium.com
-      answer: 0.0.0.0
-    - domain: marc
-      answer: marcpartensky.com
-  safebrowsing_cache_size: 1048576
-  safesearch_cache_size: 1048576
-  parental_cache_size: 1048576
-  cache_time: 30
-  filters_update_interval: 24
-  blocked_response_ttl: 10
-  filtering_enabled: true
-  parental_enabled: false
-  safebrowsing_enabled: false
-  protection_enabled: true
-clients:
-  runtime_sources:
-    whois: true
-    arp: true
-    rdns: true
-    dhcp: true
-    hosts: true
-  persistent: []
-log:
-  file: ""
-  max_backups: 0
-  max_size: 100
-  max_age: 3
-  compress: false
-  local_time: false
-  verbose: false
-os:
-  group: ""
-  user: ""
-  rlimit_nofile: 0
-schema_version: 28

data/appflowy/nginx.conf

@@ -1,156 +0,0 @@
-# Minimal nginx configuration for AppFlowy-Cloud
-# Self Hosted AppFlowy Cloud user should alter this file to suit their needs
-
-events {
-    worker_connections 1024;
-}
-
-http {
-    # docker dns resolver
-    resolver 127.0.0.11 valid=10s;
-
-    map $http_upgrade $connection_upgrade {
-       default upgrade;
-       ''      close;
-    }
-
-    server {
-        listen 8080;
-
-        # https://github.com/nginxinc/nginx-prometheus-exporter
-        location = /stub_status {
-            stub_status;
-        }
-    }
-
-
-    server {
-        # ssl_certificate /etc/nginx/ssl/certificate.crt;
-         #ssl_certificate_key /etc/nginx/ssl/private_key.key;
-
-        listen 80;
-        listen 443 ssl;
-        client_max_body_size 10M;
-
-        underscores_in_headers on;
-
-        # GoTrue
-        location /gotrue/ {
-            set $gotrue gotrue;
-            proxy_pass http://$gotrue:9999;
-
-            rewrite ^/gotrue(/.*)$ $1 break;
-
-            # Allow headers like redirect_to to be handed over to the gotrue
-            # for correct redirecting
-            proxy_set_header Host $http_host;
-            proxy_pass_request_headers on;
-        }
-
-        # WebSocket
-        location /ws {
-            set $appflowy_cloud appflowy_cloud;
-            proxy_pass http://$appflowy_cloud:8000;
-
-            proxy_http_version 1.1;
-            proxy_set_header Upgrade $http_upgrade;
-            proxy_set_header Connection "Upgrade";
-            proxy_set_header Host $host;
-            proxy_read_timeout 86400;
-        }
-
-        # AppFlowy-Cloud
-        # created a separate location block for handling CORS preflight (OPTIONS) requests specifically for the /api endpoint.
-        location = /api/options {
-            if ($http_origin ~* (http://127.0.0.1:8000)) {
-                add_header 'Access-Control-Allow-Origin' $http_origin;
-            }
-            add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS, PUT, DELETE, PATCH';
-            add_header 'Access-Control-Allow-Headers' 'Content-Type, Authorization, Accept, Client-Version';
-            add_header 'Access-Control-Max-Age' 3600;
-            add_header 'Content-Type' 'text/plain; charset=utf-8';
-            add_header 'Content-Length' 0;
-            return 204;
-        }
-
-        location /api {
-            set $appflowy_cloud appflowy_cloud;
-            proxy_pass http://$appflowy_cloud:8000;
-
-            proxy_set_header X-Request-Id $request_id;
-            proxy_set_header Host $http_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;
-
-            # Set CORS headers for other requests
-            if ($http_origin ~* (http://127.0.0.1:8000)) {
-                add_header 'Access-Control-Allow-Origin' $http_origin always;
-            }
-            add_header 'Access-Control-Allow-Methods' 'GET, POST, PUT, DELETE, PATCH' always;
-            add_header 'Access-Control-Allow-Headers' 'Content-Type, Authorization, Accept, Client-Version' always;
-            add_header 'Access-Control-Max-Age' 3600 always;
-        }
-
-        # Minio Web UI
-        # Derive from: https://min.io/docs/minio/linux/integrations/setup-nginx-proxy-with-minio.html
-        # Optional Module, comment this section if you are did not deploy minio in docker-compose.yml
-        location /minio/ {
-            set $minio minio;
-            proxy_pass http://$minio:9001;
-
-            rewrite ^/minio/(.*) /$1 break;
-            proxy_set_header Host $http_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_set_header X-NginX-Proxy true;
-
-            ## This is necessary to pass the correct IP to be hashed
-            real_ip_header X-Real-IP;
-
-            proxy_connect_timeout 300;
-
-            ## To support websockets in MinIO versions released after January 2023
-            proxy_http_version 1.1;
-            proxy_set_header Upgrade $http_upgrade;
-            proxy_set_header Connection "upgrade";
-            # Some environments may encounter CORS errors (Kubernetes + Nginx Ingress)
-            # Uncomment the following line to set the Origin request to an empty string
-            # proxy_set_header Origin '';
-
-            chunked_transfer_encoding off;
-        }
-
-        # PgAdmin
-        # Optional Module, comment this section if you are did not deploy pgadmin in docker-compose.yml
-        location /pgadmin/ {
-            set $pgadmin pgadmin;
-            proxy_pass http://$pgadmin:80;
-
-            proxy_set_header X-Script-Name /pgadmin;
-            proxy_set_header X-Scheme $scheme;
-            proxy_set_header Host $host;
-            proxy_redirect off;
-        }
-
-        # Portainer
-	    # Optional Module, comment this section if you are did not deploy portainer in docker-compose.yml
-        location /portainer/ {
-            set $portainer portainer;
-            proxy_pass http://$portainer:9000;
-
-	    rewrite ^/portainer/(.*) /$1 break;
-        }
-
-        # Admin Frontend
-	    # Optional Module, comment this section if you are did not deploy admin_frontend in docker-compose.yml
-        location / {
-            set $admin_frontend admin_frontend;
-            proxy_pass http://$admin_frontend:3000;
-
-            proxy_set_header X-Scheme $scheme;
-            proxy_set_header Host $host;
-        }
-    }
-}

data/openssl/openssl.conf

@@ -1,35 +0,0 @@
- [ req ]
- default_bits           = 8192
- default_keyfile        = privkey.pem
- distinguished_name     = req_distinguished_name
- attributes             = req_attributes
- x509_extensions        = v3_ca
-
- dirstring_type = nobmp
-
- [ req_distinguished_name ]
- countryName                    = FR
- countryName_default            = FR
- countryName_min                = 2
- countryName_max                = 2
-
- localityName                   = Europe/Paris
-
- organizationalUnitName         = Marc Partensky Corp
-
- commonName                     = Marc Partensky
- commonName_max                 = 64
-
- emailAddress                   = marc@marcpartensky.com
- emailAddress_max               = 40
-
- # [ req_attributes ]
- # challengePassword              = A challenge password
- # challengePassword_min          = 4
- # challengePassword_max          = 20
-
- [ v3_ca ]
-
- subjectKeyIdentifier=hash
- authorityKeyIdentifier=keyid:always,issuer:always
- basicConstraints = CA:true

data/postgres/initdb.d/create-marc-user.sh

@@ -1,8 +0,0 @@
-#!/bin/bash
-set -e
-
-psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL
-	CREATE USER marc PASSWORD ZGQ4ZDk5OWEwYjNlMDJlNmQ5NmE1NjM5;
-	GRANT ALL PRIVILEGES ON DATABASE * TO marc;
-EOSQL
-

data/postgres/initdb.d/create-ssl-keys.sh

@@ -1,14 +0,0 @@
-#!/bin/sh
-
-cd /var/lib/postgresql/certs
-
-# private key and certificate from it
-openssl req -new -text -newkey rsa:8192 -passout pass:$POSTGRES_PASSWORD -subj /CN=localhost -out server.req -keyout privkey.pem
-# self signed root certificate
-openssl rsa -in privkey.pem -passin pass:$POSTGRES_PASSWORD -out server.key
-# derived certificate
-openssl req -x509 -in server.req -text -key server.key -out server.crt
-
-# change permissions to the root certificate for postgres
-chmod 600 server.key
-chown postgres:postgres server.key

data/prometheus/prometheus.yml

@@ -11,13 +11,9 @@ global:
 scrape_configs:
   # The job name is added as a label `job=<job_name>` to any timeseries scraped from this config.
   - job_name: 'prometheus'
+
     # Override the global default and scrape targets from this job every 5 seconds.
     scrape_interval: 5s
-    static_configs:
-      - targets: ['node-exporter:9100']
 
-  - job_name: cadvisor
-    scrape_interval: 5s
     static_configs:
-    - targets:
-      - cadvisor:8080
+      - targets: ['localhost:9090']

data/traefik/dynamic.yml

@@ -1,628 +0,0 @@
-http:
-  # middlewares:
-  #   basic:
-  #     basicAuth:
-  #       users:
-  #       - test:$apr1$H6uskkkW$IgXLP6ewTrSuBkTrqE8wj/
-  #       # usersFile: etc/traefik/.htpasswd
-  services:
-    pgadmin:
-      loadBalancer:
-        servers:
-          - url: http://pgadmin:80
-    jellyfin:
-      loadBalancer:
-        servers:
-          - url: http://jellyfin:8096
-    portainer:
-      loadBalancer:
-        servers:
-          - url: http://portainer:9000
-    dbdesigner:
-      loadBalancer:
-        servers:
-          - url: http://dbdesigner:3000
-    etherpad:
-      loadBalancer:
-        servers:
-          - url: http://etherpad:9001
-    mongo:
-      loadBalancer:
-        servers:
-          - url: http://mongo:8081
-    resume:
-      loadBalancer:
-        servers:
-          - url: http://resume:3000
-    printer:
-      loadBalancer:
-        servers:
-          - url: http://resume:3000
-    mailu:
-      loadBalancer:
-        servers:
-          - url: http://mailu:80
-    yt-dlp-webui:
-      loadBalancer:
-        servers:
-          - url: http://yt-dlp-webui:80
-    wger-nginx:
-      loadBalancer:
-        servers:
-          - url: http://wger:80
-    web-terminal:
-      loadBalancer:
-        servers:
-          - url: http://web-terminal:7681
-    homer:
-      loadBalancer:
-        servers:
-          - url: http://homer:8080
-    pandoc:
-      loadBalancer:
-        servers:
-          - url: http://pandoc:80
-    jupyterlab:
-      loadBalancer:
-        servers:
-          - url: http://jupyterlab:8888
-    gitlab:
-      loadBalancer:
-        servers:
-          - url: http://gitlab:80
-    serge:
-      loadBalancer:
-        servers:
-          - url: http://serge:8008
-    arch:
-      loadBalancer:
-        servers:
-          - url: http://arch:8080
-    gitea:
-      loadBalancer:
-        servers:
-          - url: http://gitea:3000
-    # heimdall:
-    #   loadBalancer:
-    #     servers:
-    #       - url: http://heimdall:80
-    pgweb:
-      loadBalancer:
-        servers:
-          - url: http://pgweb:8081
-    paperless:
-      loadBalancer:
-        servers:
-          - url: http://paperless:8000
-    jenkins:
-      loadBalancer:
-        servers:
-          - url: http://jenkins:8080
-    rancher:
-      loadBalancer:
-        servers:
-          - url: http://rancher:80
-    docuseal:
-      loadBalancer:
-        servers:
-          - url: http://docuseal:3000
-    grafana:
-      loadBalancer:
-        servers:
-          - url: http://grafana:3000
-    peertube:
-      loadBalancer:
-        servers:
-          - url: http://peertube:9000
-    mcmyadmin:
-      loadBalancer:
-        servers:
-          - url: http://mcmyadmin:8080
-    qbittorrent:
-      loadBalancer:
-        servers:
-          - url: http://qbittorrent:8080
-    dockge:
-      loadBalancer:
-        servers:
-          - url: http://dockge:5001
-    webshot:
-      loadBalancer:
-        servers:
-          - url: http://webshot:3000
-
-
-  routers:
-    pgadmin:
-      rule: "Host(`pgadmin.marcpartensky.com`)"
-      service: pgadmin
-      entryPoints: ["web"]
-      middlewares: ["sablier-pgadmin@file"]
-    jellyfin:
-      rule: "Host(`jellyfin.marcpartensky.com`)"
-      service: jellyfin
-      entryPoints: ["web"]
-      middlewares: ["sablier-jellyfin@file"]
-    portainer:
-      rule: "Host(`docker.marcpartensky.com`)"
-      service: portainer
-      entryPoints: ["web"]
-      middlewares: ["sablier-portainer@file"]
-    dbdesigner:
-      rule: "Host(`dbdesigner.marcpartensky.com`)"
-      service: dbdesigner
-      entryPoints: ["web"]
-      middlewares: ["sablier-dbdesigner@file"]
-    etherpad:
-      rule: "Host(`pad.marcpartensky.com`)"
-      service: etherpad
-      entryPoints: ["web"]
-      middlewares: ["sablier-etherpad@file"]
-    mongo:
-      rule: "Host(`mongo.marcpartensky.com`)"
-      service: mongo-express
-      entryPoints: ["web"]
-      middlewares: ["sablier-mongo@file"]
-    resume:
-      rule: "Host(`cv.marcpartensky.com`)"
-      service: resume
-      entryPoints: ["web"]
-      middlewares: ["sablier-resume@file"]
-    printer:
-      rule: "Host(`printer.marcpartensky.com`)"
-      service: resume
-      entryPoints: ["web"]
-      middlewares: ["sablier-resume@file"]
-    mailu:
-      rule: "Host(`mail.marcpartensky.com`)"
-      service: mailu
-      entryPoints: ["web"]
-      middlewares: ["sablier-mailu@file"]
-    yt-dlp-webui:
-      rule: "Host(`yt.marcpartensky.com`)"
-      service: yt-dlp-webui
-      entryPoints: ["web"]
-      middlewares: ["sablier-yt-dlp-webui@file"]
-    wger:
-      rule: "Host(`wger.marcpartensky.com`)"
-      service: wger-nginx
-      entryPoints: ["web"]
-      middlewares: ["sablier-wger@file"]
-    web-terminal:
-      rule: "Host(`terminal.marcpartensky.com`)"
-      service: web-terminal
-      entryPoints: ["web"]
-      middlewares: ["sablier-web-terminal@file", "ldap_auth@docker"]
-    homer:
-      rule: "Host(`homer.marcpartensky.com`)"
-      service: homer
-      entryPoints: ["web"]
-      middlewares: ["sablier-homer@file"]
-    pandoc:
-      rule: "Host(`pandoc.marcpartensky.com`)"
-      service: pandoc
-      entryPoints: ["web"]
-      middlewares: ["sablier-pandoc@file"]
-    jupyterlab:
-      rule: "Host(`jupyterlab.marcpartensky.com`)"
-      service: jupyterlab
-      entryPoints: ["web"]
-      middlewares: ["sablier-jupyterlab@file"]
-    gitlab:
-      rule: "Host(`gitlab.marcpartensky.com`)"
-      service: gitlab
-      entryPoints: ["web"]
-      middlewares: ["sablier-gitlab@file"]
-    serge:
-      rule: "Host(`serge.marcpartensky.com`)"
-      service: serge
-      entryPoints: ["web"]
-      middlewares: ["sablier-serge@file"]
-    arch:
-      rule: "Host(`arch.marcpartensky.com`)"
-      service: arch
-      entryPoints: ["web"]
-      middlewares: ["sablier-arch@file"]
-    gitea:
-      rule: "Host(`git.marcpartensky.com`)"
-      service: gitea
-      entryPoints: ["web"]
-      middlewares: ["sablier-gitea@file"]
-    # heimdall:
-    #   rule: "Host(`heimdall.marcpartensky.com`)"
-    #   service: heimdall
-    #   entryPoints: ["web"]
-      # middlewares: ["sablier-heimdall@file"]
-    pgweb:
-      rule: "Host(`pgweb.marcpartensky.com`)"
-      service: pgweb
-      entryPoints: ["web"]
-      middlewares: ["sablier-pgweb@file", "ldap_auth@docker"]
-    paperless:
-      rule: "Host(`paperless.marcpartensky.com`)"
-      service: paperless
-      entryPoints: ["web"]
-      middlewares: ["sablier-paperless@file"]
-    jenkins:
-      rule: "Host(`jenkins.marcpartensky.com`)"
-      service: jenkins
-      entryPoints: ["web"]
-      middlewares: ["sablier-jenkins@file"]
-    rancher:
-      rule: "Host(`rancher.marcpartensky.com`)"
-      service: rancher
-      entryPoints: ["web"]
-      middlewares: ["sablier-rancher@file"]
-    docuseal:
-      rule: "Host(`docuseal.marcpartensky.com`)"
-      service: docuseal
-      entryPoints: ["web"]
-      middlewares: ["sablier-docuseal@file"]
-    grafana:
-      rule: "Host(`grafana.marcpartensky.com`)"
-      service: grafana
-      entryPoints: ["web"]
-      middlewares: ["sablier-grafana@file"]
-    peertube:
-      rule: "Host(`peertube.marcpartensky.com`)"
-      service: peertube
-      entryPoints: ["web"]
-      middlewares: ["sablier-peertube@file"]
-    mcmyadmin:
-      rule: "Host(`mcmyadmin.marcpartensky.com`)"
-      service: mcmyadmin
-      entryPoints: ["web"]
-      middlewares: ["sablier-mcmyadmin@file"]
-    qbittorrent:
-      rule: "Host(`torrent.marcpartensky.com`)"
-      service: qbittorrent
-      entryPoints: ["web"]
-      middlewares: ["sablier-qbittorrent@file", "ldap_auth@docker"]
-    dockge:
-      rule: "Host(`dockge.marcpartensky.com`)"
-      service: dockge
-      entryPoints: ["web"]
-      middlewares: ["sablier-dockge@file", "ldap_auth@docker"]
-    webshot:
-      rule: "Host(`webshot.marcpartensky.com`)"
-      service: webshot
-      entryPoints: ["web"]
-      middlewares: ["sablier-webshot@file", "ldap_auth@docker"]
-
-
-  middlewares:
-    cloudflarewarp:
-      plugin:
-        cloudflarewarp:
-          disableDefault: false
-          trustip: # Trust IPS not required if disableDefault is false - we will allocate Cloud Flare IPs automatically
-            - "2400:cb00::/32"
-    sablier-pgadmin:
-      plugin:
-        sablier:
-          sablierUrl: http://sablier:10000
-          sessionDuration: 5m
-          names: pgadmin
-          dynamic:
-            displayName: pgAdmin
-            refreshFrequency: 5s
-            showDetails: true
-            theme: ghost
-    sablier-jellyfin:
-      plugin:
-        sablier:
-          sablierUrl: http://sablier:10000
-          names: jellyfin
-          sessionDuration: 5m
-          dynamic:
-            # showDetails: true
-            displayName: Jellyfin
-            refreshFrequency: 5s
-            theme: shuffle
-    sablier-portainer:
-      plugin:
-        sablier:
-          sablierUrl: http://sablier:10000
-          names: portainer,portainer-agent
-          sessionDuration: 1m
-          dynamic:
-            displayName: Portainer
-            showDetails: true
-            theme: shuffle
-    sablier-dbdesigner:
-      plugin:
-        sablier:
-          sablierUrl: http://sablier:10000
-          names: dbdesigner
-          sessionDuration: 5m
-          dynamic:
-            displayName: dbDesigner
-            showDetails: true
-            theme: ghost
-            refreshFrequency: 1s
-    sablier-etherpad:
-      plugin:
-        sablier:
-          sablierUrl: http://sablier:10000
-          names: etherpad
-          sessionDuration: 5m
-          dynamic:
-            displayName: Etherpad
-            showDetails: true
-            theme: shuffle
-            refreshFrequency: 1s
-    sablier-mongo:
-      plugin:
-        sablier:
-          sablierUrl: http://sablier:10000
-          names: mongo-express
-          sessionDuration: 5m
-          dynamic:
-            displayName: Mongo Express
-            showDetails: true 
-            theme: shuffle
-            refreshFrequency: 1s
-    sablier-resume:
-      plugin:
-        sablier:
-          sablierUrl: http://sablier:10000
-          names: resume,printer
-          sessionDuration: 5m
-          dynamic:
-            displayName: Reactive Resume
-            showDetails: true 
-            theme: shuffle
-            refreshFrequency: 1s
-    sablier-mailu:
-      plugin:
-        sablier:
-          sablierUrl: http://sablier:10000
-          names: mailu,mailu-resolver,mailu-admin,mailu-imap,mailu-smtp,mailu-oletools,mailu-antispam,mailu-webdav,mailu-fetchmail
-          sessionDuration: 5m
-          dynamic:
-            displayName: Mailu
-            showDetails: true 
-            theme: shuffle
-            refreshFrequency: 1s
-    sablier-yt-dlp-webui:
-      plugin:
-        sablier:
-          sablierUrl: http://sablier:10000
-          names: yt-dlp-webui
-          sessionDuration: 5m
-          dynamic:
-            displayName: yt-dlp WebUI
-            showDetails: true 
-            theme: shuffle
-            refreshFrequency: 1s
-    sablier-wger:
-      plugin:
-        sablier:
-          sablierUrl: http://sablier:10000
-          names: wger,wger-nginx,wger-celery,wger-celery-beat
-          sessionDuration: 5m
-          dynamic:
-            displayName: yt-dlp WebUI
-            showDetails: true 
-            theme: shuffle
-            refreshFrequency: 1s
-    sablier-web-terminal:
-      plugin:
-        sablier:
-          sablierUrl: http://sablier:10000
-          names: web-terminal
-          sessionDuration: 5m
-          dynamic:
-            displayName: Web Terminal
-            showDetails: true 
-            theme: matrix
-            refreshFrequency: 1s
-    sablier-homer:
-      plugin:
-        sablier:
-          sablierUrl: http://sablier:10000
-          names: homer
-          sessionDuration: 5m
-          dynamic:
-            displayName: Homer
-            showDetails: true 
-            theme: shuffle
-            refreshFrequency: 1s
-    sablier-pandoc:
-      plugin:
-        sablier:
-          sablierUrl: http://sablier:10000
-          names: pandoc
-          sessionDuration: 5m
-          dynamic:
-            displayName: Pandoc
-            showDetails: true 
-            # theme: hacker-terminal
-            refreshFrequency: 1s
-    sablier-jupyterlab:
-      plugin:
-        sablier:
-          sablierUrl: http://sablier:10000
-          names: jupyterlab
-          sessionDuration: 5m
-          dynamic:
-            displayName: Jupyter Lab
-            showDetails: true 
-            theme: matrix
-            refreshFrequency: 1s
-    sablier-gitlab:
-      plugin:
-        sablier:
-          sablierUrl: http://sablier:10000
-          names: gitlab,gitlab-runner
-          sessionDuration: 5m
-          dynamic:
-            displayName: Gitlab
-            showDetails: true 
-            theme: matrix
-            refreshFrequency: 5s
-    sablier-serge:
-      plugin:
-        sablier:
-          sablierUrl: http://sablier:10000
-          names: serge
-          sessionDuration: 5m
-          dynamic:
-            displayName: Serge
-            showDetails: true 
-            theme: matrix
-            refreshFrequency: 5s
-    sablier-arch:
-      plugin:
-        sablier:
-          sablierUrl: http://sablier:10000
-          names: arch
-          sessionDuration: 5m
-          dynamic:
-            displayName: Arch Linux VNC
-            showDetails: true 
-            theme: ghost
-            refreshFrequency: 5s
-    sablier-gitea:
-      plugin:
-        sablier:
-          sablierUrl: http://sablier:10000
-          names: gitea
-          sessionDuration: 5m
-          dynamic:
-            displayName: Gitea
-            showDetails: true 
-            theme: ghost
-            refreshFrequency: 5s
-    # sablier-heimdall:
-    #   plugin:
-    #     sablier:
-    #       sablierUrl: http://sablier:10000
-    #       names: heimdall
-    #       sessionDuration: 5m
-    #       dynamic:
-    #         displayName: Heimdall
-    #         showDetails: true 
-    #         theme: ghost
-    #         refreshFrequency: 5s
-    sablier-pgweb:
-      plugin:
-        sablier:
-          sablierUrl: http://sablier:10000
-          names: pgweb
-          sessionDuration: 5m
-          dynamic:
-            displayName: PG Web
-            showDetails: true 
-            theme: ghost
-            refreshFrequency: 5s
-    sablier-paperless:
-      plugin:
-        sablier:
-          sablierUrl: http://sablier:10000
-          names: paperless
-          sessionDuration: 2m
-          dynamic:
-            displayName: Paperless
-            showDetails: true 
-            theme: hacker-matrix
-            refreshFrequency: 5s
-    sablier-jenkins:
-      plugin:
-        sablier:
-          sablierUrl: http://sablier:10000
-          names: jenkins
-          sessionDuration: 2m
-          dynamic:
-            displayName: Jenkins
-            showDetails: true 
-            theme: matrix
-            refreshFrequency: 5s
-    sablier-rancher:
-      plugin:
-        sablier:
-          sablierUrl: http://sablier:10000
-          names: rancher
-          sessionDuration: 2m
-          dynamic:
-            displayName: Rancher
-            showDetails: true 
-            theme: ghost
-            refreshFrequency: 5s
-    sablier-docuseal:
-      plugin:
-        sablier:
-          sablierUrl: http://sablier:10000
-          names: docuseal
-          sessionDuration: 2m
-          dynamic:
-            displayName: Docuseal
-            showDetails: true 
-            theme: ghost
-            refreshFrequency: 5s
-    sablier-grafana:
-      plugin:
-        sablier:
-          sablierUrl: http://sablier:10000
-          names: grafana
-          sessionDuration: 2m
-          dynamic:
-            displayName: Grafana
-            showDetails: true 
-            theme: ghost
-            refreshFrequency: 5s
-    sablier-peertube:
-      plugin:
-        sablier:
-          sablierUrl: http://sablier:10000
-          names: peertube
-          sessionDuration: 2m
-          dynamic:
-            displayName: Peertube
-            showDetails: true 
-            theme: ghost
-            refreshFrequency: 5s
-    sablier-mcmyadmin:
-      plugin:
-        sablier:
-          sablierUrl: http://sablier:10000
-          names: mcmyadmin
-          sessionDuration: 2m
-          dynamic:
-            displayName: McMyAdmin
-            showDetails: true 
-            theme: ghost
-            refreshFrequency: 5s
-    sablier-qbittorrent:
-      plugin:
-        sablier:
-          sablierUrl: http://sablier:10000
-          names: qbittorrent
-          sessionDuration: 2m
-          dynamic:
-            displayName: Qbittorrent
-            showDetails: true 
-            theme: ghost
-            refreshFrequency: 5s
-    sablier-dockge:
-      plugin:
-        sablier:
-          sablierUrl: http://sablier:10000
-          names: dockge
-          sessionDuration: 2m
-          dynamic:
-            displayName: Dockge
-            showDetails: true 
-            theme: ghost
-            refreshFrequency: 5s
-    sablier-webshot:
-      plugin:
-        sablier:
-          sablierUrl: http://sablier:10000
-          names: webshot
-          sessionDuration: 2m
-          dynamic:
-            displayName: Webshot
-            showDetails: true 
-            theme: ghost
-            refreshFrequency: 5s

data/traefik/traefik.yml

@@ -1,105 +0,0 @@
-# https://doc.traefik.io/traefik/routing/overview/
-global:
-  checkNewVersion: true
-  sendAnonymousUsage: false
-api:
-  # insecure: false # = secure
-  insecure: true
-  dashboard: true
-  # debug: true
-  debug: false
-providers:
-  docker:
-    # swarmMode: false
-    endpoint: "unix:///var/run/docker.sock"
-    exposedByDefault: false # traefik enabled containers only
-    network: caddy
-  file:
-    filename: /etc/traefik/dynamic.yml
-    watch: true
-serversTransport: # enable ssl backend
-  insecureSkipVerify: true
-certificatesResolvers:
-  # https://community.traefik.io/t/help-with-multiple-certificate-resolvers/15134
-  tls:
-    acme:
-      tlsChallenge: {}
-      email: marc.partensky@gmail.com
-      storage: /config/acme.json
-  cloudflare:
-    acme:
-      email: marc.partensky@gmail.com
-      storage: /config/acme.json
-      dnsChallenge:
-        provider: cloudflare
-        resolvers:
-          - "1.1.1.1:53"
-
-ping: {} # mandatory for healthcheck
-log:
-  level: debug
-  # level: error
-entryPoints:
-  websecure:
-    address: ':443'
-    forwardedHeaders:
-      insecure: true
-      # http3:
-      #   advertisedPort: 443
-    http:
-      tls:
-        certResolver: tls
-      # middlewares:
-      #   - ldap
-    # http3:
-    #   advertisedPort: 443
-  web:
-    address: ':80'
-    forwardedHeaders:
-      insecure: true
-    # forwardedHeaders:
-    #   trustedIPs:
-    #     - "127.0.0.1/32"
-    #     - "192.168.1.7"
-    http:
-      redirections:
-        entryPoint:
-          # to: websecure
-          scheme: https
-          permanent: true
-          priority: 10
-experimental:
-  # http3: true
-  plugins:
-    ldapAuth:
-      moduleName: github.com/wiltonsr/ldapAuth
-      # version: v0.0.19
-      version: v0.1.10
-    souin:
-      moduleName: github.com/darkweak/souin
-      version: v1.6.22
-    sablier:
-      moduleName: github.com/acouvreur/sablier
-      version: v1.0.0
-    cloudflarewarp:
-      modulename: github.com/BetterCorp/cloudflarewarp
-      version: v1.3.0
-
-# ldap entreprise  https://doc.traefik.io/traefik-enterprise/operations/static-configuration/
-# authSources:
-#   ldapSource:
-#     ldap:
-#       url: ldaps://marcpartensky.com:636
-#       # url: ldap://ldap:389
-#       startTLS: true
-#       insecureSkipVerify: true
-#       bindDn: ""
-#       # bindDN: cn=marc,dc=marcpartensky,dc=com
-
-# - --providers.docker.network=web # <== Operate on the docker network named web
-## API Settings - https://docs.traefik.io/operations/api/, endpoints - https://docs.traefik.io/operations/api/#endpoints ##
-# TRAEFIK_CERTIFICATESRESOLVERS_TLS_ACME_TLSCHALLENGE=true
-# TRAEFIK_CERTIFICATESRESOLVERS_TLS_ACME_EMAIL=marc.partensky@gmail.com
-# TRAEFIK_CERTIFICATESRESOLVERS_TLS_ACME_STORAGE=/letsencrypt/acme.json # log settings (options: error, debug, panic, fatal, warn, info) - https://docs.traefik.io/observability/logs/ ##
-## Provider Settings - https://docs.traefik.io/providers/docker/#provider-configuration ##
-## Entrypoints Settings - https://docs.traefik.io/routing/entrypoints/#configuration ##

data/wger/nginx.conf

@@ -1,27 +0,0 @@
-upstream wger {
-    server wger:8000;
-}
-
-server {
-
-    listen 80;
-
-    location / {
-        proxy_pass http://wger;
-        proxy_set_header Host $host;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $http_x_forwarded_proto;
-        proxy_redirect off;
-    }
-
-    location /static/ {
-        alias /wger/static/;
-    }
-
-    location /media/ {
-        alias /wger/media/;
-    }
-
-    # Increase max body size to allow for video uploads
-    client_max_body_size 100M;
-}

env/vps.txt

@@ -1,17 +1,26 @@
-cloudflare
-traefik
-postgres
-mongo
+caddy
 website
-discord
+arch
+open-web-calendar
+oxivia
+wordpress-oxivia
+servant
+discord-bot
+ia
+docker-api
+ialab
+portainer
 authentik
+todolist
 nextcloud
-vaultwarden
-authentik
-sablier
-minio
-resume
-syncthing
-wger
-redis
-terminal
+jenkins
+seafile
+matrix
+etherpad
+monero-miner
+monero-node
+pritunl
+pritunl-mongo
+fail2ban
+ldap
+ldap-manager

services/adguard.yml

@@ -1,52 +0,0 @@
-version: "3.9"
-
-services:
-  adguard:
-    image: adguard/adguardhome
-    restart: unless-stopped
-    ports:
-      - 53:53/tcp
-      - 53:53/udp
-      # - 67:67/udp
-      # - 68:68/udp # adguard home as dhcp
-      # - 80:80/tcp  # https/dns-over-https
-      # - 443:443/tcp
-      # - 443:443/udp
-      # - 3000:3000/tcp # adguard home's admin
-      # - 853:853/tcp # dns-over-tls
-      # - 784:784/udp # dns-over-quic
-      # - 853:853/udp
-      # - 8853:8853/udp
-      # - 5443:5443/tcp # dnscrypt server
-      # - 5443:5443/udp
-    volumes:
-      - adguard:/opt/adguardhome/work
-      - ../data/adguard:/opt/adguardhome/conf
-    networks:
-      - caddy
-    labels:
-      traefik.enable: "true"
-      traefik.http.routers.adguard.rule: >
-        Host(`adguard.marcpartensky.com`)
-      traefik.http.routers.adguard.entrypoints: web
-      # traefik.http.routers.adguard.tls.certresolver: cloudflare
-      traefik.http.services.adguard.loadbalancer.server.port: 3000
-      traefik.http.routers.adguard.middlewares: ldap_auth
-
-    # deploy:
-    #   labels:
-    #     traefik.enable: "true"
-    #     traefik.http.routers.adguard.rule: >
-    #       Host(`adguard.marcpartensky.com`) ||
-    #       Host(`adguard.marcpartensky.fr`)
-    #     traefik.http.routers.adguard.entrypoints: websecure
-    #     traefik.http.routers.adguard.tls.certresolver: cloudflare
-    #     traefik.http.services.adguard.loadbalancer.server.port: 3000
-    #     traefik.http.routers.adguard.middlewares: ldap_auth
-
-volumes:
-  adguard:
-
-networks:
-  caddy:
-    external: true

services/agenda_militant.yml

@@ -5,15 +5,14 @@ services:
     restart: unless-stopped
     networks:
       - caddy
-    deploy:
-      labels:
-        caddy: agenda.militant.marcpartensky.com
-        caddy.reverse_proxy: "{{upstreams 8080}}"
-        traefik.enable: "true"
-        traefik.http.routers.agenda_militant.rule: Host(`agenda.militant.marcpartensky.com`)
-        traefik.http.routers.agenda_militant.entrypoints: websecure
-        traefik.http.routers.agenda_militant.tls.certresolver: tls
-        traefik.http.services.agenda_militant.loadbalancer.server.port: 8080
+    labels:
+      caddy: agenda.militant.marcpartensky.com
+      caddy.reverse_proxy: "{{upstreams 8080}}"
+      traefik.enable: "true"
+      traefik.http.routers.agenda_militant.rule: Host(`agenda.militant.marcpartensky.com`)
+      traefik.http.routers.agenda_militant.entrypoints: websecure
+      traefik.http.routers.agenda_militant.tls.certresolver: tls
+      traefik.http.services.agenda_militant.loadbalancer.server.port: 8080
 networks:
   caddy:
     external: true

services/alpine.yml

@@ -1,24 +0,0 @@
-services:
-  alpine:
-    image: docker.io/marcpartensky/alpine:vnc
-    restart: unless-stopped
-    volumes:
-      - /srv/alpine:/home/marc/data
-    env_file:
-      - ../data/secrets/alpine.env
-    networks:
-      - caddy
-    labels:
-      traefik.enable: "true"
-      traefik.http.routers.alpine.rule: >
-        Host(`alpine.marcpartensky.com`)
-      traefik.http.routers.alpine.entrypoints: web
-      # traefik.http.routers.alpine.tls.certresolver: tls
-      traefik.http.services.alpine.loadbalancer.server.port: 6080
-
-volumes:
-  data:
-
-networks:
-  caddy:
-    external: true

services/android.yml

@@ -4,24 +4,10 @@ services:
     image: budtmo/docker-android-x86-12.0
     restart: unless-stopped
     privileged: true
-    networks:
-      - caddy
     ports:
-    #   - "6080:6080"
+      - "6080:6080"
       - "5554:5554"
       - "5555:5555"
       - "4723:4723"
     environment:
       DEVICE: "Samsung Galaxy S6"
-    deploy:
-      labels:
-        traefik.enable: "true"
-        traefik.http.routers.android.rule: >
-          Host(`android.marcpartensky.fr`)
-        traefik.http.routers.android.entrypoints: websecure
-        traefik.http.routers.android.tls.certresolver: cloudflare
-        traefik.http.services.android.loadbalancer.server.port: 6080
-
-networks:
-  caddy:
-    external: true

services/appflowy.yml

@@ -1,54 +0,0 @@
-# Essential services for AppFlowy Cloud
-
-version: "3.9"
-services:
-  appflowy-nginx:
-    restart: on-failure
-    image: nginx
-    # ports:
-    #   - 80:80   # Disable this if you are using TLS
-    volumes:
-      - ../data/appflowy/nginx.conf:/etc/nginx/nginx.conf
-        # - ./nginx/ssl/certificate.crt:/etc/nginx/ssl/certificate.crt
-        # - ./nginx/ssl/private_key.key:/etc/nginx/ssl/private_key.key
-    networks:
-      - caddy
-    labels:
-      traefik.enable: "true"
-      traefik.http.services.appflowy.loadbalancer.server.port: 80
-      traefik.http.routers.appflowy.rule: >
-        Host(`appflowy.marcpartensky.com`)
-      traefik.http.routers.appflowy.entrypoints: web
-      # traefik.http.routers.appflowy.tls.certresolver: tls
-      traefik.http.routers.appflowy.middlewares: ldap_auth
-
-  gotrue:
-    image: appflowyinc/gotrue:${GOTRUE_VERSION:-latest}
-    restart: on-failure
-    networks:
-      - caddy
-      - postgres
-    env_file:
-      - ../data/secrets/appflowy.env
-
-  appflowy-cloud:
-    image: appflowyinc/appflowy_cloud:${BACKEND_VERSION:-latest}
-    restart: on-failure
-    env_file:
-      - ../data/secrets/appflowy.env
-
-  appflowy-admin:
-    restart: on-failure
-    image: appflowyinc/admin_frontend:${BACKEND_VERSION:-latest}
-    depends_on:
-      - gotrue
-    env_file:
-      - ../data/secrets/appflowy.env
-
-networks:
-  caddy:
-    external: true
-  postgres:
-    external: true
-  redis:
-    external: true

services/arch.yml

@@ -2,7 +2,6 @@ version: "3.9"
 services:
   arch:
     image: marcpartensky/arch:vnc
-    container_name: arch
     restart: unless-stopped
     ports: # vnc is shared
       - "5900:5900"
@@ -11,47 +10,23 @@ services:
       - ldap
     volumes:
       - arch:/home/marc
-    healthcheck:
-      test: curl --fail http://localhost:8080/ || exit 1
-      interval: 5m
-      timeout: 30s
-      retries: 3
-      start_period: 60s
-    # deploy:
-    #   labels:
-    #     caddy: arch.marcpartensky.com
-    #     caddy.reverse_proxy: "{{upstreams 8080}}"
-    #     traefik.enable: "true"
-    #     traefik.http.routers.arch.rule: Host(`arch.marcpartensky.com`)
-    #     traefik.http.routers.arch.entrypoints: websecure
-    #     traefik.http.routers.arch.tls.certresolver: tls
-    #     traefik.http.services.arch.loadbalancer.server.port: 8080
-        # traefik.http.routers.arch.middlewares: ldap_auth, sablier
-        #
-        # # sablier
-        # # The sablier URL service, must be reachable from the Traefik instance
-        # traefik.http.middlewares.sablier.plugin.sablierUrl: http://sablier:10000
-        # # Comma separated names of containers/services/deployments etc.
-        # traefik.http.middlewares.sablier.plugin.names: arch
-        # # The session duration after which containers/services/deployments instances are shutdown
-        # traefik.http.middlewares.sablier.plugin.sessionDuration: 1m
-        # # You can only use one strategy at a time
-        # # To do so, only declare `dynamic` or `blocking`
-        #
-        # # Dynamic strategy, provides the waiting webui
-        # # (Optional) Defaults to the middleware name
-        # traefik.http.middlewares.sablier.plugin.dynamic.displayName: Starting application
-        # # (Optional) Set to true or false to show details specifcally for this middleware, unset to use Sablier server defaults
-        # traefik.http.middlewares.sablier.plugin.dynamic.showDetails: "true"
-        # # (Optional) The theme to use
-        # traefik.http.middlewares.sablier.plugin.dynamic.theme: hacker-terminal
-        # # (Optional) The loading page refresh frequency
-        # traefik.http.middlewares.sablier.plugin.dynamic.refreshFrequency: 5s
-        #
-        # # Blocking strategy, waits until services are up and running
-        # # but will not wait more than `timeout`
-        # # blocking:
-        # #   timeout: 1m
+    labels:
+      caddy: arch.marcpartensky.com
+      caddy.reverse_proxy: "{{upstreams 8080}}"
+      traefik.enable: "true"
+      traefik.http.routers.arch.rule: Host(`arch.marcpartensky.com`)
+      traefik.http.routers.arch.entrypoints: websecure
+      traefik.http.routers.arch.tls.certresolver: tls
+      traefik.http.services.arch.loadbalancer.server.port: 8080
+      # ldapAuth Register Middleware ====================================================
+      traefik.http.routers.arch.middlewares: ldap_auth
+      # ldapAuth Options=================================================================
+      traefik.http.middlewares.ldap_auth.plugin.ldapAuth.enabled: "true"
+      traefik.http.middlewares.ldap_auth.plugin.ldapAuth.logLevel: DEBUG
+      traefik.http.middlewares.ldap_auth.plugin.ldapAuth.url: ldap://ldap.marcpartensky.com
+      traefik.http.middlewares.ldap_auth.plugin.ldapAuth.port: 636
+      traefik.http.middlewares.ldap_auth.plugin.ldapAuth.baseDN: dc=marcpartensky,dc=com
+      traefik.http.middlewares.ldap_auth.plugin.ldapAuth.attribute: uid
 
 volumes:
   arch:

services/audiobookshelf.yml

@@ -1,38 +0,0 @@
-services:
-  audiobookshelf:
-    image: advplyr/audiobookshelf:latest
-    restart: unless-stopped
-    volumes:
-      - /srv/audiobookshelf/config:/config
-      - /srv/audiobookshelf/audiobooks:/audiobooks
-      - /srv/audiobookshelf/podcasts:/podcasts
-      - /srv/audiobookshelf/metadata:/metadata
-    # env_file:
-    #   - ../data/secrets/audiobookshelf.env # Fichier d'environnement optionnel
-    networks:
-      - caddy
-    labels:
-      traefik.enable: "true"
-      traefik.http.routers.audiobookshelf.rule: >
-        Host(`audiobookshelf.marcpartensky.com`)
-      traefik.http.routers.audiobookshelf.entrypoints: web
-      # traefik.http.services.audiobookshelf.loadbalancer.server.port: 13378
-      traefik.http.services.audiobookshelf.loadbalancer.server.port: 80
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:80"]
-      interval: 30s
-      timeout: 10s
-      retries: 3
-    environment:
-      - TZ=Europe/Paris     # Remplace par ton fuseau horaire
-      - AUDIOBOOKSHELF_UID=1000 # UID pour l'utilisateur
-      - AUDIOBOOKSHELF_GID=1000 # GID pour le groupe
-
-# volumes:
-#   config:
-#   audiobooks:
-#   podcasts:
-
-networks:
-  caddy:
-    external: true

services/authelia.yml

@@ -3,50 +3,43 @@ services:
   authelia:
     image: authelia/authelia
     restart: unless-stopped
-      # expose:
-      #   - 9091
-    env_file:
-      - ../data/secrets/authelia.env
+    expose:
+      - 9091
     environment:
       TZ: France/Paris
     volumes:
       - ../data/authelia:/config
     networks:
+      - authelia
       - caddy
-      - redis
-      - ldap
     labels:
-      # caddy: authelia.marcpartensky.com
-      # caddy.reverse_proxy: "{{upstreams 9091}}"
+      caddy: authelia.marcpartensky.com
+      caddy.reverse_proxy: "{{upstreams 9091}}"
       traefik.enable: true
       traefik.http.routers.authelia.rule: Host(`authelia.marcpartensky.com`)
-      traefik.http.routers.authelia.entrypoints: web
-        # traefik.http.routers.authelia.tls: true
-        # traefik.http.routers.authelia.tls.certresolver: tls
+      traefik.http.routers.authelia.entrypoints: websecure
+      traefik.http.routers.authelia.tls: true
+      traefik.http.routers.authelia.tls.certresolver: tls
       traefik.http.middlewares.authelia.forwardauth.address: http://authelia:9091/api/verify?rd=https://authelia.marcpartensky.com  # yamllint disable-line rule:line-length
       traefik.http.middlewares.authelia.forwardauth.trustForwardHeader: true
       traefik.http.middlewares.authelia.forwardauth.authResponseHeaders: Remote-User,Remote-Groups,Remote-Name,Remote-Email  # yamllint disable-line rule:line-length
 
-  # redis:
-  #   image: redis:alpine
-  #   restart: unless-stopped
-  #   expose:
-  #     - 6379
-  #   environment:
-  #     TZ: France/Paris
-  #   volumes:
-  #     - authelia_redis:/data
-  #   networks:
-  #     - authelia
+  redis:
+    image: redis:alpine
+    restart: unless-stopped
+    expose:
+      - 6379
+    environment:
+      TZ: France/Paris
+    volumes:
+      - authelia_redis:/data
+    networks:
+      - authelia
 
-        # volumes:
-  # authelia_redis:
+volumes:
+  authelia_redis:
 
 networks:
   authelia:
   caddy:
     external: true
-  redis:
-    external: true
-  ldap:
-    external: true

services/authentik.yml

@@ -2,119 +2,102 @@ version: "3.9"
 
 services:
   authentik:
-    # image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2024.4.2}
-    image: ghcr.io/goauthentik/server:2024.4.2
+    image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2022.2.1}
     restart: unless-stopped
     command: server
     environment:
-      AUTHENTIK_DEBUG: "true"
+      AUTHENTIK_REDIS__HOST: authentik_redis
+      AUTHENTIK_POSTGRESQL__HOST: authentik_postgres
       AUTHENTIK_ERROR_REPORTING__ENABLED: "false"
       AUTHENTIK_DEFAULT_USER_CHANGE_USERNAME: admin
       # WORKERS: 2
+    volumes:
+      - authentik_media:/media
+      - authentik_templates:/templates
+      - authentik_geoip:/geoip
     env_file:
       - ../data/secrets/authentik.env
     # ports:
     #   - "0.0.0.0:${AUTHENTIK_PORT_HTTP:-9000}:9000"
     #   - "0.0.0.0:${AUTHENTIK_PORT_HTTPS:-9443}:9443"
-    volumes:
-      - authentik_media:/media
-      - templates:/templates
-      - geoip:/geoip
-    # depends_on:
-    #   - postgres
-    #   - redis
-    #   - worker
+    depends_on:
+      - authentik_postgres
+      - authentik_redis
+      - authentik_worker
     networks:
       - authentik
       - caddy
-      - postgres
-      - redis
-      - ldap
     labels:
       caddy: authentik.marcpartensky.com
       caddy.reverse_proxy: "{{upstreams 9000}}"
-      # traefik.http.routers.authentik.rule: Host(`authentik.marcpartensky.com`)
       traefik.enable: "true"
       traefik.http.routers.authentik.rule: Host(`authentik.marcpartensky.com`)
-      traefik.http.routers.authentik.entrypoints: web
-        # traefik.http.routers.authentik.tls.certresolver: cloudflare
-      traefik.http.services.authentik.loadbalancer.server.port: 80
-        # deploy:
-        #   labels:
-        #     traefik.enable: "true"
-        #     traefik.http.routers.authentik.rule: Host(`authentik.marcpartensky.fr`)
-        #     traefik.http.routers.authentik.entrypoints: websecure
-        #     traefik.http.routers.authentik.tls.certresolver: cloudflare
-        #     traefik.http.services.authentik.loadbalancer.server.port: 9000
+      traefik.http.routers.authentik.entrypoints: websecure
+      traefik.http.routers.authentik.tls.certresolver: tls
+      traefik.http.services.authentik.loadbalancer.server.port: 9000
 
-  worker:
-    # image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2024.4.2}
-    image: ghcr.io/goauthentik/server:2024.4.2
+  authentik_postgres:
+    image: postgres:alpine
     restart: unless-stopped
-    # user: root
+    volumes:
+      - authentik_postgres:/var/lib/postgresql/data
+    env_file:
+      - ../data/secrets/authentik.env
+    networks:
+      - authentik
+
+  authentik_redis:
+    image: redis:alpine
+    restart: unless-stopped
+    networks:
+      - authentik
+
+  authentik_worker:
+    image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2022.2.1}
+    restart: unless-stopped
+    user: root
     command: worker
     environment:
-      AUTHENTIK_REDIS__HOST: redis
-      AUTHENTIK_POSTGRESQL__HOST: postgres
+      AUTHENTIK_REDIS__HOST: authentik_redis
+      AUTHENTIK_POSTGRESQL__HOST: authentik_postgres
       AUTHENTIK_ERROR_REPORTING__ENABLED: "false"
     # This is optional, and can be removed. If you remove this, the following will happen
     # - The permissions for the /backups and /media folders aren't fixed, so make sure they are 1000:1000
     # - The docker socket can't be accessed anymore
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
-      - /srv/authentik:/backups
+      - authentik_backups:/backups
       - authentik_media:/media
-      - certs:/certs
-      - templates:/templates
-      - geoip:/geoip
+      - authentik_certs:/certs
+      - authentik_templates:/templates
+      - authentik_geoip:/geoip
     env_file:
       - ../data/secrets/authentik.env
     networks:
       - authentik
-      - postgres
-      - redis
 
-  # authentik_geoipupdate:
-  #   image: maxmindinc/geoipupdate:latest
-  #   restart: unless-stopped
-  #   volumes:
-  #     - authentik_geoip:/usr/share/GeoIP
-  #   environment:
-  #     GEOIPUPDATE_EDITION_IDS: "GeoLite2-City"
-  #     GEOIPUPDATE_FREQUENCY: "8"
-  #   # env_file:
-  #   #   - ../data/secrets/authentik.env
-  #   networks:
-  #     - authentik
-  #     version: "3.5"
-
-  ldap:
-    image: ghcr.io/goauthentik/ldap
+  authentik_geoipupdate:
+    image: maxmindinc/geoipupdate:latest
     restart: unless-stopped
-    ports:
-      # - 389:389/tcp # no need to expose insecure port
-      - 0.0.0.0:636:636/tcp
+    volumes:
+      - authentik_geoip:/usr/share/GeoIP
+    environment:
+      GEOIPUPDATE_EDITION_IDS: "GeoLite2-City"
+      GEOIPUPDATE_FREQUENCY: "8"
+    # env_file:
+    #   - ../data/secrets/authentik.env
     networks:
-      - authentik # connect to authentik server
-      - ldap # connect to other services
-    env_file:
-      - ../data/secrets/authentik.env
+      - authentik
 
 volumes:
-  # backups:
-  postgres:
+  authentik_postgres:
+  authentik_backups:
   authentik_media:
-  certs:
-  templates:
-  geoip:
+  authentik_certs:
+  authentik_templates:
+  authentik_geoip:
 
 networks:
   authentik:
-  ldap:
-    external: true
-  redis:
-    external: true
-  postgres:
-    external: true
   caddy:
     external: true

services/autodownloader.yml

@@ -1,7 +0,0 @@
-services:
-  autodownloader:
-    image: marcpartensky/autodownloader
-    volumes:
-      - /srv/jellyfin/movies:/movies
-    env_file:
-      - ../data/secrets/autodownloader.env

services/beef.yml

@@ -21,8 +21,7 @@ services:
       caddy.@ws.1_header: "Upgrade websocket"
       caddy.0_reverse_proxy: "@ws {{upstreams 61985}}"
       traefik.enable: "true"
-      # traefik.http.routers.beef.rule: Host(`beef.marcpartensky.com`)
-      traefik.http.routers.beef.rule: Host(`beef.marcpartensky.fr`)
+      traefik.http.routers.beef.rule: Host(`beef.marcpartensky.com`)
       traefik.http.routers.beef.entrypoints: websecure
       traefik.http.routers.beef.tls.certresolver: tls
       traefik.http.services.beef.loadbalancer.server.port: 3000

services/burpsuite.yml

@@ -1,26 +0,0 @@
-version: "3.9"
-services:
-  burpserver: 
-    image: pschiffe/burp-server
-    ports:
-      - "4971:4971"
-    volumes:
-      - conf:/etc/burp
-      - data:/var/spool/burp
-    environment:
-      BURP_CLIENTS_CONFIG: "host1:pass1 host2:pass2 host3:pass3"
-    tmpfs:
-      - /run
-      - /tmp
-    privileged: true
-     # deploy:
-     #  labels:
-     #    traefik.enable: "true"
-     #    traefik.http.routers.burpserver.rule: Host(`burp.marcpartensky.fr`)
-     #    traefik.http.routers.burpserver.entrypoints: websecure
-     #    traefik.http.routers.burpserver.tls.certresolver: tls
-     #    traefik.http.services.burpserver.loadbalancer.server.port: 4971
-
-volumes:
-  conf:
-  data:

services/cadvisor.yml

@@ -1,54 +0,0 @@
-version: '3'
-
-services:
-  cadvisor:
-    # image: google/cadvisor:v0.39.0
-    # image: google/cadvisor
-    image: gcr.io/cadvisor/cadvisor
-    volumes:
-      - /:/rootfs:ro
-      - /var/run:/var/run:rw
-      - /sys:/sys:ro
-      - /var/lib/docker:/var/lib/docker:ro
-    command:
-      - '-docker_only'
-      - '-logtostderr'
-    #   - '-storage-driver=influxdb'
-    #   - '-storage-opt=host=swarm-manager1:8086'
-    #   - '-storage-opt=database=cadvisor'
-    #   - '-storage-opt=retention=1d'
-    #   - '-storage-opt=user=root'
-    #   - '-storage-opt=password=yourpassword'
-    #   - '-housekeeping_interval=5s'
-    #   - '-enable_load_reader'
-    #   - '-cpu_global_percentage=true'
-    #   - '-cpu_historic_interval=1m'
-    #   - '-docker_label_enable'
-    networks:
-      - caddy
-    deploy:
-      placement:
-        constraints:
-          - node.role == manager
-      resources:
-        limits:
-          memory: 1g
-        reservations:
-          memory: 512m
-      restart_policy:
-        condition: on-failure
-      mode: global
-      labels:
-        traefik.enable: "true"
-        traefik.http.routers.cadvisor.rule: Host(`cadvisor.marcpartensky.fr`)
-        # traefik.http.routers.cadvisor.rule: >
-        #   Host(`cadvisor.marcpartensky.com`) || Host(`cadvisor.marcpartensky.fr`)
-        traefik.http.routers.cadvisor.entrypoints: websecure
-        traefik.http.routers.cadvisor.tls.certresolver: tls
-        traefik.http.services.cadvisor.loadbalancer.server.port: 8080
-        traefik.http.routers.cadvisor.middlewares: ldap_auth
-
-      
-networks:
-  caddy:
-    external: true

services/chatgpt.yml

@@ -1,6 +0,0 @@
-version: "3.9"
-services:
-  chatgpt:
-    image: wongsaang/chatgpt-ui:latest
-    ports:
-      - "8000:80"

services/cloudflare.yml

@@ -1,30 +0,0 @@
-version: "3.9"
-services:
-  cloudflare:
-    image: docker.io/cloudflare/cloudflared:latest
-    restart: unless-stopped
-    env_file: ../data/secrets/cloudflare.env
-    command: tunnel --no-autoupdate run
-    networks:
-      - caddy
-    environment:
-      - TUNNEL_METRICS=0.0.0.0:60123
-      # - TUNNEL_TOKEN=${TUNNEL_TOKEN}
-    healthcheck:
-      test: ["CMD", "cloudflared", "tunnel", "--metrics", "localhost:60123", "ready"]
-      interval: 30s
-      timeout: 30s
-      retries: 3
-
-  traefik-cloudflare-tunnel:
-    image: docker.io/justmiles/traefik-cloudflare-tunnel:latest
-    container_name: traefik-cloudflare-tunnel
-    restart: unless-stopped
-    env_file:
-      - ../data/secrets/cloudflare.env
-    networks:
-      - caddy
-
-networks:
-  caddy:
-    external: true

services/conduit.yml

@@ -1,50 +0,0 @@
-# Conduit - Behind Traefik Reverse Proxy
-version: '3'
-
-services:
-    homeserver:
-        image: matrixconduit/matrix-conduit:latest
-        restart: unless-stopped
-        
-        # labels:
-        #     - "traefik.enable=true"
-        #     - "traefik.docker.network=proxy"  # Change this to the name of your Traefik docker proxy network
-
-        #     - "traefik.http.routers.to-conduit.rule=Host(`sub_domain.domain.com`)"  # Change to the address on which Conduit is hosted
-        #     - "traefik.http.routers.to-conduit.tls=true"
-        #     - "traefik.http.routers.to-conduit.tls.certresolver=letsencrypt"
-        #     - "traefik.http.routers.to-conduit.middlewares=cors-headers@docker"
-
-        #     - "traefik.http.middlewares.cors-headers.headers.accessControlAllowOriginList=*"
-        #     - "traefik.http.middlewares.cors-headers.headers.accessControlAllowHeaders=Origin, X-Requested-With, Content-Type, Accept, Authorization"
-        #     - "traefik.http.middlewares.cors-headers.headers.accessControlAllowMethods=GET, POST, PUT, DELETE, OPTIONS"
-        ports:
-            - 8448:6167
-
-        volumes:
-            - db:/srv/conduit/.local/share/conduit
-            ### Uncomment if you want to use conduit.toml to configure Conduit
-            ### Note: Set env vars will override conduit.toml values
-            - ./conduit.toml:/srv/conduit/conduit.toml
-        networks:
-            - proxy
-        environment:
-            CONDUIT_SERVER_NAME: sub_domain.domain.com  # replace with your own name
-            CONDUIT_TRUSTED_SERVERS: '["matrix.org"]'
-            CONDUIT_ALLOW_REGISTRATION : 'true'
-            ### Uncomment and change values as desired
-            # CONDUIT_ADDRESS: 0.0.0.0
-            # CONDUIT_PORT: 6167
-            # CONDUIT_CONFIG: '/srv/conduit/conduit.toml'  # if you want to configure purely by env vars, set this to an empty string ''
-            # Available levels are: error, warn, info, debug, trace - more info at: https://docs.rs/env_logger/*/env_logger/#enabling-logging
-            # CONDUIT_LOG: info  # default is: "warn,_=off,sled=off"
-            CONDUIT_LOG: debug
-            # CONDUIT_ALLOW_JAEGER: 'false'
-            # CONDUIT_ALLOW_ENCRYPTION: 'false'
-            # CONDUIT_ALLOW_FEDERATION: 'false'
-            # CONDUIT_DATABASE_PATH: /srv/conduit/.local/share/conduit
-            # CONDUIT_WORKERS: 10
-            # CONDUIT_MAX_REQUEST_SIZE: 20_000_000  # in bytes, ~20 MB
-
-networks:
-    proxy:

services/cowrie.yml

@@ -1,17 +0,0 @@
-version: "3.9"
-services:
-  cowrie:
-    image: rayson/cowrie:20160907-1
-    user: cowrie
-    ports:
-      - "22:2222/tcp"
-      - "23:2223/tcp"
-    environment:
-      COWRIE_TELNET_ENABLED: "yes"
-    volumes:
-      - cowrie:/opt/cowrie/data:Z
-      - cowrie-log:/opt/cowrie/log:Z
-
-volumes:
-  cowrie:
-  cowrie-log:

services/crafty-controller.yml

@@ -1,21 +0,0 @@
-version: "3.9"
-services:
-  controller:
-    image: cybercube/crafty-controller
-    networks:
-      - caddy
-    deploy:
-      labels:
-        traefik.enable: "true"
-        traefik.http.services.controller.loadbalancer.server.port: 8000
-        traefik.http.routers.controller.rule: Host(`controller.marcpartensky.fr`)
-        # traefik.http.routers.controller.rule: >
-        #   Host(`controller.marcpartensky.com`) || Host(`controller.marcpartensky.fr`)
-        traefik.http.routers.controller.entrypoints: websecure
-        # traefik.http.routers.controller.tls.certresolver: tls
-        traefik.http.routers.controller.tls.certresolver: cloudflare
-        # traefik.http.routers.controller.middlewares: ldap_auth
-
-networks:
-  caddy:
-    external: true

services/crontab.yml

@@ -1,28 +0,0 @@
-version: "3.9"
-services:
-  crontab:
-    image: alseambusher/crontab-ui
-    restart: unless-stopped
-    networks:
-      - caddy
-    # ports:
-    #   - 8000:8000
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-      - /srv/crontab:/crontab-ui/crontabs
-    labels:
-      traefik.enable: "true"
-      traefik.http.services.crontab.loadbalancer.server.port: 8000
-      traefik.http.routers.crontab.rule: >
-        Host(`cron.marcpartensky.com`)
-      traefik.http.routers.crontab.entrypoints: web
-      # traefik.http.routers.ui.tls.certresolver: tls
-      # traefik.http.routers.ui.tls.certresolver: cloudflare
-      traefik.http.routers.crontab.middlewares: ldap_auth
-
-volumes:
-  crontabs:
-
-networks:
-  caddy:
-    external: true

services/dbdesigner.yml

@@ -1,21 +0,0 @@
-version: "3.9"
-services:
-  dbdesigner:
-    image: marcpartensky/dbdesigner
-    container_name: dbdesigner
-    networks:
-      - caddy
-    environment:
-      PORT: 3000
-    labels:
-      # traefik.enable: "true"
-      # traefik.http.services.dbdesigner.loadbalancer.server.port: 3000
-      # traefik.http.routers.dbdesigner.rule: >
-      #   Host(`dbdesigner.marcpartensky.com`)
-      # traefik.http.routers.dbdesigner.entrypoints: web
-      # traefik.http.routers.dbdesigner.tls.certresolver: tls
-      traefik.http.routers.dbdesigner.middlewares: ldap_auth
-
-networks:
-  caddy:
-    external: true

services/discord-bot.yml

@@ -0,0 +1,19 @@
+version: "3.9"
+
+services:
+  discord-bot:
+    image: marcpartensky/discord-bot
+    restart: unless-stopped
+    ports:
+        - "7010:8000"
+    networks:
+      - discord
+    depends_on:
+      - docker_api
+    env_file:
+      - ../data/secrets/esclave.env
+    deploy:
+      replicas: 1
+
+networks:
+  discord:

services/discord.yml

@@ -1,39 +0,0 @@
-# version: "3.9"
-
-services:
-  bot:
-    # image: docker.io/marcpartensky/discord-bot:v141.138ee20.2024-09-08
-    image: docker.io/marcpartensky/discord-bot:latest
-    # image: docker.io/marcpartensky/discord-bot:v152.04b7e7a.2024-09-15
-    restart: unless-stopped
-    ports:
-      - "7011:8000"
-    networks:
-      - discord
-      - postgres
-    env_file:
-      - ../data/secrets/discord-bot.env
-    deploy:
-      replicas: 1
-
-  # ia:
-  #   image: marcpartensky/discord-bot
-  #   restart: unless-stkopped
-  #   ports:
-  #     - "7011:8000"
-  #   networks:
-  #     - discord
-  #   env_file:
-  #     - ../data/secrets/ia.env
-  #   deploy:
-  #     replicas: 1
-
-  # chatgpt:
-  #   image: xxxbrian/discord_chatgpt_bot:latest
-  #   env_file:
-  #     - ../data/secrets/discord_chatgpt.env
-
-networks:
-  discord:
-  postgres:
-    external: true

services/docker-api.yml

@@ -0,0 +1,13 @@
+version: "3.9"
+
+services:
+  docker_api:
+    image: marcpartensky/docker-api
+    restart: unless-stopped
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+    networks:
+      - discord
+
+networks:
+  discord:

services/docker.yml

@@ -1,22 +0,0 @@
-version: "3.9"
-
-services:
-  docker_api:
-    image: marcpartensky/docker-api
-    restart: unless-stopped
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-    networks:
-      - discord
-
-  # db:
-  #   image: postgres
-  #   container_name: docker-app-db
-  #   restart: unless-stopped
-  #   environment:
-  #     POSTGRES_USER: docker_user
-  #     POSTGRES_PASSWORD: d3kTrklm54208
-  #     POSTGRES_DB: docker
- 
-networks:
-  discord:

services/dockercraft.yml

@@ -1,8 +0,0 @@
-version: "3.3"
-services:
-  dockercraft:
-    image: gaetan/dockercraft
-    ports:
-      - "25567:25565"
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock:Z

services/dockge.yml

@@ -1,31 +0,0 @@
-version: "3.8"
-services:
-  dockge:
-    image: louislam/dockge:1
-    container_name: dockge
-    restart: unless-stopped
-    # ports:
-    #   - 5001:5001
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-      - ../data/dockge:/app/data
-      # Stacks Directory
-      # ⚠️ READ IT CAREFULLY. If you did it wrong, your data could end up writing into a WRONG PATH.
-      # ⚠️ 1. FULL path only. No relative path (MUST)
-      # ⚠️ 2. Left Stacks Path === Right Stacks Path (MUST)
-      - ./:/opt/stacks
-    environment:
-      # Tell Dockge where to find the stacks
-      - DOCKGE_STACKS_DIR=/opt/stacks
-    networks:
-      - caddy
-    # labels:
-    #   traefik.enable: "true"
-    #   traefik.http.services.dockge.loadbalancer.server.port: 5001
-    #   traefik.http.routers.dockge.rule: >
-    #     Host(`dockge.marcpartensky.com`)
-    #   traefik.http.routers.dockge.entrypoints: web
-    #   traefik.http.routers.dockge.middlewares: ldap_auth
-networks:
-  caddy:
-    external: true

services/dockvpn.yml

@@ -1,28 +0,0 @@
-version: "3.9"
-services:
-  dockvpn:
-    image: alekslitvinenk/openvpn
-    cap_add:
-      - NET_ADMIN
-    networks:
-      - caddy
-    devices:
-      - /dev/net/tun
-    ports:
-      - 1194:1194/udp
-      - 8080:8080/tcp
-    volumes:
-      - ../data/dockvpn:/opt/Dockovpn_data/clients
-    environment:
-      HOST_ADDR: vpn.marcpartensky.fr
-    deploy:
-      labels:
-        traefik.enable: "true"
-        traefik.http.routers.dockvpn.rule: >
-          Host(`dockvpn.marcpartensky.fr`)
-        traefik.http.routers.dockvpn.entrypoints: websecure
-        traefik.http.routers.dockvpn.tls.certresolver: cloudflare
-        traefik.http.services.dockvpn.loadbalancer.server.port: 8080
-networks:
-  caddy:
-    external: true

services/docuseal.yml

@@ -1,27 +0,0 @@
-version: "3.9"
-
-services:
-  docuseal:
-    container_name: docuseal
-    image: docuseal/docuseal:latest
-    ports:
-      - 3000:3000
-    volumes:
-      - /srv/docuseal:/data
-    env_file:
-      - ../data/secrets/docuseal.env
-    networks:
-      - caddy
-      - postgres
-    # labels:
-    #   traefik.enable: "true"
-    #   traefik.http.routers.docuseal.rule: >
-    #     Host(`docuseal.marcpartensky.com`)
-    #   traefik.http.routers.docuseal.entrypoints: web
-    #   traefik.http.services.docuseal.loadbalancer.server.port: 3000
-
-networks:
-  caddy:
-    external: true
-  postgres:
-    external: true

services/duplicati.yml

@@ -15,17 +15,22 @@ services:
       - duplicati_source:/source
     networks:
       - caddy
-    deploy:
-      labels:
-        traefik.enable: "true"
-        traefik.http.services.duplicati.loadbalancer.server.port: 8200
-        traefik.http.routers.duplicati.rule: >
-          Host(`duplicati.marcpartensky.com`) ||
-          Host(`duplicati.marcpartensky.fr`)
-        traefik.http.routers.duplicati.entrypoints: websecure
-        traefik.http.routers.duplicati.tls.certresolver: tls
-        # traefik.http.routers.duplicati.tls.certresolver: cloudflare
-        # traefik.http.routers.duplicati.middlewares: ldap_auth
+    labels:
+      caddy: duplicati.marcpartensky.com
+      caddy.reverse_proxy: "{{upstreams 8200}}"
+      traefik.enable: "true"
+      traefik.http.routers.duplicati.rule: Host(`duplicati.marcpartensky.com`)
+      traefik.http.routers.duplicati.entrypoints: websecure
+      traefik.http.routers.duplicati.tls.certresolver: tls
+      traefik.http.services.duplicati.loadbalancer.server.port: 8200
+    # ldapAuth Options=================================================================
+      traefik.http.routers.duplicati.middlewares: ldap_auth
+      traefik.http.middlewares.ldap_auth.plugin.ldapAuth.enabled: "true"
+      traefik.http.middlewares.ldap_auth.plugin.ldapAuth.logLevel: DEBUG
+      traefik.http.middlewares.ldap_auth.plugin.ldapAuth.url: ldap://ldap.marcpartensky.com
+      traefik.http.middlewares.ldap_auth.plugin.ldapAuth.port: 389
+      traefik.http.middlewares.ldap_auth.plugin.ldapAuth.baseDN: dc=marcpartensky,dc=com
+      traefik.http.middlewares.ldap_auth.plugin.ldapAuth.attribute: uid
 
 volumes:
   duplicati_config:

services/earnapp.yml

@@ -1,7 +0,0 @@
-version: "3.9"
-services:
-  image: fazalfarhan01/earnapp:lite
-  volumes:
-      - earnapp:/etc/earnapp
-  environment:
-    EARNAPP_UUID: $EARNAPP_DEVICE_ID

services/ebook2audiobookxtts.yml

@@ -1,32 +0,0 @@
-services:
-  ebook2audiobook:
-    image: athomasson2/ebook2audiobookxtts:huggingface
-    platform: linux/amd64
-    restart: unless-stopped
-    volumes:
-      - /srv/ebook2audiobookxtts:/app/data
-    # ports:
-    #   - "7860:7860" # Exposition du port 7860 pour accéder à l'application
-    networks:
-      - caddy
-    command: python app.py
-    labels:
-      traefik.enable: "true"
-      traefik.http.routers.ebook2audiobook.rule: >
-        Host(`ebook2audiobook.marcpartensky.com`)
-      traefik.http.routers.ebook2audiobook.entrypoints: web
-      traefik.http.services.ebook2audiobook.loadbalancer.server.port: 7860
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:7860"]
-      interval: 30s
-      timeout: 10s
-      retries: 3
-    environment:
-      TZ: Europe/Paris # Définir le fuseau horaire
-      UID: 1000        # UID pour l'utilisateur
-      GID: 1000        # GID pour le groupe
-      PYTHONUNBUFFERED: 1 # Désactiver le tampon de sortie Python pour une meilleure visibilité des logs
-
-networks:
-  caddy:
-    external: true

services/etesync.yml

@@ -1,34 +0,0 @@
-version: "3.9"
-services:
-  etesync:
-    image: victorrds/etesync
-    restart: unless-stopped
-    networks:
-      - caddy
-      - postgres
-    env_file:
-      - ../data/secrets/etesync.env
-    volumes:
-      - static:/srv/etebase/static
-      - media:/data/media
-    deploy:
-      labels:
-        traefik.enable: "true"
-        traefik.http.services.etesync.loadbalancer.server.port: 3735
-        traefik.http.routers.etesync.rule: >
-          # Host(`etesync.marcpartensky.com`) ||
-          Host(`etesync.marcpartensky.fr`)
-        traefik.http.routers.etesync.entrypoints: websecure
-        traefik.http.routers.etesync.tls.certresolver: tls
-        # traefik.http.routers.etesync.tls.certresolver: cloudflare
-        # traefik.http.routers.etesync.middlewares: ldap_auth
-
-networks:
-  postgres:
-    external: true
-  caddy:
-    external: true
-
-volumes:
-  static:
-  media:

services/etherpad.yml

@@ -3,36 +3,20 @@ version: "3.9"
 services:
   etherpad:
     image: etherpad/etherpad
-    container_name: etherpad
     restart: unless-stopped
-    env_file:
-      - ../data/secrets/etherpad.env
-    # environment:
-    #   SETTINGS_PATH: /etc/etherpad/settings.json
+    environment:
+      ADMIN_PASSWORD: supersecret
     networks:
-      - caddy
-      - postgres
-    # volumes:
-    #   - data:/opt/etherpad-lite/var
-    # volumes:
-    #   - ../data/etherpad/settings.json:/opt/etherpad-lite/settings.json
+        - caddy
     labels:
+      caddy: etherpad.marcpartensky.com, pad.marcpartensky.com
+      caddy.reverse_proxy: "{{upstreams 9001}}"
       traefik.enable: "true"
-      # traefik.http.routers.etherpad.rule: >
-      #   Host(`pad.marcpartensky.com`)
-      # traefik.http.routers.etherpad.entrypoints: web
-      #   # traefik.http.routers.etherpad.tls.certresolver: cloudflare
-      # traefik.http.services.etherpad.loadbalancer.server.port: 9001
-      traefik.http.middlewares.redirect-pad-com.redirectregex.regex: "^https://etherpad.marcpartensky.com/(.*)"
-      traefik.http.middlewares.redirect-pad-com.redirectregex.replacement: "https://pad.marcpartensky.com/$${1}"
-      traefik.http.middlewares.redirect-pad-fr.redirectregex.regex: "^https://etherpad.marcpartensky.fr/(.*)"
-      traefik.http.middlewares.redirect-pad-fr.redirectregex.replacement: "https://pad.marcpartensky.fr/$${1}"
-
-# volumes:
-#   data:
+      traefik.http.routers.etherpad.rule: Host(`etherpad.marcpartensky.com`)
+      traefik.http.routers.etherpad.entrypoints: websecure
+      traefik.http.routers.etherpad.tls.certresolver: tls
+      traefik.http.services.etherpad.loadbalancer.server.port: 9001
 
 networks:
   caddy:
     external: true
-  postgres:
-    external: true

services/fdroid.yml

@@ -1,60 +0,0 @@
-version: "3.9"
-
-services:
-
-  fdroid:
-   image: nginx
-   # image: registry.gitlab.com/fdroid/docker-executable-fdroidserver:master
-   restart: unless-stopped
-   env_file:
-     - ../data/secrets/fdroid.env
-       # command: bash -c './wait-for postgres:5432 -- python3 manage.py migrate && ./httpd-foreground'
-   volumes:
-     - /srv/fdroid:/usr/share/nginx/html:ro
-     - ../data/fdroid/config.py:/apk/config.py
-     - ../data/fdroid/fdroid.keystore:/tmp/my.keystore
-     # - /srv/fdroid/apk:/repo
-     # - /srv/fdroid:/repomaker/data
-   networks:
-     - caddy
-     - postgres
-   labels:
-     traefik.enable: "true"
-     traefik.http.services.fdroid.loadbalancer.server.port: 80
-     traefik.http.routers.fdroid.rule: Host(`fdroid.marcpartensky.com`)
-     traefik.http.routers.fdroid.entrypoints: web
-
-  # fdroid:
-  #   image: registry.gitlab.com/fdroid/repomaker:latest
-  #   restart: unless-stopped
-  #   env_file:
-  #     - ../data/secrets/fdroid.env
-  #   command: bash -c './wait-for postgres:5432 -- python3 manage.py migrate && ./httpd-foreground'
-  #   volumes:
-  #     - /srv/fdroid:/repomaker/data
-  #     - ../data/fdroid/settings_docker.py:/repomaker/repomaker/settings_docker.py
-  #   networks:
-  #     - caddy
-  #     - postgres
-  #   labels:
-  #     traefik.enable: "true"
-  #     traefik.http.services.fdroid.loadbalancer.server.port: 80
-  #     traefik.http.routers.fdroid.rule: Host(`fdroid.marcpartensky.com`)
-  #     traefik.http.routers.fdroid.entrypoints: web
-
-        # fdroid-tasks:
-        #   image: registry.gitlab.com/fdroid/repomaker:latest
-        #   restart: unless-stopped
-        #   env_file:
-        #     - ../data/secrets/fdroid.env
-        #   command: bash -c './wait-for fdroid:80 -- su www-data -p -s /bin/bash -c "cd /repomaker && python3 manage.py process_tasks"'
-        #   volumes:
-        #     - /srv/fdroid:/repomaker/data
-        #   depends_on:
-        #     - fdroid
-
-networks:
-  caddy:
-    external: true
-  postgres:
-    external: true

services/feroxbuster.yml

@@ -1,10 +0,0 @@
-version: "3.9"
-services:
-  feroxbuster:
-    image: epi052/feroxbuster
-    volumes:
-      - /srv/feroxbuster:/srv
-    command: >
-      -u http://ravens-pu8yvgzavpu7ooyr.francecentral.cloudapp.azure.com
-      -x php
-      --wordlist /srv/rockyou.txt

services/filebrowser.yml

@@ -1,32 +0,0 @@
-version: "3.9"
-
-services:
-  filebrowser:
-    image: hurlenko/filebrowser
-    container_name: filebrowser
-    restart: unless-stopped
-    # user: "${UID}:${GID}"
-    user: "1000:100"
-    # volumes:
-    #   - /root/Videos:/data
-    volumes:
-      - /home/marc:/data
-      - ../data/filebrowser:/config
-    # environment:
-      # FB_BASEURL: /filebrowser
-    networks:
-      - caddy
-    labels:
-      traefik.enable: "true"
-      traefik.http.routers.filebrowser.rule: Host(`file.marcpartensky.com`)
-      traefik.http.routers.filebrowser.entrypoints: web
-      # traefik.http.routers.filebrowser.tls.certresolver: tls
-      traefik.http.services.filebrowser.loadbalancer.server.port: 8080
-      traefik.http.routers.filebrowser.middlewares: ldap_auth
-
-networks:
-  caddy:
-    external: true
-
-volumes:
-  data:

services/firefox.yml

@@ -1,41 +0,0 @@
-version: "3.9"
-
-services:
-  ffsync:
-    image: mozilla/syncserver:latest
-    restart: unless-stopped
-    env_file:
-      - ../data/secrets/firefox.env
-    networks:
-      - caddy
-      - postgres
-    volumes:
-      - /srv/firefox:/data
-    labels:
-      traefik.enable: "true"
-      traefik.http.routers.ffsync.rule: Host(`firefox.marcpartensky.com`)
-      traefik.http.routers.ffsync.entrypoints: web
-      traefik.http.services.ffsync.loadbalancer.server.port: 80
-    # labels:
-    #   - traefik.enable: true
-    #   - traefik.backend: ffsync
-    #   - traefik.frontend.rule: Host:firefoxsync.${DOMAINNAME}
-    #   - traefik.port: 5000
-    #   - traefik.docker.network: caddy
-
-  # ffsync_db:
-  #   image: postgres:alpine
-  #   container_name: ffsync_db
-  #   restart: unless-stopped
-  #   networks:
-  #       - ffsync_network
-  #   environment:
-  #     POSTGRES_DB: ${FFSYNC_DATABASE_DB}
-  #     POSTGRES_USER: ${FFSYNC_DATABASE_USER}
-  #     POSTGRES_PASSWORD: ${FFSYNC_DB_PASSWORD}
-
-networks:
-  postgres:
-    external: true
-  caddy:
-    external: true

services/focalboard.yml

@@ -1,32 +0,0 @@
-version: "3.9"
-services:
-  focalboard:
-    image: docker.io/mattermost/focalboard
-    restart: unless-stopped
-    volumes:
-      - data:/opt/focalboard/data
-      - pack:/opt/focalboard/pack
-      - ../data/focalboard/config.json:/opt/focalboard/config.json
-    environment:
-      EXCLUDE_ENTERPRISE: "1"
-    networks:
-      - caddy
-      - postgres
-    labels:
-      traefik.enable: "true"
-      traefik.http.routers.focalboard.rule: >
-        Host(`board.marcpartensky.com`)
-      traefik.http.routers.focalboard.entrypoints: web
-      # traefik.http.routers.focalboard.tls.certresolver: tls
-      traefik.http.services.focalboard.loadbalancer.server.port: 8000
-      traefik.http.middlewares.focalboard.redirectscheme.scheme: https
-      # traefik.http.routers.focalboard.middlewares: ldap_auth
-
-volumes:
-  data:
-  pack:
-networks:
-  postgres:
-    external: true
-  caddy:
-    external: true

services/frappelms.yml

@@ -1,54 +0,0 @@
-version: "3.9"
-
-services:
-  mariadb:
-    image: mariadb:10.6
-    command:
-      - --character-set-server=utf8mb4
-      - --collation-server=utf8mb4_unicode_ci
-      - --skip-character-set-client-handshake
-      - --skip-innodb-read-only-compressed # Temporary fix for MariaDB 10.6
-    env_file:
-      - ../data/secrets/frappelms.env
-    volumes:
-      - /srv/mariadb:/var/lib/mysql
-    networks:
-      - mariadb
-    ports:
-      - target: 3306
-        published: 3306
-        mode: host
-
-  frappelms:
-    image: frappe/bench:latest
-    command: bash /workspace/init.sh
-    environment:
-      SHELL: /bin/bash
-    working_dir: /home/frappe
-    volumes:
-      - /srv/frappelms:/workspace
-        # env_file:
-        #   - ../data/secrets/frappelms.env # useless
-    networks:
-      - caddy
-      - mariadb
-      - redis
-        # ports:
-        #   - 8000:8000
-        #   - 9000:9000
-    labels:
-      traefik.enable: "true"
-      traefik.http.routers.frappelms.rule: >
-        Host(`lms.marcpartensky.com`)
-      traefik.http.routers.frappelms.entrypoints: web
-      traefik.http.services.frappelms.loadbalancer.server.port: 8000
-
-volumes:
-  mariadb-data:
-
-networks:
-  mariadb:
-  redis:
-    external: true
-  caddy:
-    external: true

services/fuseki.yml

@@ -1,31 +0,0 @@
-version: "3.9"
-
-services:
-  fuseki:
-    image: stain/jena-fuseki
-    volumes:
-      # - ./config:/fuseki/configuration
-      - data:/fuseki/databases
-    # environment:
-    #   - FUSEKI_HOME=/fuseki
-    #   - FUSEKI_BASE=/fuseki/databases
-    env_file:
-      - ../data/secrets/fuseki.env
-    networks:
-      - caddy
-    deploy:
-      replicas: 1
-      placement:
-        constraints:
-          - node.role == manager
-      labels:
-        traefik.enable: "true"
-        traefik.http.routers.fuseki.rule: Host(`fuseki.marcpartensky.com`)
-        traefik.http.services.fuseki.loadbalancer.server.port: 3030
-
-networks:
-  caddy:
-    external: true
-
-volumes:
-  data:

services/gitbook.yml

@@ -1,25 +0,0 @@
-version: "3.9"
-services:
-  gitbook:
-    image: marcpartensky/gitbook
-    # image: billryan/gitbook
-    # image: yanqd0/gitbook
-    restart: unless-stopped
-    # volumes:
-    #   - ../data/gitbook:/gitbook
-    environment:
-      # BOOK_URL: https://github.com/marcpartensky/docker
-      BOOK_URL: https://github.com/marcpartensky/markdown
-    networks:
-      - caddy
-    deploy:
-      labels:
-        traefik.enable: "true"
-        traefik.http.routers.gitbook.rule: Host(`gitbook.marcpartensky.com`)
-        traefik.http.routers.gitbook.entrypoints: websecure
-        traefik.http.routers.gitbook.tls.certresolver: tls
-        traefik.http.services.gitbook.loadbalancer.server.port: 4000
-
-networks:
-  caddy:
-    external: true

services/gitea-postgres.yml

@@ -0,0 +1,19 @@
+version: "3.9"
+
+services:
+  gitea_postgres:
+    image: postgres
+    restart: unless-stopped
+    env_file:
+      - ../data/secrets/gitea.env
+    networks:
+      - caddy
+      - gitea
+    volumes:
+      - gitea_postgres:/var/lib/postgresql/data
+
+volumes:
+  gitea_postgres:
+
+networks:
+  gitea:

services/gitea.yml

@@ -3,7 +3,6 @@ version: "3.9"
 services:
   gitea:
     image: gitea/gitea:1.14.6
-    container_name: gitea
     restart: unless-stopped
     # user: git
     # environment:
@@ -14,38 +13,29 @@ services:
       - ../data/secrets/gitea.env
     networks:
       - caddy
-      - postgres
+      - gitea
     volumes:
-      - ssh:/data/git/.ssh
-      - data:/data
+      - gitea_ssh:/data/git/.ssh
+      - gitea:/data
       # - /etc/localtime:/etc/localtime:ro
     ports:
-      - "42070:22"
-    # labels:
-    #   caddy: gitea.marcpartensky.com
-    #   caddy.reverse_proxy: "{{upstreams 3000}}"
-    #   traefik.enable: "true"
-    #   traefik.http.routers.gitea.rule: Host(`git.marcpartensky.com`)
-    #   traefik.http.routers.gitea.entrypoints: websecure
-    #   traefik.http.routers.gitea.tls.certresolver: tls
-    #   traefik.http.services.gitea.loadbalancer.server.port: 3000
-    # deploy:
-    #   labels:
-    #     traefik.enable: "true"
-    #     traefik.http.routers.gitea.rule: >
-    #       Host(`git.marcpartensky.com`) ||
-    #       Host(`git.marcpartensky.fr`)
-    #     traefik.http.routers.gitea.entrypoints: websecure
-    #     # traefik.http.routers.gitea.tls.certresolver: tls
-    #     traefik.http.routers.gitea.tls.certresolver: cloudflare
-    #     traefik.http.services.gitea.loadbalancer.server.port: 3000
+      - "7012:22"
+    depends_on:
+      - gitea_postgres
+    labels:
+      caddy: gitea.marcpartensky.com
+      caddy.reverse_proxy: "{{upstreams 3000}}"
+      traefik.enable: "true"
+      traefik.http.routers.gitea.rule: Host(`git.marcpartensky.com`)
+      traefik.http.routers.gitea.entrypoints: websecure
+      traefik.http.routers.gitea.tls.certresolver: tls
+      traefik.http.services.gitea.loadbalancer.server.port: 3000
 
 volumes:
-  data:
-  ssh:
+  gitea:
+  gitea_ssh:
 
 networks:
-  postgres:
-    external: true
+  gitea:
   caddy:
     external: true

services/gitlab.yml

@@ -2,8 +2,7 @@ version: "3.9"
 
 services:
   gitlab:
-    container_name: gitlab
-    image: gitlab/gitlab-ce:latest
+    image: gitlab/gitlab-ee:latest
     restart: unless-stopped
     hostname: gitlab.marcpartensky.com
     environment:
@@ -18,35 +17,22 @@ services:
       - gitlab_config:/etc/gitlab
       - gitlab_log:/var/log/gitlab
       - gitlab_data:/var/opt/gitlab
+    shm_size: '256m'
     labels:
-    #   caddy: gitlab.marcpartensky.com
-    #   caddy.reverse_proxy: "{{upstreams http 80}}"
+      caddy: gitlab.marcpartensky.com
+      caddy.reverse_proxy: "{{upstreams http 80}}"
       traefik.enable: "true"
-    #   traefik.http.routers.gitlab.rule: Host(`gitlab.marcpartensky.com`)
-    #   traefik.http.routers.gitlab.entrypoints: websecure
-    #   traefik.http.routers.gitlab.tls.certresolver: tls
-    #   traefik.http.services.gitlab.loadbalancer.server.port: 80
-    # # shm_size: '512m'
-    # deploy:
-    #   labels:
-    #     traefik.enable: "true"
-    #     traefik.http.routers.gitlab.rule: Host(`gitlab.marcpartensky.com`)
-    #     traefik.http.routers.gitlab.entrypoints: websecure
-    #     traefik.http.routers.gitlab.tls.certresolver: tls
-    #     traefik.http.services.gitlab.loadbalancer.server.port: 80
-    #   resources:
-    #     reservations:
-    #         cpus: "1"
-    #         # memory: "512M"
-    #         memory: "3G"
+      traefik.http.routers.gitlab.rule: Host(`gitlab.marcpartensky.com`)
+      traefik.http.routers.gitlab.entrypoints: websecure
+      traefik.http.routers.gitlab.tls.certresolver: tls
+      traefik.http.services.gitlab.loadbalancer.server.port: 80
 
   gitlab-runner:
     image: gitlab/gitlab-runner:alpine
-    container_name: gitlab-runner
     restart: unless-stopped
-    # deploy:
-    #   mode: replicated
-    #   replicas: 2
+    deploy:
+      mode: replicated
+      replicas: 4
 
 volumes:
   gitlab_config:

services/gluetun.yml

@@ -1,36 +0,0 @@
-version: "3.9"
-services:
-  gluetun:
-    image: qmcgaw/gluetun
-    cap_add:
-      - NET_ADMIN
-    env_file:
-      - ../data/secrets/gluetun.env
-    # environment:
-    #   # VPN_SERVICE_PROVIDER: protonvpn
-    #   # VPN_SERVICE_PROVIDER: openvpn
-    #   OPENVPN_USER: marcpartensky
-    #   OPENVPN_PASSWORD: Lxxxxxxxxxyyyyyxxxxn
-    #   # SERVER_COUNTRIES: France
-    #   # FREE_ONLY: on # Only required when using ProtonVPN's free service
-    ports:
-      - 9091:9091
-      - 51413:51413
-      - 51413:51413/udp # Application container's ports to be published
-    networks:
-      - vpn
-      - caddy
-    deploy:
-      labels:
-        traefik.enable: "true"
-        traefik.http.services.gluetun.loadbalancer.server.port: 8000
-        traefik.http.routers.gluetun.rule: Host(`gluetun.marcpartensky.com`)
-        traefik.http.routers.gluetun.entrypoints: websecure
-        traefik.http.routers.gluetun.tls.certresolver: tls
-        traefik.http.routers.gluetun.middlewares: ldap_auth 
-
-networks:
-  vpn:
-    external: true
-  caddy:
-    external: true

services/gpg.yml

@@ -1,7 +0,0 @@
-version: "3.9"
-services:
-  gpg:
-    image: marcpartensky/gpg
-    volumes:
-      - /srv:/srv
-      - ../data/gpg:/root/keys

services/grafana.yml

@@ -1,39 +0,0 @@
-version: "3.9"
-services:
-  grafana:
-    image: grafana/grafana
-    container_name: grafana
-    restart: unless-stopped
-    env_file:
-      - ../data/secrets/grafana.env
-    # environment:
-      # GF_INSTALL_PLUGINS: grafana-ldap-auth
-    volumes:
-      - ../data/grafana:/etc/grafana
-      - grafana:/var/lib/grafana
-    networks:
-      - caddy
-      - postgres
-      - ldap
-    # deploy:
-    #   labels:
-    #     caddy: grafana.marcpartensky.com
-    #     caddy.reverse_proxy: "{{upstreams 3000}}"
-    #     traefik.enable: "true"
-    #     traefik.http.routers.grafana.rule: >
-    #       Host(`grafana.marcpartensky.fr`) ||
-    #       Host(`grafana.marcpartensky.com`)
-    #     traefik.http.routers.grafana.entrypoints: websecure
-    #     traefik.http.routers.grafana.tls.certresolver: tls
-    #     traefik.http.services.grafana.loadbalancer.server.port: 3000
-
-volumes:
-  grafana:
-
-networks:
-  ldap:
-    external: true
-  postgres:
-    external: true
-  caddy:
-    external: true

services/heimdall.yml

@@ -3,7 +3,6 @@ version: "3.9"
 services:
   heimdall:
     image: lscr.io/linuxserver/heimdall:latest
-    container_name: heimdall
     restart: unless-stopped
     environment:
       PUID: 1000
@@ -13,32 +12,18 @@ services:
       - ../data/heimdall:/config
     networks:
       - caddy
-      - postgres
-      - redis
     labels:
-      # caddy: heimdall.marcpartensky.com
-      # caddy.reverse_proxy: "{{upstreams}}"
+      caddy: heimdall.marcpartensky.com
+      caddy.reverse_proxy: "{{upstreams}}"
       traefik.enable: "true"
       traefik.http.routers.heimdall.rule: Host(`heimdall.marcpartensky.com`)
-      traefik.http.routers.heimdall.entrypoints: web
-      # traefik.http.routers.heimdall.tls: "true"
-        # traefik.http.middlewares.test-ldap-auth.plugin.ldapAuth.source: marcpartensky.com
-        # traefik.http.middlewares.test-ldap-auth.plugin.ldapAuth.baseDN: dc=marcpartensky,dc=com
+      traefik.http.routers.heimdall.entrypoints: websecure
+      traefik.http.routers.heimdall.tls: "true"
+      traefik.http.middlewares.test-ldap-auth.plugin.ldapAuth.source: marcpartensky.com
+      traefik.http.middlewares.test-ldap-auth.plugin.ldapAuth.baseDN: dc=marcpartensky,dc=com
       # traefik.http.services.heimdall.loadbalancer.server.port: 80
       # traefik.http.routers.heimdall.middlewares: authelia-basic@docker
-    # deploy:
-    #   labels:
-    #     traefik.enable: "true"
-    #     traefik.http.routers.heimdall.rule: Host(`heimdall.marcpartensky.com`)
-    #     traefik.http.routers.heimdall.entrypoints: websecure
-    #     traefik.http.routers.heimdall.tls.certresolver: tls
-    #     traefik.http.services.heimdall.loadbalancer.server.port: 80
-    #     traefik.http.routers.duplicati.middlewares: ldap_auth
 
 networks:
-  redis:
-    external: true
-  postgres:
-    external: true
   caddy:
     external: true

services/homeassistant.yml

@@ -1,10 +0,0 @@
-version: "3.9"
-services:
-  homeassistant:
-    restart: unless-stopped
-    image: ghcr.io/home-assistant/home-assistant:stable
-    volumes:
-      - config:/config
-      - /etc/localtime:/etc/localtime:ro
-    privileged: true
-    network_mode: host

services/homer.yml

@@ -2,7 +2,6 @@ version: "3.9"
 services:
   homer:
     image: b4bz/homer
-    container_name: homer
     restart: unless-stopped
     volumes:
       - homer:/www/assets
@@ -10,18 +9,9 @@ services:
       INIT_ASSETS: 1 # default
     networks:
       - caddy
-    # labels:
-    #   caddy: homer.marcpartensky.com
-    #   caddy.reverse_proxy: "{{upstreams 8080}}"
-    # deploy:
-    #   labels:
-    #     traefik.enable: "true"
-    #     traefik.http.routers.homer.rule: >
-    #       Host(`homer.marcpartensky.com`) ||
-    #       Host(`homer.marcpartensky.fr`)
-    #     traefik.http.routers.homer.entrypoints: websecure
-    #     traefik.http.routers.homer.tls.certresolver: tls
-    #     traefik.http.services.homer.loadbalancer.server.port: 8080
+    labels:
+      caddy: homer.marcpartensky.com
+      caddy.reverse_proxy: "{{upstreams 8080}}"
 
 volumes:
   homer:

services/honeygain.yml

@@ -1,6 +0,0 @@
-version: "3.9"
-services:
-  honeygain:
-    image: marcpartensky/honeygain
-    env_file:
-      - ../data/secrets/honeygain.env

services/hydra.yml

@@ -1,16 +0,0 @@
-version: "3.9"
-services:
-  hydra:
-    image: marcpartensky/hydra:latest
-    network_mode: host
-    env_file:
-      - ../data/secrets/hydra.env
-    # command: -P /rockyou.txt -L /usernames.txt ssh://192.168.252.18
-    # workdir: /root
-    volumes:
-      - ../data/hydra/rockyou.txt:/rockyou.txt
-      - ../data/hydra/usernames.txt:/usernames.txt
-      - hydra:/root
-
-volumes:
-  hydra:

services/ialab.yml

@@ -2,11 +2,19 @@ version: "3.9"
 
 services:
   ialab:
-    image: marcpartensky/ialab:latest
-    # volumes:
-    #   - ialab:/app
+    image: marcpartensky/ialab
+    user: nobody
+    restart: unless-stopped
+    environment:
+      FLASK_APP: server.py
+    # entrypoint: "gunicorn server:app"
+    # entrypoint: "gunicorn --chdir /app server:app"
+    volumes:
+      - ialab:/app
     networks:
       - caddy
+    depends_on:
+      - caddy
     labels:
       caddy: ialab.marcpartensky.com
       caddy.reverse_proxy: "{{upstreams 8000}}"
@@ -14,18 +22,11 @@ services:
       traefik.http.routers.ialab.rule: Host(`ialab.marcpartensky.com`)
       traefik.http.routers.ialab.entrypoints: websecure
       traefik.http.routers.ialab.tls.certresolver: tls
-      traefik.http.services.ialab.loadbalancer.server.port: 80
-    deploy:
-      labels:
-        traefik.enable: "true"
-        traefik.http.routers.ialab.rule: Host(`ialab.marcpartensky.com`)
-        traefik.http.routers.ialab.entrypoints: websecure
-        traefik.http.routers.ialab.tls.certresolver: tls
-        traefik.http.services.ialab.loadbalancer.server.port: 80
+      traefik.http.services.ialab.loadbalancer.server.port: 8000
+
+volumes:
+  ialab:
 
-# volumes:
-#   ialab:
-#
 networks:
   caddy:
     external: true

services/ipfs.yml

@@ -1,65 +0,0 @@
-version: "3.9"
-services:
-  ipfs:
-    restart: unless-stopped
-    image: lscr.io/linuxserver/ipfs
-    environment:
-      PUID: 1000
-      PGID: 1000
-      TZ: Europe/Paris
-    volumes:
-      - ipfs:/config
-      - /srv/:/srv
-    networks:
-      - caddy
-    ports:
-      # - 80:80 #dumb http client
-      # - 443:443 #optional
-      - 4001:4001
-      - 5001:5001
-      - 8080:8080
-    deploy:
-      resources:
-        limits:
-          cpus: '0.1'
-          memory: 500M
-        # reservations:
-        #   cpus: '0.1'
-        #   memory: 100M
-      labels:
-        traefik.enable: "true"
-        # traefik.http.routers.ipfs.rule: Host(`ipfs.marcpartensky.com`)
-        traefik.http.routers.ipfs.rule: Host(`ipfs.marcpartensky.fr`)
-        # traefik.http.routers.ipfs.rule: >
-        #   Host(`ipfs.marcpartensky.com`) || Host(`ipfs.marcpartensky.fr`)
-        # traefik.http.routers.ipfs.entrypoints: websecure
-        # traefik.http.routers.ipfs.tls.certresolver: tls
-        traefik.http.routers.ipfs.tls.certresolver: cloudflare
-        traefik.http.services.ipfs.loadbalancer.server.port: 5001
-        traefik.http.routers.ifps.middlewares: ldap_auth
-        # traefik.frontend.redirect.regex: ^https://ipfs.marcpartensky.com$$
-        # the middleware 'add-context' must be defined so that the regex rules can be attached to it
-        # traefik.http.routers.ifps.middlewares: add-context
-        #
-        # # here is the logic provided by gustavomtborges of this gist:
-        # traefik.http.middlewares.add-context.redirectregex.regex: ^https:\\/\\/([^\\/]+)\\/?$$
-        # traefik.http.middlewares.add-context.redirectregex.replacement: https://$$1/webui
-        #
-        traefik.http.routers.ipfs.middlewares: custom_repath
-        traefik.http.middlewares.custom_repath.replacepathregex.regex: ^/$$
-        traefik.http.middlewares.custom_repath.replacepathregex.replacement: /webui
-          
-        # the middleware 'add-context' must be defined so that the regex rules can be attached to it
-        traefik.http.routers.ipfs.middlewares: add-context
-
-        # here is the logic provided by gustavomtborges of this gist:
-        traefik.http.middlewares.add-context.redirectregex.regex: ^https:\\/\\/([^\\/]+)\\/?$$
-        traefik.http.middlewares.add-context.redirectregex.replacement: https://$$1/webui
-
-
-volumes:
-  ipfs:
-
-networks:
-  caddy:
-    external: true

services/izitdone.yml

@@ -1,49 +0,0 @@
-version: "3.9"
-
-services:
-  izitdone-back:
-    image: docker.io/marcpartensky/izitdone-back:v23.ca2e91d09917d423458640113e852cfd60d6916e
-    restart: unless-stopped
-    networks:
-      - caddy
-      - postgres
-    env_file:
-      - ../data/secrets/izitdone.env
-    # volumes:
-    #   - ../data/secrets/izitdone.env:/root/.env
-    labels:
-      traefik.enable: "true"
-      traefik.http.routers.izitdone-back.rule: >
-        Host(`izitdone.marcpartensky.com`) && PathPrefix(`/api`)
-      traefik.http.routers.izitdone-back.entrypoints: web
-      traefik.http.services.izitdone-back.loadbalancer.server.port: 8000
-      traefik.http.middlewares.izitdone-back.redirectscheme.scheme: https
-      traefik.http.middlewares.izitdone-back-strip.stripprefix.prefixes: /api
-      # traefik.http.middlewares.izitdone-back-strip.stripprefix.forceslash: false
-      traefik.http.routers.izitdone-back.middlewares: izitdone-back-strip
-      # traefik.http.routers.izitdone-back.tls.certresolver: tls
-      # traefik.http.routers.izitdone-back.middlewares: ldap_auth
-
-  izitdone-front:
-    image: docker.io/marcpartensky/izitdone-front:latest
-    restart: unless-stopped
-    networks:
-      - caddy
-      - postgres
-    # volumes:
-    #   - ../data/secrets/izitdone.env:/root/.env
-    labels:
-      traefik.enable: "true"
-      traefik.http.routers.izitdone-front.rule: >
-        Host(`izitdone.marcpartensky.com`) && !PathPrefix(`/api`)
-      traefik.http.routers.izitdone-front.entrypoints: web
-      # traefik.http.routers.izitdone-front.tls.certresolver: tls
-      traefik.http.services.izitdone-front.loadbalancer.server.port: 3000
-      traefik.http.middlewares.izitdone-front.redirectscheme.scheme: https
-      # traefik.http.routers.izitdone-front.middlewares: ldap_auth
-
-networks:
-  postgres:
-    external: true
-  caddy:
-    external: true

services/jellyfin.yml

@@ -1,47 +0,0 @@
-version: "3.9"
-services:
-  jellyfin:
-    image: docker.io/jellyfin/jellyfin:latest
-    container_name: jellyfin
-    environment:
-    #   PUID: 1000
-    #   PGID: 1000
-    #   TZ: Europe/Paris
-      JELLYFIN_PublishedServerUrl: jellyfin.marcpartensky.com
-    devices:
-      - /dev/dri
-    volumes:
-      - config:/config
-      - cache:/cache
-      - /srv/jellyfin/media:/media
-      - /srv/jellyfin/movies:/movies
-      - /srv/jellyfin/musics:/musics
-      - /srv/jellyfin/photos:/photos
-      - ~/Videos/Youtube:/videos
-    # ports:
-    #   - 8096:8096 #http
-      # - 8920:8920 #optional https self signed
-      # - 7359:7359/udp #optional lan discovery
-      # - 1900:1900/udp #optional dnla
-    networks:
-      - caddy
-    labels:
-      traefik.enable: "true"
-      traefik.http.routers.jellyfin.rule: Host(`jellyfin.marcpartensky.com`)
-      traefik.http.routers.jellyfin.entrypoints: web
-        # traefik.http.routers.jellyfin.tls.certresolver: cloudflare
-      traefik.http.services.jellyfin.loadbalancer.server.port: 8096
-
-
-volumes:
-  config:
-  cache:
-  media:
-  movies:
-  musics:
-  photos:
-  videos:
-
-networks:
-  caddy:
-    external: true

services/jenkins.yml

@@ -3,7 +3,6 @@ version: "3.9"
 services:
   jenkins:
     image: jenkins/jenkins:lts-jdk11
-    container_name: jenkins
     user: root
     volumes:
       - jenkins:/var/jenkins_home
@@ -12,14 +11,14 @@ services:
       - caddy
     # ports:
     #   - "50000:50000"
-    # labels:
-    #   caddy: jenkins.marcpartensky.com
-    #   caddy.reverse_proxy: "{{upstreams 8080}}"
-    #   traefik.enable: "true"
-    #   traefik.http.routers.jenkins.rule: Host(`jenkins.marcpartensky.com`)
-    #   traefik.http.routers.jenkins.entrypoints: websecure
-    #   traefik.http.routers.jenkins.tls.certresolver: tls
-    #   traefik.http.services.jenkins.loadbalancer.server.port: 8080
+    labels:
+      caddy: jenkins.marcpartensky.com
+      caddy.reverse_proxy: "{{upstreams 8080}}"
+      traefik.enable: "true"
+      traefik.http.routers.jenkins.rule: Host(`jenkins.marcpartensky.com`)
+      traefik.http.routers.jenkins.entrypoints: websecure
+      traefik.http.routers.jenkins.tls.certresolver: tls
+      traefik.http.services.jenkins.loadbalancer.server.port: 8080
 
 volumes:
   jenkins:

services/jupyterhub.yml

@@ -2,22 +2,17 @@ version: "3.9"
 
 services:
   jupyterhub:
-    image: marcpartensky/jupyterhub
+    image: jupyterhub/jupyterhub
     restart: unless-stopped
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
-      - ../data/jupyterhub/jupyterhub_config.py:/srv/jupyterhub/jupyterhub_config.py
       # - jupyterhub:/srv/jupyterhub
     networks:
-      - ldap
-      - caddy
-      - jupyterhub
+    - caddy
     environment:
-      # DOCKER_IMAGE: marcpartensky/jupyterlab
-      DOCKER_IMAGE: jupyterhub/singleuser
-      DOCKER_NETWORK_NAME: caddy
+      DOCKER_JUPYTER_IMAGE: marcpartensky/jupyterlab
+      DOCKER_NETWORK_NAME: jupyterhub
       HUB_IP: jupyterhub
-      DOCKER_HOST: unix:///var/run/docker.sock
     labels:
       caddy: jupyterhub.marcpartensky.com
       caddy.reverse_proxy: "{{upstreams 8000}}"
@@ -25,22 +20,8 @@ services:
       traefik.http.routers.jupyterhub.rule: Host(`jupyterhub.marcpartensky.com`)
       traefik.http.routers.jupyterhub.entrypoints: websecure
       traefik.http.routers.jupyterhub.tls.certresolver: tls
-      traefik.http.services.jupyterhub.loadbalancer.server.port: 8000
-      # traefik.docker.network: jupyterhub_default
-    deploy:
-      labels:
-        traefik.enable: "true"
-        # traefik.http.routers.jupyterhub.rule: Host(`jupyterhub.marcpartensky.com`)
-        traefik.http.routers.jupyterhub.rule: Host(`hub.marcpartensky.fr`)
-        traefik.http.routers.jupyterhub.entrypoints: websecure
-        traefik.http.routers.jupyterhub.tls.certresolver: tls
-        traefik.http.services.jupyterhub.loadbalancer.server.port: 8000
+      traefik.http.services.jupyterhub.loadbalancer.server.port: 3000
 
 networks:
-  jupyterhub:
-    name: jupyterhub
-    driver: overlay
   caddy:
     external: true
-  ldap:
-    external: true

services/jupyterlab.yml

@@ -2,42 +2,23 @@ version: "3.9"
 
 services:
   jupyterlab:
-    # image: jupyter/datascience-notebook:latest
     image: marcpartensky/jupyterlab
-    container_name: jupyterlab
-    # restart: unless-stopped
+    restart: unless-stopped
     environment:
     #   - GEN_CERT=yes
       JUPYTER_ENABLE_LAB: "yes"
       GRANT_SUDO: "yes"
-      JUPYTER_CONFIG_DIR: /home/jupyter/.jupyter
-    # entrypoint: python -m jupyter lab
-    # entrypoint: start.sh jupyter lab --user root
+    entrypoint: start.sh jupyter lab --user root
     networks:
       - caddy
-    # labels:
-    #   caddy: lab.marcpartensky.com
-    #   caddy.reverse_proxy: "{{upstreams 8888}}"
-    #   traefik.enable: "true"
-    #   traefik.http.routers.jupyterlab.rule: Host(`lab.marcpartensky.com`)
-    #   traefik.http.routers.jupyterlab.entrypoints: websecure
-    #   traefik.http.routers.jupyterlab.tls.certresolver: tls
-    #   traefik.http.services.jupyterlab.loadbalancer.server.port: 8888
-    # volumes:
-      # - jupyterlab:/home/jupyter
-      # - ../data/jupyterlab/:/home/jupyter/.jupyter/
-    # deploy:
-    #   placement:
-    #     constraints:
-    #       - node.role == manager
-    #   labels:
-    #     traefik.enable: "true"
-    #     # traefik.http.routers.jupyterlab.rule: Host(`lab.marcpartensky.fr`)
-    #     traefik.http.routers.jupyterlab.rule: >
-    #       Host(`lab.marcpartensky.fr`) && Host(`lab.marcpartensky.com`)
-    #     traefik.http.routers.jupyterlab.entrypoints: websecure
-    #     traefik.http.routers.jupyterlab.tls.certresolver: cloudflare
-    #     traefik.http.services.jupyterlab.loadbalancer.server.port: 8888
+    labels:
+      caddy: lab.marcpartensky.com
+      caddy.reverse_proxy: "{{upstreams 8888}}"
+      traefik.enable: "true"
+      traefik.http.routers.jupyterlab.rule: Host(`lab.marcpartensky.com`)
+      traefik.http.routers.jupyterlab.entrypoints: websecure
+      traefik.http.routers.jupyterlab.tls.certresolver: tls
+      traefik.http.services.jupyterlab.loadbalancer.server.port: 8888
 # entrypoint: start-notebook.sh \
     #     --NotebookApp.keyfile=key/0000_key-certbot.pem
     #     --NotebookApp.certfile=cert/0000_csr-certbot.pem
@@ -46,8 +27,6 @@ services:
     #   - /etc/letsencrypt/csr:/home/jovyan/work/cert
     #   - /etc/letsencrypt:/etc/letsencrypt
     #
-volumes:
-  jupyterlab:
 
 networks:
   caddy:

services/keycloak.yml

@@ -1,29 +0,0 @@
-version: "3.9"
-services:
-  keycloak:
-    image: quay.io/keycloak/keycloak:19.0.3
-    env_file:
-      - ../data/secrets/keycloak.env
-    networks:
-      - caddy
-    # command: start-dev
-    command: start --optimized
-    labels:
-      caddy: keycloak.marcpartensky.com
-      caddy.reverse_proxy: "{{upstreams 8080}}"
-      traefik.enable: "true"
-      traefik.http.routers.keycloak.rule: Host(`keycloak.marcpartensky.com`)
-      traefik.http.routers.keycloak.entrypoints: websecure
-      traefik.http.routers.keycloak.tls.certresolver: tls
-      traefik.http.services.keycloak.loadbalancer.server.port: 8080
-    deploy:
-      labels:
-        traefik.enable: "true"
-        traefik.http.routers.keycloak.rule: Host(`keycloak.marcpartensky.com`)
-        traefik.http.routers.keycloak.entrypoints: websecure
-        traefik.http.routers.keycloak.tls.certresolver: tls
-        traefik.http.services.keycloak.loadbalancer.server.port: 8080
-
-networks:
-  caddy:
-    external: true

services/kippo.yml

@@ -1,6 +0,0 @@
-version: "3.9"
-services:
-  kippo:
-    image: tomdesinto/kippo
-    ports:
-      - "22:22"

services/languagetool.yml

@@ -1,14 +0,0 @@
-version: "3.9"
-services:
-  languagetool:
-    image: erikvl87/languagetool
-    restart: unless-stopped
-    networks:
-      - caddy
-    labels:
-      caddy: languagetoo.marcpartensky.com
-      caddy.reverse_proxy: "{{ upstreams 8010 }}"
-
-networks:
-  caddy:
-    external: true

services/ldap-manager-go.yml

@@ -1,64 +0,0 @@
-version: "3.9"
-services:
-  ldap_manager_go:
-    image: romnn/ldap-manager
-    # command: --generate
-    env_file:
-     - ../data/secrets/ldap_manager_go.env
-    networks:
-     - ldap
-     - caddy
-    environment:
-      HTTP_PORT: 80
-      GRPC_PORT: 9090
-
-      LDAP_HOST: "ldap"
-      LDAP_PORT: 389
-      # LDAP_ADMIN_PASSWORD: admin
-      # LDAP_CONFIG_PASSWORD: config
-
-      LDAP_ORGANIZATION: Marc Partensky
-      # LDAP_DOMAIN: marcpartensky.com
-      # LDAP_DOMAIN: marcpartensky.fr
-      # DAP_BASE_DN: dc=admin,dc=org
-      LDAP_DOMAIN: marcpartensky.com
-      LDAP_BASE_DN: dc=marcpartensky,dc=com
-
-      # DEFAULT_ADMIN_USERNAME: ldap-manager-php
-      # DEFAULT_ADMIN_PASSWORD: "@Rd2^28Yo9er*rZ52p!JkxQPq!!VvQ"
-      DEFAULT_ADMIN_USERNAME: marc
-      DEFAULT_ADMIN_PASSWORD: "D2%4&$ascXxxbJX%BY^tN6BRF@bY!F"
-      LDAP_ADMIN_USERNAME: marc
-      LDAP_ADMIN_PASSWORD: "D2%4&$ascXxxbJX%BY^tN6BRF@bY!F"
-      # FORCE_CREATE_ADMIN: "true"
-
-      LDAP_TLS: "false"
-      LDAP_USE_RFC2307BIS: "true"
-      
-      ISSUER: ldap@marcpartensky.com
-      AUDIENCE: marcpartensky.com
-      GENERATE: "true" # ports:
-  #   - 9090:9090
-    labels:
-      traefik.enable: "true"
-      traefik.http.routers.ldap_manager_go.rule: Host(`ldapgo.marcpartensky.com`)
-      # traefik.http.routers.ldap_manager_go.rule: >
-      #   Host(`ldapgo.marcpartensky.com`)
-      traefik.http.routers.ldap_manager_go.entrypoints: web
-      # traefik.http.routers.ldap_manager_go.tls.certresolver: tls
-      traefik.http.services.ldap_manager_go.loadbalancer.server.port: 80
-    # deploy:
-    #   labels:
-    #     traefik.enable: "true"
-    #     # traefik.http.routers.ldap_manager_go.rule: Host(`ldapgo.marcpartensky.com`)
-    #     traefik.http.routers.ldap_manager_go.rule: >
-    #       Host(`ldapgo.marcpartensky.com`) || Host(`ldapgo.marcpartensky.fr`)
-    #     traefik.http.routers.ldap_manager_go.entrypoints: websecure
-    #     traefik.http.routers.ldap_manager_go.tls.certresolver: tls
-    #     traefik.http.services.ldap_manager_go.loadbalancer.server.port: 80
-
-networks:
-  ldap:
-    external: true
-  caddy:
-    external: true

services/ldap-manager.yml

@@ -5,41 +5,29 @@ services:
     image: wheelybird/ldap-user-manager:latest
     restart: unless-stopped
     environment:
-      SERVER_HOSTNAME: auth.marcpartensky.com
-      LDAP_URI: ldap://ldap:389
-      # LDAP_BASE_DN: dc=admin,dc=org
-      LDAP_BASE_DN: dc=marcpartensky,dc=com
+      SERVER_HOSTNAME: auth.marcpartensy.com
+      LDAP_URI: ldap://ldap
+      LDAP_BASE_DN: dc=admin,dc=org
       LDAP_ADMINS_GROUP: admins
-      LDAP_ADMIN_BIND_DN: uid=5a5049f38c347a028dc67c975ef66cdc1e953ae57e89154fb074bcc18b1f4581,dc=marcpartensky,dc=com
+      LDAP_ADMIN_BIND_DN: cn=admin,dc=admin,dc=org
       LDAP_IGNORE_CERT_ERRORS: "true"
       LDAP_REQUIRE_STARTTLS: "FALSE"
       NO_HTTPS: "TRUE"
     env_file:
       - ../data/secrets/ldap.env
-    # depends_on:
-    #   - ldap
+    depends_on:
+      - ldap
     networks:
       - ldap
       - caddy
     labels:
-      # caddy: auth.marcpartensky.com
-      # caddy.reverse_proxy: "{{upstreams}}"
+      caddy: auth.marcpartensky.com
+      caddy.reverse_proxy: "{{upstreams}}"
       traefik.enable: "true"
       traefik.http.routers.ldap_manager.rule: Host(`auth.marcpartensky.com`)
-      traefik.http.routers.ldap_manager.entrypoints: web
-      # traefik.http.routers.ldap_manager.tls.certresolver: tls
+      traefik.http.routers.ldap_manager.entrypoints: websecure
+      traefik.http.routers.ldap_manager.tls.certresolver: tls
       traefik.http.services.ldap_manager.loadbalancer.server.port: 80
-    # deploy:
-    #   labels:
-    #     traefik.enable: "true"
-    #     # traefik.http.routers.ldap_manager.rule: >
-    #     #   Host(`auth.marcpartensky.com`) || Host(`auth.marcpartensky.fr`)
-    #     traefik.http.routers.ldap_manager.rule: >
-    #       Host(`auth.marcpartensky.com`)
-    #     traefik.http.routers.ldap_manager.entrypoints: web
-    #     # traefik.http.routers.ldap_manager.tls.certresolver: tls
-    #     # traefik.http.routers.ldap_manager.tls.certresolver: cloudflare
-    #     traefik.http.services.ldap_manager.loadbalancer.server.port: 80
 
 networks:
   ldap:

services/ldap.yml

@@ -2,13 +2,13 @@ version: "3.9"
 
 services:
   ldap:
-    image: docker.io/osixia/openldap:1.3.0
+    image: osixia/openldap
     restart: unless-stopped
     environment:
       LDAP_ORGANISATION: admin
       LDAP_DOMAIN: admin.org
       LDAP_RFC2307BIS_SCHEMA: "true"
-      LDAP_REMOVE_CONFIG_AFTER_SETUP: "false"
+      LDAP_REMOVE_CONFIG_AFTER_SETUP: "true"
       LDAP_TLS_VERIFY_CLIENT: never
     env_file:
       - ../data/secrets/ldap.env
@@ -20,13 +20,6 @@ services:
       - ldap:/var/lib/ldap
       - ldap_slapd:/etc/ldap/slapd.d
 
-
-  backup:
-    image: docker.io/osixia/openldap-backup:1.5.0
-    environment:
-      LDAP_BACKUP_CONFIG_CRON_EXP: "0 5 * * *"
-      LDAP_BACKUP_DATA_CRON_EXP: "0 5 * * *"
-
 volumes:
   ldap:
   ldap_slapd:

services/libreswan.yml

@@ -1,16 +0,0 @@
-version: "3.9"
-services:
-  libreswan:
-    image: ibotty/ipsec-libreswan
-    restart: unless-stopped
-    privileged: true
-    environment:
-      HOST: /host
-      IMAGE: ipsec-libreswan
-      NAME: libreswan
-    entrypoint: /bin/sh
-    command: /bin/install.sh
-    volumes:
-      - libreswan:/host
-volumes:
-  libreswan:

services/logseq.yml

@@ -1,29 +0,0 @@
-version: "3.9"
-services:
-  logseq:
-    image: ghcr.io/logseq/logseq-webapp:latest
-    # volumes:
-    networks:
-      - traefik
-      - postgres
-    labels:
-      traefik.enable: "true"
-      # traefik.http.routers.focalboard.rule: >
-      #   Host(`board.marcpartensky.com`) || Host(`board.marcpartensky.fr`)
-      traefik.http.routers.logseq.service: logseq
-      traefik.http.routers.logseq.rule: >
-        Host(`logseq.marcpartensky.com`)
-      traefik.http.routers.logseq.tls: true
-      traefik.http.routers.logseq.entrypoints: web-secure
-      traefik.http.routers.logseq.tls.certresolver: default
-      traefik.http.services.logseq.loadbalancer.server.port: 80
-      # traefik.http.routers.focalboard.middlewares: ldap_auth
-
-volumes:
-  data:
-  pack:
-networks:
-  postgres:
-    external: true
-  traefik:
-    external: true

services/mailu.yml

@@ -1,226 +0,0 @@
-# This file is auto-generated by the Mailu configuration wizard.
-# Please read the documentation before attempting any change.
-# Generated for compose flavor
-
-version: "3.9"
-
-services:
-
-  # External dependencies
-  # redis:
-  #   image: redis:alpine
-  #   restart: always
-  #   volumes:
-  #     - "/srv/mailu/redis:/data"
-  #   depends_on:
-  #     - resolver
-  #   dns:
-  #     - 192.168.203.254
-
-  # Core services
-  mailu:
-    image: ${DOCKER_ORG:-ghcr.io/mailu}/${DOCKER_PREFIX:-}nginx:${MAILU_VERSION:-2.0}
-    container_name: mailu
-    restart: unless-stopped
-    env_file: ../data/secrets/mailu.env
-    logging:
-      driver: journald
-      options:
-        tag: mailu-front
-    ports:
-      - "25:25"
-      - "465:465"
-      - "587:587"
-      - "110:110"
-      - "995:995"
-      - "143:143"
-      - "993:993"
-        # - "127.0.0.1:80:80"
-        # - "127.0.0.1:443:443"
-    # ports:
-    #   - "127.0.0.1:25:25"
-    #   - "127.0.0.1:465:465"
-    #   - "127.0.0.1:587:587"
-    #   - "127.0.0.1:110:110"
-    #   - "127.0.0.1:995:995"
-    #   - "127.0.0.1:143:143"
-    #   - "127.0.0.1:993:993"
-        # - "127.0.0.1:80:80"
-        # - "127.0.0.1:443:443"
-    networks:
-      - mailu
-      - radicale
-      - caddy
-    volumes:
-      - /srv/mailu/certs:/certs
-      - /srv/mailu/overrides/nginx:/overrides:ro
-    depends_on:
-      - resolver
-    dns:
-      - 192.168.203.254
-    # labels:
-    #   traefik.enable: "true"
-    #   traefik.http.routers.mailu.rule: >
-    #     Host(`mail.marcpartensky.com`)
-    #   traefik.http.routers.mailu.entrypoints: web
-    #   traefik.http.services.mailu.loadbalancer.server.port: 80
-
-  resolver:
-    image: ${DOCKER_ORG:-ghcr.io/mailu}/${DOCKER_PREFIX:-}unbound:${MAILU_VERSION:-2.0}
-    container_name: mailu-resolver
-    env_file: ../data/secrets/mailu.env
-    restart: unless-stopped
-    networks:
-      mailu:
-        ipv4_address: 192.168.203.254
-
-  admin:
-    image: ${DOCKER_ORG:-ghcr.io/mailu}/${DOCKER_PREFIX:-}admin:${MAILU_VERSION:-2.0}
-    container_name: mailu-admin
-    restart: unless-stopped
-    env_file: ../data/secrets/mailu.env
-    logging:
-      driver: journald
-      options:
-        tag: mailu-admin
-    volumes:
-      - /srv/mailu/data:/data
-      - /srv/mailu/dkim:/dkim
-    depends_on:
-      - resolver
-    dns:
-      - 192.168.203.254
-    networks:
-      - redis
-      - mailu
-      - postgres
-
-  imap:
-    image: ${DOCKER_ORG:-ghcr.io/mailu}/${DOCKER_PREFIX:-}dovecot:${MAILU_VERSION:-2.0}
-    container_name: mailu-imap
-    restart: unless-stopped
-    env_file: ../data/secrets/mailu.env
-    logging:
-      driver: journald
-      options:
-        tag: mailu-imap
-    volumes:
-      - /srv/mailu/mail:/mail
-      - /srv/mailu/overrides/dovecot:/overrides:ro
-    depends_on:
-      - mailu
-      - resolver
-    networks:
-      - mailu
-    dns:
-      - 192.168.203.254
-
-  smtp:
-    image: ${DOCKER_ORG:-ghcr.io/mailu}/${DOCKER_PREFIX:-}postfix:${MAILU_VERSION:-2.0}
-    container_name: mailu-smtp
-    restart: unless-stopped
-    env_file: ../data/secrets/mailu.env
-    logging:
-      driver: journald
-      options:
-        tag: mailu-smtp
-    volumes:
-      - /srv/mailu/mailqueue:/queue
-      - /srv/mailu/overrides/postfix:/overrides:ro
-    depends_on:
-      - mailu
-      - resolver
-    dns:
-      - 192.168.203.254
-    networks:
-      - mailu
-
-  oletools:
-    image: ${DOCKER_ORG:-ghcr.io/mailu}/${DOCKER_PREFIX:-}oletools:${MAILU_VERSION:-2.0}
-    container_name: mailu-oletools
-    hostname: oletools
-    restart: unless-stopped
-    networks:
-      - noinet
-      - mailu
-      - postgres
-    depends_on:
-      - resolver
-    dns:
-      - 192.168.203.254
-
-  antispam:
-    image: ${DOCKER_ORG:-ghcr.io/mailu}/${DOCKER_PREFIX:-}rspamd:${MAILU_VERSION:-2.0}
-    container_name: mailu-antispam
-    hostname: antispam
-    restart: unless-stopped
-    env_file: ../data/secrets/mailu.env
-    logging:
-      driver: journald
-      options:
-        tag: mailu-antispam
-    networks:
-      - mailu
-      - noinet
-      - redis
-      - postgres
-    volumes:
-      - /srv/mailu/filter:/var/lib/rspamd
-      - /srv/mailu/overrides/rspamd:/overrides:ro
-    depends_on:
-      - mailu
-      - oletools
-      - resolver
-    dns:
-      - 192.168.203.254
-
-  # Optional services
-
-  webdav:
-    image: ${DOCKER_ORG:-ghcr.io/mailu}/${DOCKER_PREFIX:-}radicale:${MAILU_VERSION:-2.0}
-    container_name: mailu-webdav
-    restart: unless-stopped
-    volumes:
-      - /srv/mailu/dav:/data
-    networks:
-      - radicale
-      - postgres
-
-  fetchmail:
-    image: ${DOCKER_ORG:-ghcr.io/mailu}/${DOCKER_PREFIX:-}fetchmail:${MAILU_VERSION:-2.0}
-    container_name: mailu-fetchmail
-    restart: unless-stopped
-    env_file: ../data/secrets/mailu.env
-    volumes:
-      - /srv/mailu/data/fetchmail:/data
-    depends_on:
-      - admin
-      - smtp
-      - imap
-      - resolver
-    dns:
-      - 192.168.203.254
-    networks:
-      - mailu
-
-  # Webmail
-
-networks:
-  mailu:
-    driver: bridge
-    ipam:
-      # driver: default
-      config:
-        - subnet: 192.168.203.0/24
-
-  caddy:
-    external: true
-  redis:
-    external: true
-  postgres:
-    external: true
-  radicale:
-    driver: bridge
-  noinet:
-    driver: bridge
-    internal: true

services/matrix.yml

@@ -4,130 +4,24 @@ services:
   matrix:
     image: matrixdotorg/synapse
     restart: unless-stopped
-    user: "1337:1337"
     # environment:
     #   SYNAPSE_REPORT_STATS: "no"
     #   SYNAPSE_SERVER_NAME: matrix.marcpartensky.com
     #   SYNAPSE_ENABLE_REGISTRATION: "true"
-    environment:
-      SYNAPSE_CONFIG_PATH: /data/homeserver.yml
     volumes:
       - ../data/matrix:/data
       # - matrix:/data
     networks:
-      - caddy
-      - postgres
-    healthcheck:
-      test: ["CMD", "curl", "-fSs", "http://localhost:8008/health"]
-      interval: 15s
-      timeout: 5s
-      retries: 3
-      start_period: 5s
+        - caddy
     labels:
+      caddy: matrix.marcpartensky.com
+      caddy.reverse_proxy: "{{upstreams 8008}}"
       traefik.enable: "true"
       traefik.http.routers.matrix.rule: Host(`matrix.marcpartensky.com`)
-      traefik.http.routers.matrix.entrypoints: web
-      # traefik.http.routers.matrix.tls.certresolver: tls
-      # traefik.http.services.matrix.loadbalancer.server.port: 8008
-      # traefik.http.routers.to-matrix-wellknown.rule: Host(`marcpartensky.com`) && PathPrefix(`/.well-known/matrix`)"
-      # traefik.http.routers.to-matrix-wellknown.tls: true"
-      # traefik.http.routers.to-matrix-wellknown.tls.certresolver: letsencrypt"
-      # traefik.http.routers.to-matrix-wellknown.middlewares: cors-headers@docker"
-
-  # https://community.traefik.io/t/setting-up-conduit-matrix-server-with-traefik/19394
-  well-known:
-    image: nginx:latest
-    restart: unless-stopped
-    volumes:
-      - ../data/dendrite/well-known/conf:/etc/nginx/conf.d # the config to serve the .well-known/matrix files
-      - ../data/dendrite/well-known/www:/var/www/ # location of the client and server .well-known-files
-    networks:
-      - caddy
-    labels:
-      traefik.enable: "true"
-      traefik.http.services.well-known.loadbalancer.server.port: 80
-      traefik.http.routers.well-known.rule: (Host(`marcpartensky.com`) && PathPrefix(`/.well-known`)) || (Host(`marcpartensky.com`) && PathPrefix(`/.well-known`))
-      traefik.http.routers.well-known.entrypoints: web
-      # traefik.http.routers.well-known.rule: Host(`marcpartensky.com`) && PathPrefix(`/.well-known/matrix`)"
-      # traefik.http.routers.to-matrix-wellknown.tls: true"
-      # traefik.http.routers.to-matrix-wellknown.tls.certresolver: letsencrypt"
-
-  whatsapp:
-    container_name: whatsapp
-    image: dock.mau.dev/mautrix/whatsapp
-    restart: unless-stopped
-    # user: "1337:1337"
-    networks:
-      - postgres
-    volumes:
-      - ../data/matrix/whatsapp:/data
-  meta: # instagram
-    container_name: meta
-    image: dock.mau.dev/mautrix/meta
-    restart: unless-stopped
-    networks:
-      - postgres
-    volumes:
-      - ../data/matrix/meta:/data
-  # facebook: # messenger
-  #   container_name: facebook
-  #   image: dock.mau.dev/mautrix/facebook
-  #   restart: unless-stopped
-  #   networks:
-  #     - postgres
-  #   volumes:
-  #     - ../data/matrix/facebook:/data
-  signal:
-    container_name: signal
-    image: dock.mau.dev/mautrix/signal
-    restart: unless-stopped
-    networks:
-      - postgres
-    volumes:
-      - ../data/matrix/signal:/data
-  discord:
-    container_name: discord
-    image: dock.mau.dev/mautrix/discord
-    restart: unless-stopped
-    networks:
-      - postgres
-    volumes:
-      - ../data/matrix/discord:/data
-  slack:
-    container_name: slack
-    image: dock.mau.dev/mautrix/slack
-    restart: unless-stopped
-    networks:
-      - postgres
-    volumes:
-      - ../data/matrix/slack:/data
-  twitter:
-    container_name: twitter
-    image: dock.mau.dev/mautrix/twitter
-    restart: unless-stopped
-    networks:
-      - postgres
-    volumes:
-      - ../data/matrix/twitter:/data
-  gmessages:
-    container_name: gmessages
-    image: dock.mau.dev/mautrix/gmessages
-    restart: unless-stopped
-    networks:
-      - postgres
-    volumes:
-      - ../data/matrix/gmessages:/data
-  messenger:
-    container_name: messenger
-    image: dock.mau.dev/mautrix/meta
-    restart: unless-stopped
-    networks:
-      - postgres
-    volumes:
-      - ../data/matrix/messenger:/data
+      traefik.http.routers.matrix.entrypoints: websecure
+      traefik.http.routers.matrix.tls.certresolver: tls
+      traefik.http.services.matrix.loadbalancer.server.port: 8008
 
 networks:
   caddy:
     external: true
-  postgres:
-    external: true

services/mc-backup.yml

@@ -1,7 +1,7 @@
 version: "3.9"
 
 services:
-  backup:
+  backups:
     image: itzg/mc-backup
     environment:
       BACKUP_INTERVAL: "1d"
@@ -9,7 +9,7 @@ services:
       SERVE_PORT: 25565
       RCON_HOST: minecraft
       RCON_PORT: 25575
-      PAUSE_IF_NO_PLAYER: "true"
+      PAUSE_IF_NO_PLAYER: true
       PLAYERS_ONLINE_CHECK_INTERVAL: 1h
       TZ: Europe/Paris
       DEST_DIR: /backups
@@ -18,6 +18,6 @@ services:
     - /srv/minecraft/champi:/data:ro
     # use a host attached directory so that it in turn can be backed up
     # to external/cloud storage
-    - /srv/mcbackups:/backups
+    - ./mc-backups:/backups
     # share network namespace with server to simplify rcon access
     # network_mode: "service:mc"

services/mcmyadmin.yml

@@ -3,7 +3,6 @@ version: "3.9"
 services:
   mcmyadmin:
     image: tekgator/docker-mcmyadmin:latest
-    container_name: mcmyadmin
     restart: unless-stopped
       # environment:
       #   PUID: 1001
@@ -16,23 +15,15 @@ services:
     networks:
       - minecraft
       - caddy
-    # labels:
-    #   caddy: mcadmin.marcpartensky.com
-    #   caddy.reverse_proxy: "{{upstreams 8080}}"
-    #   authorize.with: marc
-    #   traefik.enable: "true"
-    #   traefik.http.routers.mcmyadmin.rule: Host(`mcmyadmin.marcpartensky.com`)
-    #   traefik.http.routers.mcmyadmin.entrypoints: websecure
-    #   traefik.http.routers.mcmyadmin.tls.certresolver: tls
-    #   traefik.http.services.mcmyadmin.loadbalancer.server.port: 8080
-    # deploy:
-    #   labels:
-    #     traefik.enable: "true"
-    #     # traefik.http.routers.mcmyadmin.rule: Host(`mcmyadmin.marcpartensky.com`)
-    #     traefik.http.routers.mcmyadmin.rule: Host(`mcmyadmin.marcpartensky.fr`)
-    #     traefik.http.routers.mcmyadmin.entrypoints: websecure
-    #     traefik.http.routers.mcmyadmin.tls.certresolver: tls
-    #     traefik.http.services.mcmyadmin.loadbalancer.server.port: 8080
+    labels:
+      caddy: mcadmin.marcpartensky.com
+      caddy.reverse_proxy: "{{upstreams 8080}}"
+      authorize.with: marc
+      traefik.enable: "true"
+      traefik.http.routers.minecraft.rule: Host(`mcadmin.marcpartensky.com`)
+      traefik.http.routers.minecraft.entrypoints: websecure
+      traefik.http.routers.minecraft.tls.certresolver: tls
+      traefik.http.services.minecraft.loadbalancer.server.port: 8080
 
 volumes:
   mcmyadmin:

services/mermaid.yml

@@ -1,17 +0,0 @@
-version: "3.9"
-
-services:
-  mermaid:
-    image: supinf/mermaid-editor
-    networks:
-      - caddy
-    labels:
-      traefik.enable: "true"
-      traefik.http.routers.mermaid.rule: >
-        Host(`mermaid.marcpartensky.com`)
-      traefik.http.routers.mermaid.entrypoints: web
-      traefik.http.services.mermaid.loadbalancer.server.port: 80
-
-networks:
-  caddy:
-    external: true

services/minecraft_champi.yml

@@ -1,7 +1,7 @@
 version: "3.9"
 
 services:
-  server:
+  minecraft_champi:
     image: itzg/minecraft-server
     restart: unless-stopped
     environment:
@@ -29,29 +29,6 @@ services:
     networks:
       - minecraft
 
-  backup:
-    image: itzg/mc-backup
-    environment:
-      BACKUP_INTERVAL: "1d"
-      # instead of network_mode below, could declare RCON_HOST
-      SERVE_PORT: 25565
-      RCON_HOST: server
-      RCON_PORT: 25575
-      PAUSE_IF_NO_PLAYER: "true"
-      PLAYERS_ONLINE_CHECK_INTERVAL: 1h
-      TZ: Europe/Paris
-      DEST_DIR: /backups
-    networks:
-      - minecraft
-    volumes:
-    # mount the same volume used by server, but read-only
-    - /srv/minecraft/champi:/data:ro
-    # use a host attached directory so that it in turn can be backed up
-    # to external/cloud storage
-    - /srv/mcbackups:/backups
-    # share network namespace with server to simplify rcon access
-    # network_mode: "service:mc"
-
 # volumes:
 #   minecraft:
 

services/minidlna.yml

@@ -1,33 +0,0 @@
-version: "3.9"
-services:
-  minidlna:
-    image: geekduck/minidlna
-    volumes:
-      - music:/opt/Music
-      - videos:/opt/Videos
-      - pictures:/opt/Pictures
-      - db:/var/cache/minidlna
-      # - ../data/minidlna/minidlna.conf:/etc/minidlna.conf
-    networks:
-      - caddy
-    deploy:
-      labels:
-        traefik.enable: "true"
-        traefik.http.services.minidlna.loadbalancer.server.port: 8200
-        traefik.http.routers.minidlna.rule: Host(`minidlna.marcpartensky.fr`)
-        # traefik.http.routers.minidlna.rule: >
-        #   Host(`minidlna.marcpartensky.com`) || Host(`minidlna.marcpartensky.fr`)
-        traefik.http.routers.minidlna.entrypoints: websecure
-        # traefik.http.routers.minidlna.tls.certresolver: tls
-        traefik.http.routers.minidlna.tls.certresolver: cloudflare
-        # traefik.http.routers.minidlna.middlewares: ldap_auth
-
-volumes:
-  music:
-  videos:
-  pictures:
-  db:
-
-networks:
-  caddy:
-    external: true

services/minio.yml

@@ -1,28 +0,0 @@
-version: "3.9"
-services:
-  minio:
-    image: docker.io/minio/minio
-    restart: unless-stopped
-    networks:
-      - caddy
-      - ldap
-    volumes:
-      - /srv/minio:/data
-    env_file:
-      - ../data/secrets/minio.env
-    command: server /data --console-address ":9001"
-    healthcheck:
-      test: ["CMD", "mc", "ready", "local"]
-      interval: 30s
-      timeout: 20s
-      retries: 3
-    labels:
-      traefik.enable: true
-      traefik.http.routers.minio.rule: Host(`storage.marcpartensky.com`)
-      traefik.http.routers.minio.entrypoints: web
-      traefik.http.services.minio.loadbalancer.server.port: 9001
-networks:
-  ldap:
-    external: true
-  caddy:
-    external: true

services/mistral.yml

@@ -1,29 +0,0 @@
-version: "3.9"
-services:
-  mistral:
-    image: ghcr.io/mistralai/mistral-src/vllm:latest
-    networks:
-      - caddy
-    environment:
-      HF_TOKEN: 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
-        # runtime: rocm
-    command: >
-      --host 0.0.0.0
-      --model mistralai/Mistral-7B-Instruct-v0.2
-    labels:
-      traefik.enable: "true"
-      traefik.http.routers.mistgral.rule: >
-        Host(`mistral.marcpartensky.com`)
-      traefik.http.routers.mistgral.entrypoints: web
-      # traefik.http.routers.mistgral.tls.certresolver: tls
-      traefik.http.services.mistgral.loadbalancer.server.port: 8000
-      # traefik.http.routers.mistgral.middlewares: ldap_auth
-
-volumes:
-  data:
-  pack:
-networks:
-  postgres:
-    external: true
-  caddy:
-    external: true

services/mobydock.yml

@@ -1,45 +0,0 @@
-version: "3.9"
-
-services:
-  master:
-    image: efaviere/mobydock-master:lastest
-    # image: marcpartensky/mobidock-master:latest
-    # depends_on:
-    #   - db
-    env_file:
-      - ../data/secrets/mobydock.env
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-    networks:
-      - caddy
-      - postgres
-    deploy:
-      labels:
-        traefik.enable: "true"
-        traefik.http.services.svc_mobydock.loadbalancer.server.port: 8080
-        traefik.http.routers.mobydock.service: svc_mobydock
-        traefik.http.routers.mobydock.rule: >
-          Host(`mobydock.marcpartensky.com`) || Host(`mobydock.marcpartensky.fr`)
-        traefik.http.routers.mobydock.entrypoints: websecure
-        # traefik.http.routers.dockerdash.middlewares: ldap_auth
-        
-        traefik.http.services.svc_mobydockwss.loadbalancer.server.port: 8000
-        traefik.http.routers.mobydockwss.service: svc_mobydockwss
-        traefik.http.routers.mobydockwss.rule: >
-          Host(`wss.mobydock.marcpartensky.com`) || Host(`wss.mobydock.marcpartensky.fr`)
-        traefik.http.routers.mobydockwss.entrypoints: websecure
-
-  worker:
-    image: efaviere/mobidock-worker:latest
-    environment:
-      # MASTER_HOST: "https://mobydock.marcpartensky.com:8000"
-      MASTER_HOST: "https://wss.mobydock.marcpartensky.com"
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-
-networks:
-  discord:
-  postgres:
-    external: true
-  caddy:
-    external: true

services/monero-miner.yml

@@ -1,7 +1,7 @@
 version: "3.9"
 
 services:
-  miner:
+  monero_miner:
     image: giansalex/monero-miner
     restart: unless-stopped
     env_file:
@@ -11,14 +11,3 @@ services:
     #   -u $WALLET \
     #   -k  \
     #   --cpu-priority=2
-    deploy:
-      resources:
-        # reservations:
-        #     cpus: "2"
-        #     # memory: "512M"
-        #     memory: "5G"
-        limits:
-            cpus: "4"
-            # memory: "512M"
-            memory: "5G"
-

services/money.yml

@@ -1,33 +0,0 @@
-version: "3.9"
-services:
-  honeygain:
-    image: marcpartensky/honeygain
-    env_file:
-      - ../data/secrets/honeygain.env
-
-  repocket:
-    image: repocket/repocket
-    env_file:
-      - ../data/secrets/repocket.env
-
-  traffmonetizer:
-    image: marcpartensky/traffmonetizer
-    env_file:
-      - ../data/secrets/traffmonetizer.env
-
-  packetstream:
-    image: packetstream/psclient:latest
-    environment:
-      CID: 4bYb
-
-  peer2profit:
-    image: peer2profit/peer2profit_x86_64:latest
-    environment:
-      P2P_EMAIL: marc@marcpartensky.com
-
-# earnapp:
-#   image: fazalfarhan01/earnapp:lite
-#   volumes:
-#     - earnapp:/etc/earnapp
-#   environment:
-#     EARNAPP_UUID: $EARNAPP_DEVICE_ID

services/mongo.yml

@@ -5,9 +5,7 @@ services:
     image: mongo
     restart: unless-stopped
     volumes:
-      - ../data/mongo/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d
-      - ../data/mongo/config:/etc/mongo
-      - /srv/mongo:/data/db
+      - mongo:/data/db
     networks:
       - mongo
     ports:
@@ -17,9 +15,8 @@ services:
     # healthcheck:
     #   test: CMD echo 'db.runCommand("ping").ok' | mongo localhost:27017/test --quiet
 
-  express:
+  mongo_express:
     image: mongo-express
-    container_name: mongo-express
     restart: unless-stopped
     environment:
       ME_CONFIG_OPTIONS_EDITORTHEME: "ambiance"
@@ -35,29 +32,15 @@ services:
       caddy.reverse_proxy: "{{upstreams 8081}}"
       traefik.enable: "true"
       traefik.http.routers.mongo.rule: Host(`mongo.marcpartensky.com`)
-        # traefik.http.routers.mongo.entrypoints: websecure
-      traefik.http.routers.mongo.entrypoints: web
-        # traefik.http.routers.mongo.tls.certresolver: tls
+      traefik.http.routers.mongo.entrypoints: websecure
+      traefik.http.routers.mongo.tls.certresolver: tls
       traefik.http.services.mongo.loadbalancer.server.port: 8081
-       # traefik.http.routers.duplicati.middlewares: ldap_auth
-    # deploy:
-    #   labels:
-    #     traefik.enable: "true"
-    #     # traefik.http.routers.mongo.rule: Host(`mongo.marcpartensky.com`)
-    #     traefik.http.routers.mongo.rule: >
-    #       Host(`mongo.marcpartensky.fr`) ||
-    #       Host(`mongo.marcpartensky.com`)
-    #     traefik.http.routers.mongo.entrypoints: websecure
-    #     traefik.http.routers.mongo.tls.certresolver: tls
-    #     traefik.http.services.mongo.loadbalancer.server.port: 8081
-    #     traefik.http.routers.mongo.middlewares: ldap_auth
 
 volumes:
   mongo:
 
 networks:
   mongo:
-    external: true
   caddy:
     external: true
     attachable: true