From 3dea14759d7f6cd365c6bad3d134d2d604018db9 Mon Sep 17 00:00:00 2001
From: Tobias Stein <tobias_stein@rockstable.it>
Date: Sat, 10 Dec 2022 20:08:55 +0100
Subject: [PATCH] Gather fai "/etc" configuration in one file

---
 roles/fai/tasks/fai-etc-dir.yml | 52 ++++++++++++++++++++++++++++-----
 1 file changed, 44 insertions(+), 8 deletions(-)

diff --git a/roles/fai/tasks/fai-etc-dir.yml b/roles/fai/tasks/fai-etc-dir.yml
index 0639d7f..8a1e065 100644
--- a/roles/fai/tasks/fai-etc-dir.yml
+++ b/roles/fai/tasks/fai-etc-dir.yml
@@ -13,18 +13,33 @@
     - fai_conf
 
 ### "/etc/fai/apt" GETS COPIED TO NFSROOT BY "fai-make-nfsroot"
+
+- name: "Create apt configuration directories for nfsroot"
+  become: true
+  vars:
+    paths:
+      - "{{ fai_etc_dir }}/apt/sources.list.d"
+      - "{{ fai_etc_dir }}/apt/preferences.d"
+  ansible.builtin.file:
+    path: "{{ item }}"
+    state: directory
+    owner: root
+    group: root
+    mode: '0755'
+  loop: "{{ paths }}"
+
 - name: "Copy hosts '{{ src }}' to nfsroot"
   become: true
   vars:
-    src: "/etc/apt/sources.list.d"
-    dest: "/etc/fai/apt/sources.list.d"
+    src: "/etc/apt/sources.list.d/"
+    dest: "{{ fai_etc_dir }}/apt/sources.list.d"
   ansible.builtin.copy:
     remote_src: true
-    recursive: true
     src: "{{ src }}"
     dest: "{{ dest }}"
     owner: root
     group: root
+    mode: '0755'
   when:
     - debian_release_fai == debian_release_nfsroot
   notify:
@@ -36,8 +51,8 @@
   become: true
   vars:
     paths:
-      - "/etc/fai/apt/sources.list"
-      - "/etc/fai/apt/sources.list~"
+      - "{{ fai_etc_dir }}/apt/sources.list"
+      - "{{ fai_etc_dir }}/apt/sources.list~"
   ansible.builtin.file:
     path: "{{ item }}"
     state: absent
@@ -89,6 +104,8 @@
     owner: root
     group: root
     mode: "0644"
+  when:
+    - debian_release_fai == debian_release_nfsroot
   notify:
     - Force rebuild nfsroot
   tags:
@@ -109,9 +126,28 @@
   notify:
     - Force rebuild nfsroot
   when:
-    - falsen
-  notify:
-    - Force rebuild nfsroot
+    - debian_release_fai != debian_release_nfsroot
+
+- name: "Create configuration for nfsroot"
+  become: true
+  ansible.builtin.template:
+    src: "etc/fai/nfsroot.conf.j2"
+    dest: "{{ fai_etc_dir }}/nfsroot.conf"
+    owner: root
+    group: root
+    mode: '0644'
+  notify:
+    - Force rebuild nfsroot
+
+- name: "Create package_config for nfsroot"
+  become: true
+  ansible.builtin.template:
+    src: "etc/fai/NFSROOT.j2"
+    dest: "{{ fai_etc_dir }}/NFSROOT"
+    owner: root
+    group: root
+    mode: '0644'
+  register: "etc_fai_NFSROOT"
   notify:
     - Force rebuild nfsroot