From 6dd625670ebe93df92948b481af2bba17fe73d82 Mon Sep 17 00:00:00 2001
From: Emmanuel Garette <egarette@cadoles.com>
Date: Fri, 1 Jul 2022 18:54:06 +0200
Subject: [PATCH] nsd with fedora 36

---
 .../dictionaries/11-fedora-version.xml        |  5 +++
 .../manual/image/preinstall/base_fedora_36.sh |  1 +
 .../templates/login                           |  0
 .../manual/image/preinstall/base_fedora.sh    |  2 +-
 .../base-machine/manual/install/diff.py       | 42 +++++++++++++++----
 .../base-machine/manual/install/install_host  |  2 +-
 .../2022.03.08/nsd/applicationservice.yml     |  2 +-
 .../peertube/dictionaries/30_peertube.xml     |  1 -
 8 files changed, 43 insertions(+), 12 deletions(-)
 create mode 100644 seed/applicationservice/2022.03.08/base-fedora-36/manual/image/preinstall/base_fedora_36.sh
 rename seed/applicationservice/2022.03.08/{peertube => base-fedora-36}/templates/login (100%)

diff --git a/seed/applicationservice/2022.03.08/base-fedora-36/dictionaries/11-fedora-version.xml b/seed/applicationservice/2022.03.08/base-fedora-36/dictionaries/11-fedora-version.xml
index 9e1b8cb0..24ace668 100644
--- a/seed/applicationservice/2022.03.08/base-fedora-36/dictionaries/11-fedora-version.xml
+++ b/seed/applicationservice/2022.03.08/base-fedora-36/dictionaries/11-fedora-version.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <rougail version="0.10">
+  <services>
+    <service name="base">
+      <file engine="none">/etc/pam.d/login</file>
+    </service>
+  </services>
   <variables>
     <variable name="os_version" type="string" description="Version de l'OS" hidden="True">
       <value>36</value>
diff --git a/seed/applicationservice/2022.03.08/base-fedora-36/manual/image/preinstall/base_fedora_36.sh b/seed/applicationservice/2022.03.08/base-fedora-36/manual/image/preinstall/base_fedora_36.sh
new file mode 100644
index 00000000..ca1aa9ac
--- /dev/null
+++ b/seed/applicationservice/2022.03.08/base-fedora-36/manual/image/preinstall/base_fedora_36.sh
@@ -0,0 +1 @@
+BASE_PKG="$BASE_PKG pam"
diff --git a/seed/applicationservice/2022.03.08/peertube/templates/login b/seed/applicationservice/2022.03.08/base-fedora-36/templates/login
similarity index 100%
rename from seed/applicationservice/2022.03.08/peertube/templates/login
rename to seed/applicationservice/2022.03.08/base-fedora-36/templates/login
diff --git a/seed/applicationservice/2022.03.08/base-fedora/manual/image/preinstall/base_fedora.sh b/seed/applicationservice/2022.03.08/base-fedora/manual/image/preinstall/base_fedora.sh
index 8ed111aa..1fbc878b 100644
--- a/seed/applicationservice/2022.03.08/base-fedora/manual/image/preinstall/base_fedora.sh
+++ b/seed/applicationservice/2022.03.08/base-fedora/manual/image/preinstall/base_fedora.sh
@@ -1,4 +1,4 @@
-BASE_PKG="systemd systemd-networkd systemd-resolved fedora-release-container lsof strace glibc-langpack-fr"
+BASE_PKG="systemd systemd-networkd systemd-resolved fedora-release-container lsof strace glibc-langpack-fr $BASE_PKG"
 INSTALL_TOOL="dnf"
 OS_NAME='fedora'
 REPO_DIR="$IMAGE_NAME_RISOTTO_IMAGE_DIR/etc/yum.repos.d/"
diff --git a/seed/applicationservice/2022.03.08/base-machine/manual/install/diff.py b/seed/applicationservice/2022.03.08/base-machine/manual/install/diff.py
index ef9c1a92..510dcc5d 100755
--- a/seed/applicationservice/2022.03.08/base-machine/manual/install/diff.py
+++ b/seed/applicationservice/2022.03.08/base-machine/manual/install/diff.py
@@ -5,6 +5,8 @@ from os.path import join
 from filecmp import dircmp
 from difflib import unified_diff
 from sys import stdout, argv
+from os import walk
+from os.path import join
 from datetime import datetime, timezone
 
 
@@ -13,16 +15,16 @@ OLD_DIR = argv[2]
 NEW_DIR = argv[3]
 WEBSITE = len(argv) != 5
 
-FILES = []
 def diff_files(dcmp):
+    files = []
     for name in dcmp.diff_files:
-        FILES.append(join(dcmp.right[len(NEW_DIR):], name))
+        files.append(join(dcmp.right[len(NEW_DIR):], name))
     for sub_dcmp in dcmp.subdirs.values():
-        diff_files(sub_dcmp)
+        files.extend(diff_files(sub_dcmp))
+    return files
 
 
 dcmp = dircmp(OLD_DIR, NEW_DIR)
-diff_files(dcmp) 
 
 date = datetime.now(timezone.utc).isoformat()
 title = f"Nouvelle version de la configuration de {os_name}"
@@ -42,18 +44,19 @@ authors = ["Automate"]
 [extra]
 lead = "{subtitle}."
 type = "installe"
-+++
-""")
++++""")
     TITLE = True
 else:
     TITLE = False
-for filename in FILES:
+
+
+for filename in diff_files(dcmp):
     if not TITLE:
         print(title)
         print("=" * len(title))
         print()
         TITLE = True
-    print(f'- mise à jour du fichier {filename} :\n')
+    print(f'\n- mise à jour du fichier {filename} :\n')
     try:
         with open(join(OLD_DIR, filename[1:]), 'r') as ori:
             ori_content = ori.readlines()
@@ -68,3 +71,26 @@ for filename in FILES:
             print(line.rstrip())
         if WEBSITE:
             print('```')
+
+
+old = set()
+new = set()
+for rootname, set_ in ((OLD_DIR, old), (NEW_DIR, new)):
+    len_rootname = len(rootname) + 1
+    for dirname, _, filenames in walk(rootname):
+         for filename in filenames:
+             set_.add(join(dirname[len_rootname:], filename))
+
+
+for filename in old - new:
+    print(f'\n- fichier {filename} supprimé.\n')
+
+
+for filename in new - old:
+    print(f'\n- fichier {filename} ajouté :\n')
+    with open(join(NEW_DIR, filename), 'r') as fh:
+        if WEBSITE:
+            print('```')
+        print(fh.read())
+        if WEBSITE:
+            print('```')
diff --git a/seed/applicationservice/2022.03.08/base-machine/manual/install/install_host b/seed/applicationservice/2022.03.08/base-machine/manual/install/install_host
index eb3b610a..35d83c45 100755
--- a/seed/applicationservice/2022.03.08/base-machine/manual/install/install_host
+++ b/seed/applicationservice/2022.03.08/base-machine/manual/install/install_host
@@ -5,7 +5,7 @@ if [ -z "$HOST_NAME" ]; then
     echo "usage: $0 host name"
     exit 1
 fi
-apt install --yes systemd-container dnf jq debootstrap htop gettext patch unzip mlocate
+apt install --yes systemd-container dnf jq debootstrap htop gettext patch unzip mlocate xz-utils
 systemd-tmpfiles --create --clean --remove $PWD/host/configurations/$HOST_NAME/tmpfiles.d/0asystemd-nspawn.conf
 systemd-tmpfiles --create --clean --remove $PWD/host/configurations/$HOST_NAME/tmpfiles.d/0rougail.conf
 systemctl daemon-reload
diff --git a/seed/applicationservice/2022.03.08/nsd/applicationservice.yml b/seed/applicationservice/2022.03.08/nsd/applicationservice.yml
index 9e35bd6d..8637ef57 100644
--- a/seed/applicationservice/2022.03.08/nsd/applicationservice.yml
+++ b/seed/applicationservice/2022.03.08/nsd/applicationservice.yml
@@ -2,5 +2,5 @@ format: '0.1'
 description: Configuration du serveur faisant autorité NSD
 service: true
 depends:
-  - base-fedora-35
+  - base-fedora-36
 provider: LocalDNS
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 8c315e92..b250e06e 100644
--- a/seed/applicationservice/2022.03.08/peertube/dictionaries/30_peertube.xml
+++ b/seed/applicationservice/2022.03.08/peertube/dictionaries/30_peertube.xml
@@ -6,7 +6,6 @@
       <file engine="none" source="sysuser-peertube.conf">/sysusers.d/0peertube.conf</file>
       <file engine="none" source="tmpfile-peertube.conf">/tmpfiles.d/0peertube.conf</file>
       <file>/etc/peertube/production.yaml</file>
-      <file engine="none">/etc/pam.d/login</file>
       <file source="nginx.peertube.conf">/etc/nginx/conf.d/peertube.conf</file>
     </service>
   </services>