diff --git a/seed/applicationservice/2022.03.08/dovecot/dictionaries/22_dovecot.xml b/seed/applicationservice/2022.03.08/dovecot/dictionaries/22_dovecot.xml
index 810c4ce8..3383139c 100644
--- a/seed/applicationservice/2022.03.08/dovecot/dictionaries/22_dovecot.xml
+++ b/seed/applicationservice/2022.03.08/dovecot/dictionaries/22_dovecot.xml
@@ -65,6 +65,7 @@
+
@@ -78,7 +79,7 @@
-
+
@@ -127,6 +128,12 @@
mail_domains
mail_domains_calc
+
+ autoconfig
+ mail_domains
+ .
+ mail_domains_calc_autoconfig
+
/var/www/html/mail/
mail_domains
@@ -136,6 +143,19 @@
True
well_known_filenames
+
+ revprox_client_server_domainname
+ revprox_clients
+ revprox_location
+ /mail/config-v1.1.xml
+ revprox_is_websocket
+ False
+ revprox_url
+ well_knowns
+ True
+
+ mail_domains_calc_autoconfig
+
revprox_client_server_domainname
revprox_clients
@@ -145,6 +165,8 @@
False
revprox_url
well_knowns
+ True
+
mail_domains_calc
@@ -156,6 +178,8 @@
False
revprox_url
well_knowns
+ True
+
mail_domains_calc
diff --git a/seed/applicationservice/2022.03.08/gitea/dictionaries/31_gitea.xml b/seed/applicationservice/2022.03.08/gitea/dictionaries/31_gitea.xml
index 705cc1c2..90c88257 100644
--- a/seed/applicationservice/2022.03.08/gitea/dictionaries/31_gitea.xml
+++ b/seed/applicationservice/2022.03.08/gitea/dictionaries/31_gitea.xml
@@ -13,7 +13,9 @@
2222
-
+
+ Gitea: Git avec une tasse de thé
+
@@ -56,12 +58,6 @@
-
- Gitea: Git with a cup of tea for
- revprox_client_external_domainname
-
- gitea_title
-
domain_name_eth0
secret_key
@@ -87,7 +83,7 @@
gitea_lfs_jwt_secret
- revprox_client_external_domainname
+ revprox_client_external_domainnames
revprox_client_location
user/oauth2/
domain_name_eth0
@@ -95,7 +91,7 @@
oauth2_client_login
- revprox_client_external_domainname
+ revprox_client_external_domainnames
revprox_client_location
user/oauth2/
domain_name_eth0
diff --git a/seed/applicationservice/2022.03.08/mailman/dictionaries/31_mailman.xml b/seed/applicationservice/2022.03.08/mailman/dictionaries/31_mailman.xml
index e3f42185..d219e806 100644
--- a/seed/applicationservice/2022.03.08/mailman/dictionaries/31_mailman.xml
+++ b/seed/applicationservice/2022.03.08/mailman/dictionaries/31_mailman.xml
@@ -60,7 +60,7 @@
postorius_secret_key
- revprox_client_external_domainname
+ revprox_client_external_domainnames
revprox_client_location
/accounts/risotto/login/
oauth2_client_external
diff --git a/seed/applicationservice/2022.03.08/nextcloud/dictionaries/31_nextcloud.xml b/seed/applicationservice/2022.03.08/nextcloud/dictionaries/31_nextcloud.xml
index 0656f10f..42828bc2 100644
--- a/seed/applicationservice/2022.03.08/nextcloud/dictionaries/31_nextcloud.xml
+++ b/seed/applicationservice/2022.03.08/nextcloud/dictionaries/31_nextcloud.xml
@@ -65,7 +65,7 @@
nextcloud_instance_id
- revprox_client_external_domainname
+ revprox_client_external_domainnames
nextcloud_well_known_server
diff --git a/seed/applicationservice/2022.03.08/oauth2-client/dictionaries/30_oauth2_client.xml b/seed/applicationservice/2022.03.08/oauth2-client/dictionaries/30_oauth2_client.xml
index 87347007..8ab4358d 100644
--- a/seed/applicationservice/2022.03.08/oauth2-client/dictionaries/30_oauth2_client.xml
+++ b/seed/applicationservice/2022.03.08/oauth2-client/dictionaries/30_oauth2_client.xml
@@ -8,8 +8,8 @@
-
-
+
+
Défaut
@@ -87,7 +87,7 @@
oauth2_client_token_signature_algo
- revprox_client_external_domainname
+ revprox_client_external_domainnames
revprox_client_location
oauth2_client_external
diff --git a/seed/applicationservice/2022.03.08/peertube/dictionaries/30_peertube.xml b/seed/applicationservice/2022.03.08/peertube/dictionaries/30_peertube.xml
index e5ace0ef..2d30bd67 100644
--- a/seed/applicationservice/2022.03.08/peertube/dictionaries/30_peertube.xml
+++ b/seed/applicationservice/2022.03.08/peertube/dictionaries/30_peertube.xml
@@ -51,7 +51,7 @@
- revprox_client_external_domainname
+ revprox_client_external_domainnames
revprox_client_location
plugins/auth-openid-connect/0.0.7/auth/openid-connect
oauth2_client_external
diff --git a/seed/applicationservice/2022.03.08/pleroma/dictionaries/30_pleroma.xml b/seed/applicationservice/2022.03.08/pleroma/dictionaries/30_pleroma.xml
index 2d23712b..1720529f 100644
--- a/seed/applicationservice/2022.03.08/pleroma/dictionaries/30_pleroma.xml
+++ b/seed/applicationservice/2022.03.08/pleroma/dictionaries/30_pleroma.xml
@@ -51,7 +51,7 @@
- revprox_client_external_domainname
+ revprox_client_external_domainnames
revprox_client_location
plugins/auth-openid-connect/0.0.7/auth/openid-connect
oauth2_client_external
diff --git a/seed/applicationservice/2022.03.08/postfix-relay/templates/opendmarc.conf b/seed/applicationservice/2022.03.08/postfix-relay/templates/opendmarc.conf
index 25598ec0..37022db9 100644
--- a/seed/applicationservice/2022.03.08/postfix-relay/templates/opendmarc.conf
+++ b/seed/applicationservice/2022.03.08/postfix-relay/templates/opendmarc.conf
@@ -319,7 +319,7 @@ IgnoreAuthenticatedClients true
#
# RejectFailures false
#>GNUNUX
-RejectFailures true
+#FIXME RejectFailures true
#
-
+
+
/
@@ -36,6 +37,10 @@
+
+ revprox_client_external_domainnames
+ revprox_client_external_domainname
+
domain_name_eth0
revprox_client_port
@@ -54,43 +59,23 @@
/
revprox_key_file
-
- revprox_client_server_domainname
- revprox_clients
- revprox_client_external_domainname
- ip
- 0
+
+ revprox_client_server_domainname
+ revprox_clients
+ revprox_client_external_domainnames
+ revprox_location
+ revprox_client_location
+ revprox_is_websocket
+ revprox_client_is_websocket
+ revprox_max_body_size
+ revprox_client_max_body_size
+ revprox_url
+ revprox_client_web_address
revprox_client_server_ip
-
- revprox_client_server_domainname
- revprox_location
- revprox_client_external_domainname
- revprox_client_location
-
-
- revprox_client_server_domainname
- revprox_is_websocket
- revprox_client_external_domainname
- revprox_location
- revprox_client_location
- revprox_client_is_websocket
-
-
- revprox_client_server_domainname
- revprox_max_body_size
- revprox_client_external_domainname
- revprox_location
- revprox_client_location
- revprox_client_max_body_size
-
-
- revprox_client_server_domainname
- revprox_url
- revprox_location
- revprox_client_location
- revprox_client_external_domainname
- revprox_client_web_address
-
+
diff --git a/seed/applicationservice/2022.03.08/reverse-proxy-client/funcs/revprox_client.py b/seed/applicationservice/2022.03.08/reverse-proxy-client/funcs/revprox_client.py
index d781120c..c3b0acae 100644
--- a/seed/applicationservice/2022.03.08/reverse-proxy-client/funcs/revprox_client.py
+++ b/seed/applicationservice/2022.03.08/reverse-proxy-client/funcs/revprox_client.py
@@ -7,3 +7,8 @@ def calc_web_address(domain_name: str, port: str, local_location: str) -> str:
if local_location:
web_address += local_location
return web_address
+
+
+def get_first_value(lst: list):
+ if lst:
+ return lst[0]
diff --git a/seed/applicationservice/2022.03.08/roundcube/dictionaries/31_roundcube.xml b/seed/applicationservice/2022.03.08/roundcube/dictionaries/31_roundcube.xml
index d4fc6d76..487cdbdb 100644
--- a/seed/applicationservice/2022.03.08/roundcube/dictionaries/31_roundcube.xml
+++ b/seed/applicationservice/2022.03.08/roundcube/dictionaries/31_roundcube.xml
@@ -14,10 +14,6 @@
-
-
-
-
@@ -38,7 +34,6 @@
-
/usr/share/roundcubemail/
@@ -55,18 +50,5 @@
cleartext
roundcube_des_key
-
- revprox_client_external_domainnames
- revprox_client_location
- index.php/login/oauth
- oauth2_client_external
-
-
- all
- ldap_server_address
- client_family
- domain_name_eth0
- ldap_family
-