Add GPG import public key

flake.nix

@@ -11,6 +11,14 @@
       let
         pkgs = import nixpkgs { inherit system; };
 
+        import_pub_gpg = pkgs.writeScriptBin "import_pub_gpg" ''
+          #!${pkgs.runtimeShell}
+          
+          echo "Importing public key"
+          gpg --import <(curl https://gitea.mrdev023.fr/florian.richer.gpg)
+        '';
+
+
         init_sops = pkgs.writeScriptBin "init_sops" ''
           #!${pkgs.runtimeShell}
           
@@ -37,6 +45,7 @@
             buildInputs = [
               pkgs.ansible
               pkgs.sops
+              import_pub_gpg
               init_sops
               clean_sops
             ];

roles/borg/tasks/base.yml

@@ -8,5 +8,5 @@
     owner: root
     mode: u=rwx,g=rx,o=rx
   loop:
-    - { src: 'backup.j2', dest: 'backup' }
+    - { src: 'backup', dest: 'backup' }
   become: true

roles/clean/tasks/docker.yml

@@ -5,6 +5,6 @@
     containers: true
     images: true
     networks: true
-    volumes: true
+    # volumes: true
     builder_cache: true
   become: yes

roles/cloud/tasks/base.yml

@@ -23,13 +23,12 @@
     src: "{{ item.src }}"
     dest: "cloud/{{ item.dest }}"
   loop:
-    - { src: 'docker-compose.yml.j2', dest: 'docker-compose.yml' }
+    - { src: 'docker-compose.yml', dest: 'docker-compose.yml' }
-  register: cloud_copy_templates_results
 
 - name: Update and restart container
-  community.docker.docker_compose:
+  community.docker.docker_compose_v2:
     project_src: cloud
     state: present
-    pull: true
+    pull: always
-    restarted: "{{ cloud_copy_files_results.changed or cloud_copy_templates_results.changed }}"
+    recreate: "{{ 'always' if cloud_copy_files_results.changed else 'auto' }}"
   become: true

roles/cloud/templates/docker-compose.yml

@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   db:
     image: postgres:14

roles/dolibarr/tasks/base.yml

@@ -11,8 +11,7 @@
     src: "{{ item.src }}"
     dest: "dolibarr/{{ item.dest }}"
   loop:
-    - { src: 'docker-compose.yml.j2', dest: 'docker-compose.yml' }
+    - { src: 'docker-compose.yml', dest: 'docker-compose.yml' }
-  register: dolibarr_copy_templates_results
 
 - name: Prepare volume folder
   ansible.builtin.file:
@@ -25,9 +24,8 @@
   become: true
 
 - name: Update and restart container
-  community.docker.docker_compose:
+  community.docker.docker_compose_v2:
     project_src: dolibarr
     state: present
-    pull: true
+    pull: always
-    restarted: "{{ dolibarr_copy_templates_results.changed }}"
   become: true

roles/dolibarr/templates/docker-compose.yml

@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   mariadb:
     image: mariadb:latest

roles/gitea/tasks/base.yml

@@ -12,12 +12,10 @@
   loop:
     - { src: 'docker-compose.yml', dest: 'docker-compose.yml' }
     - { src: 'config.yml', dest: 'config.yml' }
-  register: gitea_copy_templates_results
 
 - name: Update and restart container
-  community.docker.docker_compose:
+  community.docker.docker_compose_v2:
     project_src: gitea
     state: present
-    pull: true
+    pull: always
-    restarted: "{{ gitea_copy_templates_results.changed }}"
   become: true

roles/gitea/templates/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   gitea:
     image: gitea/gitea:latest

roles/home_assistant/tasks/base.yml

@@ -10,13 +10,11 @@
     src: "{{ item.src }}"
     dest: "home_assistant/{{ item.dest }}"
   loop:
-    - { src: 'docker-compose.yml.j2', dest: 'docker-compose.yml' }
+    - { src: 'docker-compose.yml', dest: 'docker-compose.yml' }
-  register: home_assistant_copy_templates_results
 
 - name: Update and restart container
-  community.docker.docker_compose:
+  community.docker.docker_compose_v2:
     project_src: home_assistant
     state: present
-    pull: true
+    pull: always
-    restarted: "{{ home_assistant_copy_templates_results.changed }}"
   become: true

roles/home_assistant/templates/docker-compose.yml

@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   home_assistant:
     image: homeassistant/home-assistant

roles/iptables/tasks/base.yml

@@ -7,7 +7,7 @@
     group: root
     mode: u=rwx,g=rx,o=rx
   loop:
-    - { src: 'firewall.j2', dest: '/usr/bin/firewall' }
+    - { src: 'firewall', dest: '/usr/bin/firewall' }
   register: iptables_templates_results
   become: yes
 

roles/matrix/tasks/base.yml

@@ -16,13 +16,12 @@
     src: "{{ item.src }}"
     dest: "matrix/{{ item.dest }}"
   loop:
-    - { src: 'docker-compose.yml.j2', dest: 'docker-compose.yml' }
+    - { src: 'docker-compose.yml', dest: 'docker-compose.yml' }
-  register: matrix_copy_templates_results
 
 - name: Update and restart container
-  community.docker.docker_compose:
+  community.docker.docker_compose_v2:
     project_src: matrix
     state: present
-    pull: true
+    pull: always
-    restarted: "{{ matrix_copy_files_results.changed or matrix_copy_templates_results.changed }}"
+    recreate: "{{ 'always' if matrix_copy_files_results.changed else 'auto' }}"
   become: true

roles/matrix/templates/docker-compose.yml

@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   postgres:
     image: postgres:15

roles/metrics/tasks/base.yml

@@ -11,12 +11,10 @@
     dest: "metrics/{{ item.dest }}"
   loop:
     - { src: 'docker-compose.yml', dest: 'docker-compose.yml' }
-  register: metrics_copy_templates_results
 
 - name: Update and restart container
-  community.docker.docker_compose:
+  community.docker.docker_compose_v2:
     project_src: metrics
     state: present
-    pull: true
+    pull: always
-    restarted: "{{ metrics_copy_templates_results.changed }}"
   become: true

roles/metrics/templates/docker-compose.yml

@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   prometheus:
     image: prom/prometheus:latest

roles/n8n/tasks/base.yml

@@ -10,13 +10,11 @@
     src: "{{ item.src }}"
     dest: "n8n/{{ item.dest }}"
   loop:
-    - { src: 'docker-compose.yml.j2', dest: 'docker-compose.yml' }
+    - { src: 'docker-compose.yml', dest: 'docker-compose.yml' }
-  register: n8n_copy_templates_results
 
 - name: Update and restart container
-  community.docker.docker_compose:
+  community.docker.docker_compose_v2:
     project_src: n8n
     state: present
-    pull: true
+    pull: always
-    restarted: "{{ n8n_copy_templates_results.changed }}"
   become: true

roles/n8n/templates/docker-compose.yml

@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   db:
     image: postgres:14

roles/portfolio/tasks/base.yml

@@ -11,12 +11,10 @@
     dest: "portfolio/{{ item.dest }}"
   loop:
     - { src: 'docker-compose.yml', dest: 'docker-compose.yml' }
-  register: portfolio_copy_templates_results
 
 - name: Update and restart container
-  community.docker.docker_compose:
+  community.docker.docker_compose_v2:
     project_src: portfolio
     state: present
-    pull: true
+    pull: always
-    restarted: "{{ portfolio_copy_templates_results.changed }}"
   become: true

roles/portfolio/templates/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   portfolio:
     image: gitea.mrdev023.fr/florian.richer/portfolio:latest

roles/protonmail/tasks/base.yml

@@ -16,8 +16,7 @@
     src: "{{ item.src }}"
     dest: "protonmail/{{ item.dest }}"
   loop:
-    - { src: 'docker-compose.yml.j2', dest: 'docker-compose.yml' }
+    - { src: 'docker-compose.yml', dest: 'docker-compose.yml' }
-  register: protonmail_copy_templates_results
 
 - name: Create protonmail network
   community.docker.docker_network:
@@ -31,9 +30,9 @@
   when: not protonmail.initialized
 
 - name: Update and restart container
-  community.docker.docker_compose:
+  community.docker.docker_compose_v2:
     project_src: protonmail
     state: present
-    pull: true
+    pull: always
-    restarted: "{{ protonmail.initialized and (protonmail_copy_templates_results.changed or protonmail_copy_files_results.changed) }}"
+    recreate: "{{ 'always' if protonmail.initialized and protonmail_copy_files_results.changed else 'auto' }}"
   become: true

roles/protonmail/templates/docker-compose.yml

@@ -1,5 +1,3 @@
-version: '3'
-
 services: 
   protonmail-bridge:
     image: shenxn/protonmail-bridge

roles/ryot/tasks/base.yml

@@ -10,13 +10,11 @@
     src: "{{ item.src }}"
     dest: "ryot/{{ item.dest }}"
   loop:
-    - { src: 'docker-compose.yml.j2', dest: 'docker-compose.yml' }
+    - { src: 'docker-compose.yml', dest: 'docker-compose.yml' }
-  register: ryot_copy_templates_results
 
 - name: Update and restart container
-  community.docker.docker_compose:
+  community.docker.docker_compose_v2:
     project_src: ryot
     state: present
-    pull: true
+    pull: always
-    restarted: "{{ ryot_copy_templates_results.changed }}"
   become: true

roles/ryot/templates/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3.9"
-
 services:
   postgres:
     image: postgres:16-alpine

roles/ssh/tasks/base.yml

@@ -7,7 +7,7 @@
     group: root
     mode: u=rwx,g=rx,o=rx
   loop:
-    - { src: 'port.conf.j2', dest: '/etc/ssh/sshd_config.d/99-port.conf' }
+    - { src: 'port.conf', dest: '/etc/ssh/sshd_config.d/99-port.conf' }
   register: iptables_templates_results
   become: yes
 

roles/traefik/tasks/base.yml

@@ -12,7 +12,6 @@
   loop:
     - { src: 'docker-compose.yml', dest: 'docker-compose.yml' }
     - { src: 'config/traefik.yml', dest: 'config/traefik.yml' }
-  register: traefik_copy_templates_results
 
 # Avoid restart docker if dynamic_conf updated
 - name: Copy dynamic_conf conf
@@ -20,10 +19,9 @@
     src: "config/dynamic_conf.yml"
     dest: "traefik/config/dynamic_conf.yml"
 
-- name: Update and restart container
+# - name: Update and restart container
-  community.docker.docker_compose:
+#   community.docker.docker_compose_v2:
-    project_src: traefik
+#     project_src: traefik
-    state: present
+#     state: present
-    pull: true
+#     pull: always
-    restarted: "{{ traefik_copy_templates_results.changed }}"
+#   become: true
-  become: true

roles/traefik/templates/docker-compose.yml

@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   traefik:
     image: traefik:latest

roles/vaultwarden/tasks/base.yml

@@ -11,14 +11,13 @@
     src: "{{ item.src }}"
     dest: "vaultwarden/{{ item.dest }}"
   loop:
-    - { src: 'docker-compose.yml.j2', dest: 'docker-compose.yml' }
+    - { src: 'docker-compose.yml', dest: 'docker-compose.yml' }
-  register: vaultwarden_copy_templates_results
 
 - name: Copy dotenv as root
   ansible.builtin.template:
     owner: root
     group: root
-    src: ".env.j2"
+    src: ".env"
     dest: "vaultwarden/.env"
     mode: 0600
   become: true
@@ -34,9 +33,8 @@
   become: true
 
 - name: Update and restart container
-  community.docker.docker_compose:
+  community.docker.docker_compose_v2:
     project_src: vaultwarden
     state: present
-    pull: true
+    pull: always
-    restarted: "{{ vaultwarden_copy_templates_results.changed }}"
   become: true

roles/vaultwarden/templates/.env

@@ -1,6 +1,6 @@
 WEBSOCKET_ENABLED=true
 SIGNUPS_ALLOWED=false
-ADMIN_TOKEN={{ vaultwarden.admin_token }}
+ADMIN_TOKEN='{{ vaultwarden.admin_token }}'
 POSTGRES_PASSWORD=vaultwarden
 POSTGRES_DB=vaultwarden
 POSTGRES_USER=vaultwarden

roles/vaultwarden/templates/docker-compose.yml

@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   db:
     image: postgres:15

roles/watchtower/tasks/base.yml

@@ -10,13 +10,11 @@
     src: "{{ item.src }}"
     dest: "watchtower/{{ item.dest }}"
   loop:
-    - { src: 'docker-compose.yml.j2', dest: 'docker-compose.yml' }
+    - { src: 'docker-compose.yml', dest: 'docker-compose.yml' }
-  register: watchtower_copy_templates_results
 
 - name: Force update and restart container
-  community.docker.docker_compose:
+  community.docker.docker_compose_v2:
     project_src: watchtower
     state: present
-    pull: true
+    pull: always
-    restarted: "{{ watchtower_copy_templates_results.changed }}"
   become: true

roles/watchtower/templates/docker-compose.yml

@@ -1,5 +1,3 @@
-version: '3'
-
 services: 
   watchtower:
     image: containrrr/watchtower:latest

roles/whoami/tasks/base.yml

@@ -10,13 +10,11 @@
     src: "{{ item.src }}"
     dest: "whoami/{{ item.dest }}"
   loop:
-    - { src: 'docker-compose.yml.j2', dest: 'docker-compose.yml' }
+    - { src: 'docker-compose.yml', dest: 'docker-compose.yml' }
-  register: whoami_copy_templates_results
 
 - name: Force update and restart container
-  community.docker.docker_compose:
+  community.docker.docker_compose_v2:
     project_src: whoami
     state: present
-    pull: true
+    pull: always
-    restarted: "{{ whoami_copy_templates_results.changed }}"
   become: true

roles/whoami/templates/docker-compose.yml

@@ -1,5 +1,3 @@
-version: '3'
-
 services: 
   whoami:
     image: "containous/whoami"

roles/wireguard/tasks/base.yml

@@ -10,13 +10,11 @@
     src: "{{ item.src }}"
     dest: "wireguard/{{ item.dest }}"
   loop:
-    - { src: 'docker-compose.yml.j2', dest: 'docker-compose.yml' }
+    - { src: 'docker-compose.yml', dest: 'docker-compose.yml' }
-  register: wireguard_copy_templates_results
 
 - name: Update and restart container
-  community.docker.docker_compose:
+  community.docker.docker_compose_v2:
     project_src: wireguard
     state: present
-    pull: true
+    pull: always
-    restarted: "{{ wireguard_copy_templates_results.changed }}"
   become: true

roles/wireguard/templates/docker-compose.yml

@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   wireguard:
     image: lscr.io/linuxserver/wireguard:latest