moved services to main compose file

mixed/compose.yml

@@ -32,6 +32,82 @@ services:
     volumes:
       - ${DOCKER_CONFIGS}/archivebox/data:/data
 
+  freshrss:
+    container_name: freshrss
+    image: freshrss/freshrss:latest
+    environment:
+      - PUID=${PUID}
+      - PGID=${PGID}
+      - CRON_MIN=*/20
+      - TZ=${TZ}
+    depends_on:
+      - freshrss-db
+    networks:
+      - freshrss
+      - reverse-proxy
+    ports:
+      - 8088:80
+    restart: unless-stopped
+    volumes:
+      - ${DOCKER_CONFIGS}/freshrss/data:/var/www/FreshRSS/data
+      - ${DOCKER_CONFIGS}/freshrss/extensions:/var/www/FreshRSS/extensions
+      - /etc/localtime:/etc/localtime:ro
+
+  freshrss-db:
+    container_name: freshrss-db
+    image: postgres:12-alpine
+    environment:
+      - PUID=${PUID}
+      - PGID=${PGID}
+      - POSTGRES_USER=freshrss
+      - POSTGRES_PASSWORD=freshrss
+      - POSTGRES_DB=freshrss
+    networks:
+      - freshrss
+    restart: unless-stopped
+    volumes:
+      - ${DOCKER_CONFIGS}/freshrss/db/data:/var/lib/postgresql/data
+      - /etc/localtime:/etc/localtime:ro
+
+  hbbr:
+    container_name: hbbr
+    image: rustdesk/rustdesk-server:latest
+    command: hbbr -k _
+    networks:
+      - reverse-proxy
+    ports:
+      - 21117:21117
+      - 21119:21119
+    restart: always
+    volumes:
+      - ${DOCKER_CONFIGS}/rustdesk/hbbr:/root
+
+  hbbs:
+    container_name: hbbs
+    image: rustdesk/rustdesk-server:latest
+    command: hbbs -r rustdesk.akanealw.com:21117 -k _
+    depends_on:
+      - hbbr
+    networks:
+      - reverse-proxy
+    ports:
+      - 21115:21115
+      - 21116:21116
+      - 21116:21116/udp
+      - 21118:21118
+    restart: always
+    volumes:
+      - ${DOCKER_CONFIGS}/rustdesk/hbbs:/root
+
+  it-tools:
+    container_name: it-tools
+    image: corentinth/it-tools:latest
+    networks:
+      - reverse-proxy
+    ports:
+      - 8383:80
+    restart: always
+
   jellyseerr:
     container_name: jellyseerr
     image: fallenbagel/jellyseerr:latest
@@ -109,6 +185,26 @@ services:
       - ${DOCKER_CONFIGS}/mstream:/config
       - ${STORAGE_DIR}/Music:/music
 
+  navidrome:
+    container_name: navidrome
+    image: deluan/navidrome:latest
+    environment:
+      ND_SCANSCHEDULE: 1h
+      ND_LOGLEVEL: info
+      ND_SESSIONTIMEOUT: 24h
+      ND_BASEURL: ""
+      LastFM.ApiKey: "788adda1a4ce53bdedcc0d48016fddd2"
+      LastFM.Secret: "b1579a1932372da6043cd479b925d2db"
+    user: 1000:1000
+    networks:
+      - reverse-proxy
+    ports:
+      - 4533:4533
+    restart: always
+    volumes:
+      - ${DOCKER_CONFIGS}/navidrome/data:/data
+      - ${STORAGE_DIR}/Music/Albums:/music:ro
+
   opengist:
     container_name: opengist
     image: ghcr.io/thomiceli/opengist:1
@@ -215,6 +311,22 @@ services:
       - ${DOCKER_CONFIGS}/syncthing/config:/config
       - ${STORAGE_DIR}:/storage
 
+  syncthing-relay-discovery:
+    container_name: syncthing-relay-discovery
+    image: t4skforce/syncthing-relay-discovery:latest
+    environment:
+      RELAY_OPTS:
+      DISC_OPTS: 
+      POOLS:
+    networks:
+      - reverse-proxy
+    ports:
+      - 22067:22067
+      - 22026:22026
+    restart: always
+    volumes:
+      - ${DOCKER_CONFIGS}/syncthing-relay-discovery:/home/syncthing/certs
+
   vaultwarden:
     container_name: vaultwarden
     image: vaultwarden/server:latest
@@ -288,6 +400,8 @@ services:
       - ${DOCKER_CONFIGS}/wireguard:/etc/wireguard
 
 networks:
+  freshrss:
+    name: freshrss
   vaultwarden:
     name: vaultwarden
   reverse-proxy: