From b77d7d5784ea20211570d2aa4b76bdf3dd84b6b2 Mon Sep 17 00:00:00 2001
From: Emmanuel Garette <egarette@silique.fr>
Date: Sun, 25 Dec 2022 20:23:58 +0100
Subject: [PATCH] merge ldap-client-fedora and ldap-client-debian into
 ldap-client

---
 seed/README.md                                |  5 +---
 seed/base-debian/README.md                    |  1 -
 seed/base-fedora/README.md                    |  1 -
 seed/dovecot/README.md                        |  8 +----
 seed/dovecot/applicationservice.yml           |  2 +-
 seed/ldap-client-debian/README.md             | 26 -----------------
 .../ldap-client-debian/applicationservice.yml |  5 ----
 .../dictionaries/22_ldap-client-debian.xml    | 13 ---------
 seed/ldap-client-fedora/README.md             | 29 -------------------
 .../ldap-client-fedora/applicationservice.yml |  5 ----
 .../dictionaries/22_ldap-client-fedora.xml    | 13 ---------
 seed/ldap-client/README.md                    |  9 ++++--
 .../dictionaries/21_ldap-client.xml           |  8 +++++
 seed/lemonldap/README.md                      |  8 +----
 seed/lemonldap/applicationservice.yml         |  2 +-
 seed/nextcloud/README.md                      |  8 +----
 seed/nextcloud/applicationservice.yml         |  2 +-
 seed/odoo/README.md                           |  8 +----
 seed/odoo/applicationservice.yml              |  2 +-
 seed/openldap/README.md                       | 18 ++++--------
 seed/openldap/applicationservice.yml          |  2 +-
 seed/piwigo/README.md                         |  8 +----
 seed/piwigo/applicationservice.yml            |  2 +-
 seed/roundcube/README.md                      |  8 +----
 seed/roundcube/applicationservice.yml         |  2 +-
 25 files changed, 35 insertions(+), 160 deletions(-)
 delete mode 100644 seed/ldap-client-debian/README.md
 delete mode 100644 seed/ldap-client-debian/applicationservice.yml
 delete mode 100644 seed/ldap-client-debian/dictionaries/22_ldap-client-debian.xml
 delete mode 100644 seed/ldap-client-fedora/README.md
 delete mode 100644 seed/ldap-client-fedora/applicationservice.yml
 delete mode 100644 seed/ldap-client-fedora/dictionaries/22_ldap-client-fedora.xml

diff --git a/seed/README.md b/seed/README.md
index ce983c9d..5570465c 100644
--- a/seed/README.md
+++ b/seed/README.md
@@ -19,10 +19,7 @@
 - [gitea](gitea/README.md): Gitea, a community managed lightweight code hosting solution
 - [host-systemd-machined](host-systemd-machined/README.md): Host with machine started in Systemd Machined environment
 - [imap-client](imap-client/README.md): Application service needs interact with an IMAP server
-- ldap:
-  - [ldap-client](ldap-client/README.md): Application service needs interact with a LDAP server
-  - [ldap-client-debian](ldap-client-debian/README.md): LDAP client for Fedora
-  - [ldap-client-fedora](ldap-client-fedora/README.md): LDAP client for Fedora
+- [ldap-client](ldap-client/README.md): Application service needs interact with a LDAP server
 - [lemonldap](lemonldap/README.md): LemonLDAP, a Web Single Sign On and Access Management
 - [letsencrypt](letsencrypt/README.md): Let's encrypt, a nonprofit Certificate Authority providing TLS certificates
 - [mailman](mailman/README.md): GNU Mailman, managing electronic mail discussion and e-newsletter lists
diff --git a/seed/base-debian/README.md b/seed/base-debian/README.md
index 8ad84a1b..35aad8b3 100644
--- a/seed/base-debian/README.md
+++ b/seed/base-debian/README.md
@@ -22,5 +22,4 @@ Base information of a Debian server.
 
 ## Used by
 
-- [ldap-client-debian](../ldap-client-debian/README.md)
 - [base-debian-bullseye](../base-debian-bullseye/README.md)
diff --git a/seed/base-fedora/README.md b/seed/base-fedora/README.md
index 0de60f56..dd871205 100644
--- a/seed/base-fedora/README.md
+++ b/seed/base-fedora/README.md
@@ -25,5 +25,4 @@ Base information of a Fedora.
 - [base-fedora-36](../base-fedora-36/README.md)
 - [base-fedora-35](../base-fedora-35/README.md)
 - [letsencrypt](../letsencrypt/README.md)
-- [ldap-client-fedora](../ldap-client-fedora/README.md)
 - [base-fedora-37](../base-fedora-37/README.md)
diff --git a/seed/dovecot/README.md b/seed/dovecot/README.md
index deadf799..bc0b274e 100644
--- a/seed/dovecot/README.md
+++ b/seed/dovecot/README.md
@@ -23,13 +23,7 @@ Postfix and Dovecot as mail servers (Submission and IMAP).
         - [dns-local](../dns-local/README.md)
 - [relay-lmtp-client](../relay-lmtp-client/README.md)
   - [relay-mail-client](../relay-mail-client/README.md)
-- [ldap-client-fedora](../ldap-client-fedora/README.md)
-  - [ldap-client](../ldap-client/README.md)
-  - [base-fedora](../base-fedora/README.md)
-    - [systemd](../systemd/README.md)
-      - [base-machine](../base-machine/README.md)
-        - [base](../base/README.md)
-        - [dns-local](../dns-local/README.md)
+- [ldap-client](../ldap-client/README.md)
 - [oauth2-client](../oauth2-client/README.md)
 - [nginx-https](../nginx-https/README.md)
   - [nginx-common](../nginx-common/README.md)
diff --git a/seed/dovecot/applicationservice.yml b/seed/dovecot/applicationservice.yml
index c632271f..e2d3aec6 100644
--- a/seed/dovecot/applicationservice.yml
+++ b/seed/dovecot/applicationservice.yml
@@ -4,6 +4,6 @@ website: https://www.dovecot.org/
 depends:
   - base-fedora-36
   - relay-lmtp-client
-  - ldap-client-fedora
+  - ldap-client
   - oauth2-client
   - nginx-https
diff --git a/seed/ldap-client-debian/README.md b/seed/ldap-client-debian/README.md
deleted file mode 100644
index 226ce2f5..00000000
--- a/seed/ldap-client-debian/README.md
+++ /dev/null
@@ -1,26 +0,0 @@
----
-gitea: none
-include_toc: true
----
-
-# ldap-client-debian
-
-[All applications services for this dataset.](../README.md)
-
-## Description
-
-LDAP client for Fedora.
-
-## Dependances
-
-- [ldap-client](../ldap-client/README.md)
-- [base-debian](../base-debian/README.md)
-  - [systemd](../systemd/README.md)
-    - [base-machine](../base-machine/README.md)
-      - [base](../base/README.md)
-      - [dns-local](../dns-local/README.md)
-
-## Used by
-
-- [odoo](../odoo/README.md)
-- [lemonldap](../lemonldap/README.md)
diff --git a/seed/ldap-client-debian/applicationservice.yml b/seed/ldap-client-debian/applicationservice.yml
deleted file mode 100644
index 2a6103cb..00000000
--- a/seed/ldap-client-debian/applicationservice.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-format: '0.1'
-description: LDAP client for Fedora
-depends:
-  - ldap-client
-  - base-debian
diff --git a/seed/ldap-client-debian/dictionaries/22_ldap-client-debian.xml b/seed/ldap-client-debian/dictionaries/22_ldap-client-debian.xml
deleted file mode 100644
index 85905435..00000000
--- a/seed/ldap-client-debian/dictionaries/22_ldap-client-debian.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<rougail version="0.10">
-  <variables>
-    <family name="annuaire">
-      <family name="client">
-        <variable name="ldap_client_file" type="filename" description="Nom du fichier du client LDAP" hidden="True">
-          <value>/etc/ldap/ldap.conf</value>
-        </variable>
-      </family>
-    </family>
-  </variables>
-</rougail>
diff --git a/seed/ldap-client-fedora/README.md b/seed/ldap-client-fedora/README.md
deleted file mode 100644
index 8aa8ec54..00000000
--- a/seed/ldap-client-fedora/README.md
+++ /dev/null
@@ -1,29 +0,0 @@
----
-gitea: none
-include_toc: true
----
-
-# ldap-client-fedora
-
-[All applications services for this dataset.](../README.md)
-
-## Description
-
-LDAP client for Fedora.
-
-## Dependances
-
-- [ldap-client](../ldap-client/README.md)
-- [base-fedora](../base-fedora/README.md)
-  - [systemd](../systemd/README.md)
-    - [base-machine](../base-machine/README.md)
-      - [base](../base/README.md)
-      - [dns-local](../dns-local/README.md)
-
-## Used by
-
-- [piwigo](../piwigo/README.md)
-- [dovecot](../dovecot/README.md)
-- [roundcube](../roundcube/README.md)
-- [nextcloud](../nextcloud/README.md)
-- [openldap](../openldap/README.md)
diff --git a/seed/ldap-client-fedora/applicationservice.yml b/seed/ldap-client-fedora/applicationservice.yml
deleted file mode 100644
index 09daadab..00000000
--- a/seed/ldap-client-fedora/applicationservice.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-format: '0.1'
-description: LDAP client for Fedora
-depends:
-  - ldap-client
-  - base-fedora
diff --git a/seed/ldap-client-fedora/dictionaries/22_ldap-client-fedora.xml b/seed/ldap-client-fedora/dictionaries/22_ldap-client-fedora.xml
deleted file mode 100644
index 23e3d61b..00000000
--- a/seed/ldap-client-fedora/dictionaries/22_ldap-client-fedora.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<rougail version="0.10">
-  <variables>
-    <family name="annuaire">
-      <family name="client">
-        <variable name="ldap_client_file" type="filename" description="Nom du fichier du client LDAP" hidden="True">
-          <value>/etc/openldap/ldap.conf</value>
-        </variable>
-      </family>
-    </family>
-  </variables>
-</rougail>
diff --git a/seed/ldap-client/README.md b/seed/ldap-client/README.md
index 35bcfe1a..0c61795c 100644
--- a/seed/ldap-client/README.md
+++ b/seed/ldap-client/README.md
@@ -39,8 +39,13 @@ Application service needs interact with a LDAP server.
 
 ## Used by
 
-- [ldap-client-debian](../ldap-client-debian/README.md)
-- [ldap-client-fedora](../ldap-client-fedora/README.md)
+- [odoo](../odoo/README.md)
+- [piwigo](../piwigo/README.md)
+- [dovecot](../dovecot/README.md)
+- [roundcube](../roundcube/README.md)
+- [nextcloud](../nextcloud/README.md)
+- [lemonldap](../lemonldap/README.md)
+- [openldap](../openldap/README.md)
 
 ## Linked to
 
diff --git a/seed/ldap-client/dictionaries/21_ldap-client.xml b/seed/ldap-client/dictionaries/21_ldap-client.xml
index 4b1239a8..52bc1577 100644
--- a/seed/ldap-client/dictionaries/21_ldap-client.xml
+++ b/seed/ldap-client/dictionaries/21_ldap-client.xml
@@ -34,6 +34,7 @@
         <variable name="ldap_key_file_group" type="unix_user" description="Groupe du fichier de la clef privée LDAP" hidden="True">
           <value>root</value>
         </variable>
+	<variable name="ldap_client_file" type="filename" description="Nom du fichier du client LDAP" hidden="True"/>
       </family>
     </family>
   </variables>
@@ -95,5 +96,12 @@
       <param type="variable">ldapclient_base_dn</param>
       <target>ldapclient_user_dn</target>
     </fill>
+    <fill name="calc_value">
+      <param>/etc/ldap/ldap.conf</param>
+      <param name="condition" type="variable">os_name</param>
+      <param name="expected">Debian</param>
+      <param name="default">/etc/openldap/ldap.conf</param>
+      <target>ldap_client_file</target>
+    </fill>
   </constraints>
 </rougail>
diff --git a/seed/lemonldap/README.md b/seed/lemonldap/README.md
index d912383a..0c745e55 100644
--- a/seed/lemonldap/README.md
+++ b/seed/lemonldap/README.md
@@ -21,13 +21,7 @@ LemonLDAP, a Web Single Sign On and Access Management.
       - [base-machine](../base-machine/README.md)
         - [base](../base/README.md)
         - [dns-local](../dns-local/README.md)
-- [ldap-client-debian](../ldap-client-debian/README.md)
-  - [ldap-client](../ldap-client/README.md)
-  - [base-debian](../base-debian/README.md)
-    - [systemd](../systemd/README.md)
-      - [base-machine](../base-machine/README.md)
-        - [base](../base/README.md)
-        - [dns-local](../dns-local/README.md)
+- [ldap-client](../ldap-client/README.md)
 - [reverse-proxy-client](../reverse-proxy-client/README.md)
 - [relay-mail-client](../relay-mail-client/README.md)
 - [nginx-common](../nginx-common/README.md)
diff --git a/seed/lemonldap/applicationservice.yml b/seed/lemonldap/applicationservice.yml
index 0aebe632..2abc171e 100644
--- a/seed/lemonldap/applicationservice.yml
+++ b/seed/lemonldap/applicationservice.yml
@@ -3,7 +3,7 @@ description: LemonLDAP, a Web Single Sign On and Access Management
 website: https://lemonldap-ng.org/
 depends:
   - base-debian-bullseye
-  - ldap-client-debian
+  - ldap-client
   - reverse-proxy-client
   - relay-mail-client
   - nginx-common
diff --git a/seed/nextcloud/README.md b/seed/nextcloud/README.md
index 89a11c2c..c7d0c74c 100644
--- a/seed/nextcloud/README.md
+++ b/seed/nextcloud/README.md
@@ -22,13 +22,7 @@ Nextcloud, Online collaboration platform.
         - [base](../base/README.md)
         - [dns-local](../dns-local/README.md)
 - [postgresql-client](../postgresql-client/README.md)
-- [ldap-client-fedora](../ldap-client-fedora/README.md)
-  - [ldap-client](../ldap-client/README.md)
-  - [base-fedora](../base-fedora/README.md)
-    - [systemd](../systemd/README.md)
-      - [base-machine](../base-machine/README.md)
-        - [base](../base/README.md)
-        - [dns-local](../dns-local/README.md)
+- [ldap-client](../ldap-client/README.md)
 - [redis-client](../redis-client/README.md)
 - [oauth2-client](../oauth2-client/README.md)
 - [relay-mail-client](../relay-mail-client/README.md)
diff --git a/seed/nextcloud/applicationservice.yml b/seed/nextcloud/applicationservice.yml
index 9f0382fb..03398d0b 100644
--- a/seed/nextcloud/applicationservice.yml
+++ b/seed/nextcloud/applicationservice.yml
@@ -4,7 +4,7 @@ website: https://nextcloud.com/
 depends:
   - base-fedora-36
   - postgresql-client
-  - ldap-client-fedora
+  - ldap-client
   - redis-client
   - oauth2-client
   - relay-mail-client
diff --git a/seed/odoo/README.md b/seed/odoo/README.md
index ab258e1f..ed7d3113 100644
--- a/seed/odoo/README.md
+++ b/seed/odoo/README.md
@@ -24,13 +24,7 @@ Odoo, an ERP and CRM.
 - [postgresql-client](../postgresql-client/README.md)
 - [reverse-proxy-client](../reverse-proxy-client/README.md)
 - [relay-mail-client](../relay-mail-client/README.md)
-- [ldap-client-debian](../ldap-client-debian/README.md)
-  - [ldap-client](../ldap-client/README.md)
-  - [base-debian](../base-debian/README.md)
-    - [systemd](../systemd/README.md)
-      - [base-machine](../base-machine/README.md)
-        - [base](../base/README.md)
-        - [dns-local](../dns-local/README.md)
+- [ldap-client](../ldap-client/README.md)
 - [oauth2-client](../oauth2-client/README.md)
 - [nginx-https](../nginx-https/README.md)
   - [nginx-common](../nginx-common/README.md)
diff --git a/seed/odoo/applicationservice.yml b/seed/odoo/applicationservice.yml
index e8f41094..25c42241 100644
--- a/seed/odoo/applicationservice.yml
+++ b/seed/odoo/applicationservice.yml
@@ -6,6 +6,6 @@ depends:
   - postgresql-client
   - reverse-proxy-client
   - relay-mail-client
-  - ldap-client-debian
+  - ldap-client
   - oauth2-client
   - nginx-https
diff --git a/seed/openldap/README.md b/seed/openldap/README.md
index d88f3686..46df51a0 100644
--- a/seed/openldap/README.md
+++ b/seed/openldap/README.md
@@ -15,13 +15,7 @@ OpenLDAP, a LDAP server.
 
 ## Dependances
 
-- [ldap-client-fedora](../ldap-client-fedora/README.md)
-  - [ldap-client](../ldap-client/README.md)
-  - [base-fedora](../base-fedora/README.md)
-    - [systemd](../systemd/README.md)
-      - [base-machine](../base-machine/README.md)
-        - [base](../base/README.md)
-        - [dns-local](../dns-local/README.md)
+- [ldap-client](../ldap-client/README.md)
 - [base-fedora-36](../base-fedora-36/README.md)
   - [base-fedora](../base-fedora/README.md)
     - [systemd](../systemd/README.md)
@@ -75,11 +69,11 @@ OpenLDAP, a LDAP server.
 
 ### Machine (*machine*)
 
-| Description                                     |   Values |
-|-------------------------------------------------|----------|
-| *[**var_size**](extras/machine/20_unbound.xml)* |      256 |
-| *[**add_tmp**](extras/machine/20_unbound.xml)*  |    False |
-| *[**add_swap**](extras/machine/20_unbound.xml)* |    False |
+| Description                                      |   Values |
+|--------------------------------------------------|----------|
+| *[**var_size**](extras/machine/20_openldap.xml)* |      256 |
+| *[**add_tmp**](extras/machine/20_openldap.xml)*  |    False |
+| *[**add_swap**](extras/machine/20_openldap.xml)* |    False |
 
 ### Accounts (*accounts*)
 
diff --git a/seed/openldap/applicationservice.yml b/seed/openldap/applicationservice.yml
index 92a7b859..56ac03f8 100644
--- a/seed/openldap/applicationservice.yml
+++ b/seed/openldap/applicationservice.yml
@@ -2,5 +2,5 @@ format: '0.1'
 description: OpenLDAP, a LDAP server
 website: https://www.openldap.org/
 depends:
-  - ldap-client-fedora
+  - ldap-client
   - base-fedora-36
diff --git a/seed/piwigo/README.md b/seed/piwigo/README.md
index 268c987c..e5be7c57 100644
--- a/seed/piwigo/README.md
+++ b/seed/piwigo/README.md
@@ -22,13 +22,7 @@ Piwigo, a photo management software.
         - [base](../base/README.md)
         - [dns-local](../dns-local/README.md)
 - [mariadb-client](../mariadb-client/README.md)
-- [ldap-client-fedora](../ldap-client-fedora/README.md)
-  - [ldap-client](../ldap-client/README.md)
-  - [base-fedora](../base-fedora/README.md)
-    - [systemd](../systemd/README.md)
-      - [base-machine](../base-machine/README.md)
-        - [base](../base/README.md)
-        - [dns-local](../dns-local/README.md)
+- [ldap-client](../ldap-client/README.md)
 - [redis-client](../redis-client/README.md)
 - [oauth2-client](../oauth2-client/README.md)
 - [relay-mail-client](../relay-mail-client/README.md)
diff --git a/seed/piwigo/applicationservice.yml b/seed/piwigo/applicationservice.yml
index e056d118..2f48c9b8 100644
--- a/seed/piwigo/applicationservice.yml
+++ b/seed/piwigo/applicationservice.yml
@@ -4,7 +4,7 @@ website: http://piwigo.org/
 depends:
   - base-fedora-36
   - mariadb-client
-  - ldap-client-fedora
+  - ldap-client
   - redis-client
   - oauth2-client
   - relay-mail-client
diff --git a/seed/roundcube/README.md b/seed/roundcube/README.md
index c2e496b7..163b1cba 100644
--- a/seed/roundcube/README.md
+++ b/seed/roundcube/README.md
@@ -30,13 +30,7 @@ Roundcube, a webmail.
   - [reverse-proxy-client](../reverse-proxy-client/README.md)
 - [php-fpm](../php-fpm/README.md)
   - [php](../php/README.md)
-- [ldap-client-fedora](../ldap-client-fedora/README.md)
-  - [ldap-client](../ldap-client/README.md)
-  - [base-fedora](../base-fedora/README.md)
-    - [systemd](../systemd/README.md)
-      - [base-machine](../base-machine/README.md)
-        - [base](../base/README.md)
-        - [dns-local](../dns-local/README.md)
+- [ldap-client](../ldap-client/README.md)
 
 ## Variables
 
diff --git a/seed/roundcube/applicationservice.yml b/seed/roundcube/applicationservice.yml
index bd01b569..8a0689b0 100644
--- a/seed/roundcube/applicationservice.yml
+++ b/seed/roundcube/applicationservice.yml
@@ -9,4 +9,4 @@ depends:
   - oauth2-client
   - nginx-https
   - php-fpm
-  - ldap-client-fedora
+  - ldap-client