From 9dd32d022d845254c67c5e78a7b22b4c56523e58 Mon Sep 17 00:00:00 2001
From: Emmanuel Garette <egarette@cadoles.com>
Date: Sat, 25 Jun 2022 08:11:37 +0200
Subject: [PATCH] add provider for different server

---
 .../2022.03.08/base/dictionaries/12-base.xml           |  5 +++++
 seed/applicationservice/2022.03.08/base/funcs/funcs.py | 10 +++++++++-
 .../ldap-client/dictionaries/21_ldap-client.xml        |  5 +++++
 .../2022.03.08/lemonldap/applicationservice.yml        |  1 +
 .../mariadb-client/dictionaries/20_mariadb.xml         |  5 +++++
 .../2022.03.08/mariadb/applicationservice.yml          |  1 +
 .../nginx-reverse-proxy/applicationservice.yml         |  1 +
 .../2022.03.08/nsd/applicationservice.yml              |  1 +
 .../2022.03.08/nsd/dictionaries/20_nsd.xml             |  5 +++++
 .../oauth2-client/dictionaries/30_oauth2_client.xml    |  5 +++++
 .../2022.03.08/openldap/applicationservice.yml         |  1 +
 .../2022.03.08/peertube/dictionaries/30_peertube.xml   |  8 ++++++++
 .../2022.03.08/postfix-relay/applicationservice.yml    |  1 +
 .../postfix-relay/dictionaries/30_postfix.xml          |  6 ++++++
 .../postgresql-client/dictionaries/23_postgresql.xml   |  5 +++++
 .../2022.03.08/postgresql/applicationservice.yml       |  1 +
 .../provider-systemd-machined/applicationservice.yml   |  1 -
 .../2022.03.08/redis-client/dictionaries/23_redis.xml  |  5 +++++
 .../2022.03.08/redis/applicationservice.yml            |  1 +
 .../relay-mail-client/dictionaries/20_smtp_client.xml  |  5 +++++
 .../dictionaries/21_nginx_client.xml                   |  5 +++++
 .../2022.03.08/unbound/applicationservice.yml          |  1 +
 22 files changed, 77 insertions(+), 2 deletions(-)

diff --git a/seed/applicationservice/2022.03.08/base/dictionaries/12-base.xml b/seed/applicationservice/2022.03.08/base/dictionaries/12-base.xml
index ba360184..553c19a6 100644
--- a/seed/applicationservice/2022.03.08/base/dictionaries/12-base.xml
+++ b/seed/applicationservice/2022.03.08/base/dictionaries/12-base.xml
@@ -24,6 +24,11 @@
     </family>
   </variables>
   <constraints>
+    <fill name="get_provider_name">
+      <param type="variable">zone_name_eth0</param>
+      <param>LocalDNS</param>
+      <target>dns_client_address</target>
+    </fill>
     <fill name="set_linked">
       <param name="linked_server" type="variable">dns_client_address</param>
       <param name="linked_provider">dns</param>
diff --git a/seed/applicationservice/2022.03.08/base/funcs/funcs.py b/seed/applicationservice/2022.03.08/base/funcs/funcs.py
index c9deac13..bd0e6e26 100644
--- a/seed/applicationservice/2022.03.08/base/funcs/funcs.py
+++ b/seed/applicationservice/2022.03.08/base/funcs/funcs.py
@@ -7,7 +7,7 @@ from os.path import dirname as _dirname, abspath as _abspath, join as _join, isf
 from os import makedirs as _makedirs
 
 
-from risotto.utils import load_domains, DOMAINS
+from risotto.utils import load_domains, DOMAINS, ZONES_SERVER
 
 
 _HERE = _dirname(_abspath(__main__.__file__))
@@ -111,3 +111,11 @@ def get_ip(server_name: str,
     host_name, domain_name = server_name.split('.', 1)
     domain = DOMAINS[domain_name]
     return domain[1][domain[0].index(host_name)]
+
+
+def get_provider_name(network_name: str,
+                      provider: str,
+                      ) -> str:
+    if network_name not in ZONES_SERVER['providers'] or provider not in ZONES_SERVER['providers'][network_name]:
+        return
+    return ZONES_SERVER['providers'][network_name][provider][0]
diff --git a/seed/applicationservice/2022.03.08/ldap-client/dictionaries/21_ldap-client.xml b/seed/applicationservice/2022.03.08/ldap-client/dictionaries/21_ldap-client.xml
index 53eeddca..362e6f9b 100644
--- a/seed/applicationservice/2022.03.08/ldap-client/dictionaries/21_ldap-client.xml
+++ b/seed/applicationservice/2022.03.08/ldap-client/dictionaries/21_ldap-client.xml
@@ -38,6 +38,11 @@
     <check name='valid_base_dn'>
       <target>ldapclient_base_dn</target>
     </check>
+    <fill name="get_provider_name">
+      <param type="variable">zone_name_eth0</param>
+      <param>LDAP</param>
+      <target>ldap_server_address</target>
+    </fill>
     <fill name="calc_value">
       <param type="variable">tls_ca_directory</param>
       <param>ca_LDAP.crt</param>
diff --git a/seed/applicationservice/2022.03.08/lemonldap/applicationservice.yml b/seed/applicationservice/2022.03.08/lemonldap/applicationservice.yml
index 723261ea..f715b6a0 100644
--- a/seed/applicationservice/2022.03.08/lemonldap/applicationservice.yml
+++ b/seed/applicationservice/2022.03.08/lemonldap/applicationservice.yml
@@ -6,3 +6,4 @@ depends:
   - reverse-proxy-client
   - relay-mail-client
   - nginx-common
+provider: OAuth2
diff --git a/seed/applicationservice/2022.03.08/mariadb-client/dictionaries/20_mariadb.xml b/seed/applicationservice/2022.03.08/mariadb-client/dictionaries/20_mariadb.xml
index baf56794..23fbd224 100644
--- a/seed/applicationservice/2022.03.08/mariadb-client/dictionaries/20_mariadb.xml
+++ b/seed/applicationservice/2022.03.08/mariadb-client/dictionaries/20_mariadb.xml
@@ -12,6 +12,11 @@
     </family>
   </variables>
   <constraints>
+    <fill name="get_provider_name">
+      <param type="variable">zone_name_eth0</param>
+      <param>MariaDB</param>
+      <target>mariadb_client_server_domainname</target>
+    </fill>
     <fill name="set_linked">
       <param name="linked_server" type="variable">mariadb_client_server_domainname</param>
       <param name="linked_provider">clients</param>
diff --git a/seed/applicationservice/2022.03.08/mariadb/applicationservice.yml b/seed/applicationservice/2022.03.08/mariadb/applicationservice.yml
index f168f314..ed6250a8 100644
--- a/seed/applicationservice/2022.03.08/mariadb/applicationservice.yml
+++ b/seed/applicationservice/2022.03.08/mariadb/applicationservice.yml
@@ -3,3 +3,4 @@ description: Mariadb
 depends:
   - server
   - base-fedora-35
+provider: MariaDB
diff --git a/seed/applicationservice/2022.03.08/nginx-reverse-proxy/applicationservice.yml b/seed/applicationservice/2022.03.08/nginx-reverse-proxy/applicationservice.yml
index 6ad1c196..e9807319 100644
--- a/seed/applicationservice/2022.03.08/nginx-reverse-proxy/applicationservice.yml
+++ b/seed/applicationservice/2022.03.08/nginx-reverse-proxy/applicationservice.yml
@@ -3,3 +3,4 @@ description: Nginx as reverse proxy
 depends:
   - base-fedora-35
   - nginx-common
+provider: ReverseProxy
diff --git a/seed/applicationservice/2022.03.08/nsd/applicationservice.yml b/seed/applicationservice/2022.03.08/nsd/applicationservice.yml
index ad102d8f..9e35bd6d 100644
--- a/seed/applicationservice/2022.03.08/nsd/applicationservice.yml
+++ b/seed/applicationservice/2022.03.08/nsd/applicationservice.yml
@@ -3,3 +3,4 @@ description: Configuration du serveur faisant autorité NSD
 service: true
 depends:
   - base-fedora-35
+provider: LocalDNS
diff --git a/seed/applicationservice/2022.03.08/nsd/dictionaries/20_nsd.xml b/seed/applicationservice/2022.03.08/nsd/dictionaries/20_nsd.xml
index cb5bbdf4..dd159d28 100644
--- a/seed/applicationservice/2022.03.08/nsd/dictionaries/20_nsd.xml
+++ b/seed/applicationservice/2022.03.08/nsd/dictionaries/20_nsd.xml
@@ -41,6 +41,11 @@
     <variable name="nsd_reverse_filenames_signed" type="filename" description="Nom des fichiers de zone reverse signé" multi="True" hidden="True"/>
   </variables>
   <constraints>
+    <fill name="get_provider_name">
+      <param type="variable">zone_name_eth0</param>
+      <param>ExternalDNS</param>
+      <target>nsd_resolver</target>
+    </fill>
     <fill name="nsd_concat_lists">
       <param type="variable">ip_eth</param>
       <param type="variable">nsd_allowed_client</param>
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 75f8671f..ffc384a7 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
@@ -32,6 +32,11 @@
     </family>
   </variables>
   <constraints>
+    <fill name="get_provider_name">
+      <param type="variable">zone_name_eth0</param>
+      <param>OAuth2</param>
+      <target>oauth2_client_server_domainname</target>
+    </fill>
     <fill name="set_linked">
       <param name="linked_server" type="variable">oauth2_client_server_domainname</param>
       <param name="linked_provider">oauth2</param>
diff --git a/seed/applicationservice/2022.03.08/openldap/applicationservice.yml b/seed/applicationservice/2022.03.08/openldap/applicationservice.yml
index 6bd6c9ca..1d656054 100644
--- a/seed/applicationservice/2022.03.08/openldap/applicationservice.yml
+++ b/seed/applicationservice/2022.03.08/openldap/applicationservice.yml
@@ -3,3 +3,4 @@ description: OpenLDAP server
 depends:
   - ldap-client-fedora
   - base-fedora-35
+provider: LDAP
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 d54f2145..8c315e92 100644
--- a/seed/applicationservice/2022.03.08/peertube/dictionaries/30_peertube.xml
+++ b/seed/applicationservice/2022.03.08/peertube/dictionaries/30_peertube.xml
@@ -11,6 +11,9 @@
     </service>
   </services>
   <variables>
+    <family name="network">
+      <variable name="dns_client_address" redefine="True"/>
+    </family>
     <family name="peertube">
       <variable name="peertube_admin_email" type="mail" description="Adresse courriel de l'administrateur Peertube" mandatory="True"/>
       <variable name="peertube_short_description" type="string" description="Description courte de l'instance">
@@ -52,6 +55,11 @@
     </family>
   </variables>
   <constraints>
+    <fill name="get_provider_name">
+      <param type="variable">zone_name_eth0</param>
+      <param>ExternalDNS</param>
+      <target>dns_client_address</target>
+    </fill>
     <fill name="calc_oauth2_client_external">
       <param type="variable">revprox_client_external_domainnames</param>
       <param type="variable">revprox_client_location</param>
diff --git a/seed/applicationservice/2022.03.08/postfix-relay/applicationservice.yml b/seed/applicationservice/2022.03.08/postfix-relay/applicationservice.yml
index 9268ab4d..3356451d 100644
--- a/seed/applicationservice/2022.03.08/postfix-relay/applicationservice.yml
+++ b/seed/applicationservice/2022.03.08/postfix-relay/applicationservice.yml
@@ -2,3 +2,4 @@ format: '0.1'
 description: Postfix has relay
 depends:
   - base-fedora-35
+provider: SMTP
diff --git a/seed/applicationservice/2022.03.08/postfix-relay/dictionaries/30_postfix.xml b/seed/applicationservice/2022.03.08/postfix-relay/dictionaries/30_postfix.xml
index 0033df29..78974219 100644
--- a/seed/applicationservice/2022.03.08/postfix-relay/dictionaries/30_postfix.xml
+++ b/seed/applicationservice/2022.03.08/postfix-relay/dictionaries/30_postfix.xml
@@ -33,6 +33,7 @@
   </services>
   <variables>
     <family name="network">
+      <variable name="dns_client_address" redefine="True"/>
       <variable name="external_ports" redefine="True">
         <value>25</value>
       </variable>
@@ -52,6 +53,11 @@
     </family>
   </variables>
   <constraints>
+    <fill name="get_provider_name">
+      <param type="variable">zone_name_eth0</param>
+      <param>ExternalDNS</param>
+      <target>dns_client_address</target>
+    </fill>
     <fill name="calc_value">
       <param>/etc/opendkim/keys/</param>
       <param type="variable">postfix_relay_domains</param>
diff --git a/seed/applicationservice/2022.03.08/postgresql-client/dictionaries/23_postgresql.xml b/seed/applicationservice/2022.03.08/postgresql-client/dictionaries/23_postgresql.xml
index 9ccd2da3..b58a2c73 100644
--- a/seed/applicationservice/2022.03.08/postgresql-client/dictionaries/23_postgresql.xml
+++ b/seed/applicationservice/2022.03.08/postgresql-client/dictionaries/23_postgresql.xml
@@ -20,6 +20,11 @@
     </family>
   </variables>
   <constraints>
+    <fill name="get_provider_name">
+      <param type="variable">zone_name_eth0</param>
+      <param>Postgresql</param>
+      <target>pg_client_server_domainname</target>
+    </fill>
     <fill name="set_linked">
       <param name="linked_server" type="variable">pg_client_server_domainname</param>
       <param name="linked_provider">clients</param>
diff --git a/seed/applicationservice/2022.03.08/postgresql/applicationservice.yml b/seed/applicationservice/2022.03.08/postgresql/applicationservice.yml
index 43817f4f..d2057227 100644
--- a/seed/applicationservice/2022.03.08/postgresql/applicationservice.yml
+++ b/seed/applicationservice/2022.03.08/postgresql/applicationservice.yml
@@ -3,3 +3,4 @@ description: Postgresql
 depends:
   - server
   - base-fedora-35
+provider: Postgresql
diff --git a/seed/applicationservice/2022.03.08/provider-systemd-machined/applicationservice.yml b/seed/applicationservice/2022.03.08/provider-systemd-machined/applicationservice.yml
index 2b3a7d58..edc27d76 100644
--- a/seed/applicationservice/2022.03.08/provider-systemd-machined/applicationservice.yml
+++ b/seed/applicationservice/2022.03.08/provider-systemd-machined/applicationservice.yml
@@ -1,5 +1,4 @@
 format: '0.1'
 description: Information for Systemd Machined
-provider: true
 depends:
   - systemd
diff --git a/seed/applicationservice/2022.03.08/redis-client/dictionaries/23_redis.xml b/seed/applicationservice/2022.03.08/redis-client/dictionaries/23_redis.xml
index 28bb6fbc..0a1d32ca 100644
--- a/seed/applicationservice/2022.03.08/redis-client/dictionaries/23_redis.xml
+++ b/seed/applicationservice/2022.03.08/redis-client/dictionaries/23_redis.xml
@@ -19,6 +19,11 @@
     </family>
   </variables>
   <constraints>
+    <fill name="get_provider_name">
+      <param type="variable">zone_name_eth0</param>
+      <param>Redis</param>
+      <target>redis_client_server_domainname</target>
+    </fill>
     <fill name="set_linked">
       <param name="linked_server" type="variable">redis_client_server_domainname</param>
       <param name="linked_provider">redis_client</param>
diff --git a/seed/applicationservice/2022.03.08/redis/applicationservice.yml b/seed/applicationservice/2022.03.08/redis/applicationservice.yml
index 0c898fee..d173f89b 100644
--- a/seed/applicationservice/2022.03.08/redis/applicationservice.yml
+++ b/seed/applicationservice/2022.03.08/redis/applicationservice.yml
@@ -2,3 +2,4 @@ format: '0.1'
 description: Redis
 depends:
   - base-fedora-35
+provider: Redis
diff --git a/seed/applicationservice/2022.03.08/relay-mail-client/dictionaries/20_smtp_client.xml b/seed/applicationservice/2022.03.08/relay-mail-client/dictionaries/20_smtp_client.xml
index c7271f3c..75d6cd12 100644
--- a/seed/applicationservice/2022.03.08/relay-mail-client/dictionaries/20_smtp_client.xml
+++ b/seed/applicationservice/2022.03.08/relay-mail-client/dictionaries/20_smtp_client.xml
@@ -13,6 +13,11 @@
     </family>
   </variables>
   <constraints>
+    <fill name="get_provider_name">
+      <param type="variable">zone_name_eth0</param>
+      <param>SMTP</param>
+      <target>smtp_relay_address</target>
+    </fill>
     <fill name="set_linked">
       <param name="linked_server" type="variable">smtp_relay_address</param>
       <param name="linked_provider">mail</param>
diff --git a/seed/applicationservice/2022.03.08/reverse-proxy-client/dictionaries/21_nginx_client.xml b/seed/applicationservice/2022.03.08/reverse-proxy-client/dictionaries/21_nginx_client.xml
index e826f318..f937e143 100644
--- a/seed/applicationservice/2022.03.08/reverse-proxy-client/dictionaries/21_nginx_client.xml
+++ b/seed/applicationservice/2022.03.08/reverse-proxy-client/dictionaries/21_nginx_client.xml
@@ -37,6 +37,11 @@
     </family>
   </variables>
   <constraints>
+    <fill name="get_provider_name">
+      <param type="variable">zone_name_eth0</param>
+      <param>ReverseProxy</param>
+      <target>revprox_client_server_domainname</target>
+    </fill>
     <fill name="get_first_value">
       <param type="variable">revprox_client_external_domainnames</param>
       <target>revprox_client_external_domainname</target>
diff --git a/seed/applicationservice/2022.03.08/unbound/applicationservice.yml b/seed/applicationservice/2022.03.08/unbound/applicationservice.yml
index bc022087..42294022 100644
--- a/seed/applicationservice/2022.03.08/unbound/applicationservice.yml
+++ b/seed/applicationservice/2022.03.08/unbound/applicationservice.yml
@@ -3,3 +3,4 @@ description: Configuration du serveur DNS unbound
 service: true
 depends:
   - base-fedora-35
+provider: ExternalDNS