From 0df0c1e80b5e1aa6204e7050acf76959ba3cf2ac Mon Sep 17 00:00:00 2001
From: Emmanuel Garette <egarette@silique.fr>
Date: Tue, 10 Sep 2024 13:41:03 +0200
Subject: [PATCH] fix

---
 seed/base-machine/dictionaries/12_base.xml                | 3 +++
 seed/base/dictionaries/00_base.xml                        | 3 ---
 seed/dovecot/templates/risotto_backup                     | 2 +-
 seed/forgejo/templates/forgejo.yml                        | 6 +++---
 seed/host-systemd-machined/dictionaries/21_machined.xml   | 4 ++--
 seed/postfix-relay/templates/postfix.service              | 7 ++++---
 seed/prometheus/dictionaries/20_prometheus.xml            | 2 +-
 .../dictionaries/16_machined.xml                          | 8 +++++---
 .../extras/machine/11_systemd.xml                         | 6 ++++++
 seed/systemd/dictionaries/15_systemd.xml                  | 2 +-
 10 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/seed/base-machine/dictionaries/12_base.xml b/seed/base-machine/dictionaries/12_base.xml
index 97a2a80..065bf5b 100644
--- a/seed/base-machine/dictionaries/12_base.xml
+++ b/seed/base-machine/dictionaries/12_base.xml
@@ -9,6 +9,9 @@
     <variable name="hide_secret" type="boolean" description="Les secrets sont obscurcis" mode="expert" help="Obscurcir les secrets peut permettre de générer des configurations diffusable sans problème de confidentialité ou pour comparer deux configurations générés à des moments différents" hidden="True">
       <value>False</value>
     </variable>
+    <family name="base">
+      <variable name="time_zone" provider="Host:time_zone" hidden="True"/>
+    </family>
     <variable name="module_name" type="string" hidden="True" provider="global:module_name" mandatory="True"/>
     <family name="network" description="Réseau">
       <variable name="server_name" description="Nom de domaine du serveur" type="domainname" hidden="True" provider="global:server_name" mandatory="True"/>
diff --git a/seed/base/dictionaries/00_base.xml b/seed/base/dictionaries/00_base.xml
index 2ccdace..dd9f34d 100644
--- a/seed/base/dictionaries/00_base.xml
+++ b/seed/base/dictionaries/00_base.xml
@@ -2,9 +2,6 @@
 <rougail version="0.10">
   <variables>
     <variable name="copy_tests" type="boolean" mandatory="True" hidden="True"/>
-    <family name="base">
-      <variable name="time_zone" supplier="Host:time_zone" hidden="True"/>
-    </family>
   </variables>
   <constraints>
     <fill name="calc_value">
diff --git a/seed/dovecot/templates/risotto_backup b/seed/dovecot/templates/risotto_backup
index 53d8b16..4b076f1 100644
--- a/seed/dovecot/templates/risotto_backup
+++ b/seed/dovecot/templates/risotto_backup
@@ -7,7 +7,7 @@ chown vmail: $BACKUP_DIR
 
 rm -f $BACKUP_DIR/*.done
 find /srv/home/ -name *@* -type d -printf "%f\n" | while read user; do
-    doveadm backup -u $user maildir:$BACKUP_DIR/$user
+    doveadm -o mail_fsync=never backup -u $user maildir:$BACKUP_DIR/$user
     touch $BACKUP_DIR/$user.done
 done
 
diff --git a/seed/forgejo/templates/forgejo.yml b/seed/forgejo/templates/forgejo.yml
index 89cd2dc..455a792 100644
--- a/seed/forgejo/templates/forgejo.yml
+++ b/seed/forgejo/templates/forgejo.yml
@@ -1,11 +1,11 @@
 {% set username="rougail_test@silique.fr" %}
 ip: {{ general.network.interface_0.ip_eth0 }}
 revprox_ip: {{ general.revprox.revprox_client_server_ip }}
-{% set domain = {{ general.revprox.revprox_client_external_domainnames[0] }}
+{% set domain = general.revprox.revprox_client.revprox_client_external_domainnames[0] %}
 base_url: https://{{ domain }}{{domain.revprox_client_location }}
-auth_url: {{ general.oauth2_client.oauth2_client_external[0] }}
+auth_url: {{ general.oauth2_client.external.oauth2_client_external[0] }}
 auth_server: {{ general.oauth2_client.oauth2_server_domainname }}
 username: {{ username }}
 password: {{ username|get_password(server_name='test', description='test', type="cleartext", hide=hide_secret, temporary=True) }}
 forgejo_title: "{{ general.forgejo.forgejo_title }}"
-git_url: "[{{ domain] }}:{{ general.network.incoming_ports[0] }}"
+git_url: "{{ domain }}:{{ general.network.incoming_ports[0] }}"
diff --git a/seed/host-systemd-machined/dictionaries/21_machined.xml b/seed/host-systemd-machined/dictionaries/21_machined.xml
index 39e9bef..f2323a2 100644
--- a/seed/host-systemd-machined/dictionaries/21_machined.xml
+++ b/seed/host-systemd-machined/dictionaries/21_machined.xml
@@ -26,7 +26,7 @@
       <file engine="ansible" file_type="variable" source="dhcp.network" variable="interface_names">host_network_filename</file>
     </service>
     <service name="modprobe@">
-      <override/>
+      <override engine="none"/>
     </service>
     <service name="vector" servicelist="vector">
       <file engine="ansible">/etc/vector/vector.toml</file>
@@ -74,7 +74,7 @@
       <value>resolvconf</value>
     </variable>
     <family name="base">
-      <variable name="time_zone" type="string" description="Time zone" provider="Host:time_zone">
+      <variable name="time_zone" type="string" description="Time zone" supplier="Host:time_zone">
         <value>Europe/Paris</value>
       </variable>
     </family>
diff --git a/seed/postfix-relay/templates/postfix.service b/seed/postfix-relay/templates/postfix.service
index d4c60be..0a0dfca 100644
--- a/seed/postfix-relay/templates/postfix.service
+++ b/seed/postfix-relay/templates/postfix.service
@@ -2,9 +2,10 @@
 ExecStartPre=/usr/sbin/postmap /etc/postfix/lmtp
 ExecStartPre=/usr/sbin/postmap -F /etc/postfix/sni
 {% for local in general.postfix.postfix_relay_authentifications %}
-{% set user = general.postfix['local_authentification_' + user]['local_authentification_username_' + user] %}
-{% set password = general.postfix['local_authentification_' + user]['local_authentification_password_' + user] %}
-{% set ip = general.postfix['local_authentification_' + user]['postfix_relay_ip_' + user] %}
+{% set local_norm = local|normalize_family %}
+{% set user = general.postfix['local_authentification_' + local_norm]['local_authentification_username_' + local_norm] %}
+{% set password = general.postfix['local_authentification_' + local_norm]['local_authentification_password_' + local_norm] %}
+{% set ip = general.postfix['local_authentification_' + local_norm]['postfix_relay_ip_' + local_norm] %}
 ExecStartPre=-/usr/bin/bash -c "echo {{ password }} | /usr/sbin/saslpasswd2 -u {{ ip }} {{ user }} -p"
 {% endfor %}
 ExecStartPre=/usr/bin/chown postfix: /etc/sasl2/sasldb2
diff --git a/seed/prometheus/dictionaries/20_prometheus.xml b/seed/prometheus/dictionaries/20_prometheus.xml
index 399c982..03b30cd 100644
--- a/seed/prometheus/dictionaries/20_prometheus.xml
+++ b/seed/prometheus/dictionaries/20_prometheus.xml
@@ -2,7 +2,7 @@
 <rougail version="0.10">
   <services>
     <service name="prometheus" target="multi-user">
-      <override/>
+      <override engine="none"/>
       <file engine="none" source="sysuser-prometheus.conf">/sysusers.d/prometheus.conf</file>
       <file engine="none" source="tmpfile-prometheus.conf">/tmpfiles.d/0prometheus.conf</file>
       <file engine="ansible">/etc/prometheus/prometheus.yml</file>
diff --git a/seed/provider-systemd-machined/dictionaries/16_machined.xml b/seed/provider-systemd-machined/dictionaries/16_machined.xml
index 48d9b4d..75ec713 100644
--- a/seed/provider-systemd-machined/dictionaries/16_machined.xml
+++ b/seed/provider-systemd-machined/dictionaries/16_machined.xml
@@ -37,9 +37,7 @@
       </variable>
       <variable name="zones_list" redefine="True" supplier="Host:machine_zones" hidden="True"/>
     </family>
-    <variable name="do_backup" type="boolean" description="Do backup for this machine" hidden="True">
-      <value>True</value>
-    </variable>
+    <variable name="do_backup" type="boolean" description="Do backup for this machine" mode="expert"/>
     <variable name="backup_dir" type="filename" hidden="True">
       <value>/srv/backup</value>
     </variable>
@@ -53,6 +51,10 @@
       <param>False</param>
       <target type="variable">srv_dir</target>
     </condition>
+    <condition name="hidden_if_in" source="machine.add_srv">
+      <param>False</param>
+      <target type="variable">do_backup</target>
+    </condition>
     <fill name="calc_value">
       <param type="variable">container_srv_path</param>
       <param>/</param>
diff --git a/seed/provider-systemd-machined/extras/machine/11_systemd.xml b/seed/provider-systemd-machined/extras/machine/11_systemd.xml
index 44514c6..c801997 100644
--- a/seed/provider-systemd-machined/extras/machine/11_systemd.xml
+++ b/seed/provider-systemd-machined/extras/machine/11_systemd.xml
@@ -9,5 +9,11 @@
     <variable name="add_swap" disabled="True" redefine="True"/>
     <variable name="swap_size" disabled="True" redefine="True"/>
   </variables>
+  <constraints>
+    <fill name="calc_value">
+      <param type="variable">machine.add_srv</param>
+      <target>do_backup</target>
+    </fill>
+  </constraints>
 </rougail>
 
diff --git a/seed/systemd/dictionaries/15_systemd.xml b/seed/systemd/dictionaries/15_systemd.xml
index f1f0f04..35b69c5 100644
--- a/seed/systemd/dictionaries/15_systemd.xml
+++ b/seed/systemd/dictionaries/15_systemd.xml
@@ -25,7 +25,7 @@
     <service name="srv" engine="ansible" target="multi-user" type="mount" servicelist="add_srv" undisable='True'/>
     <service name="dev-disk-by\x2dpartlabel-swap" engine="none" target="multi-user" type="swap" servicelist="add_swap" undisable='True'/>
     <service name="systemd-firstboot">
-      <override/>
+      <override engine="ansible"/>
       <file engine="ansible">/secrets/root.pwd</file>
       <file engine="none">/tmpfiles.d/risotto-volatile.conf</file>
     </service>