From eae7059d4d90a19fa95618dd5e74fa5c769899bf Mon Sep 17 00:00:00 2001
From: staffadmin <stephane.gratiasquiquandon@gmail.com>
Date: Sat, 11 Nov 2023 17:33:09 +0100
Subject: [PATCH] POUSH

---
 host_vars/scaleway_fr.yml | 94 ++++++++++++++++++++++++++++++++++++---
 1 file changed, 87 insertions(+), 7 deletions(-)

diff --git a/host_vars/scaleway_fr.yml b/host_vars/scaleway_fr.yml
index db53a1d..17da2cc 100644
--- a/host_vars/scaleway_fr.yml
+++ b/host_vars/scaleway_fr.yml
@@ -199,15 +199,95 @@ chisel_proxychains_conf:
     state: present
     line: "socks5 {{ chisel_server_host }} 1080"
 
+
+
+
+##################
+# DOCKER-COMPOSE #
+##################
+
 dockerapp_tree_volumes:
   - "gitlab"
-
-# boostrap dockerapp:
 dockerapp_tree_base_dir:
-  - "/opt/test"
-dockerapp_service: lab
-docker_install_compose: true 
-
+  - "/opt/"
+dockerapp_service: dockerapps
+docker_install_compose: false 
 pip_executable: pip3
 pip_install_packages: 
-  - docker-compose
\ No newline at end of file
+  - docker-compose
+
+dockerapp_compose:
+  version: "3.9"
+  ######### IMPORTANT #############
+  # This is my main docker-compose file with most of the apps. I run docker on other systems with smaller stacks (web and synology).
+  # You can copy-paste services from one docker-compose file in this repo to another to add other apps.
+
+  # 90+ Open source docker stacks
+  #https://github.com/ethibox/awesome-stacks
+
+  #FROM 
+  #https://github.com/htpcBeginner/docker-traefik/blob/master/docker-compose-t2.yml
+
+  ########################### SYSTEM DESCRIPTION
+  # DOCKER-COMPOSE FOR HOME/MEDIA SERVER
+  # PROXMOX HOST: Dual Intel Xeon 5420, 16 GB RAM, 240 GB SSD, and 2 TB HDD
+  # VM: 6 CORES, 12 GB RAM, Ubuntu 20.04, and Docker
+  # 32 GB for /, 64 GB for /var/lib/docker and transcoding, and 1.5 TB for non-critical data and rclone cache.
+  # Google Drive mounted using Rclone Docker for media and Proxmox backups
+
+  ########################### NETWORKS
+  # There is no need to create any networks outside this docker-compose file.
+  # You may customize the network subnets (192.168.90.0/24 and 91.0/24) below as you please.
+  # Docker Compose version 3.5 or higher required to define networks this way.
+  networks:
+    t2_proxy:
+      name: t2_proxy
+      driver: bridge
+      ipam:
+        config:
+          - subnet: 192.168.90.0/24
+    default:
+      driver: bridge
+    socket_proxy:
+      name: socket_proxy
+      driver: bridge
+      ipam:
+        config:
+          - subnet: 192.168.91.0/24
+  ########################### EXTENSION FIELDS
+  # Helps eliminate repetition of sections
+  # More Info on how to use this: https://github.com/htpcBeginner/docker-traefik/pull/228
+
+  # Common environment values
+  x-environment: &default-tz-puid-pgid
+    TZ: Europe/Paris
+    PUID: 1000
+    PGID: 1000
+
+  # Proxy Network and Security
+  x-network-and-security: &network-and-security
+    networks:
+      - t2_proxy
+    security_opt:
+      - no-new-privileges:true
+
+  # Keys common to some of the services in basic-services.txt
+  x-common-keys-core: &common-keys-core
+    <<: *network-and-security
+    restart: always
+    # profiles:
+    # - basic
+
+  # Keys common to some of the dependent services/apps
+  x-common-keys-apps: &common-keys-apps
+    <<: *network-and-security
+    restart: unless-stopped
+    # profiles:
+    # - apps
+
+  # Keys common to some of the services in media-services.txt
+  x-common-keys-media: &common-keys-media
+    <<: *network-and-security
+    restart: "no"
+    # profiles:
+    # - media
\ No newline at end of file