From eb4a7546a7d02e60eb05c09042080c54aa002a59 Mon Sep 17 00:00:00 2001
From: Joel Joos <joel.joos@adfinis.com>
Date: Fri, 30 Aug 2024 14:32:51 +0200
Subject: [PATCH] Revert to 2d02c87

---
 .github/workflows/molecule.yml | 30 ------------------------------
 tasks/main.yml                 | 18 +++++++++---------
 2 files changed, 9 insertions(+), 39 deletions(-)

diff --git a/.github/workflows/molecule.yml b/.github/workflows/molecule.yml
index 984c173..ff711dc 100644
--- a/.github/workflows/molecule.yml
+++ b/.github/workflows/molecule.yml
@@ -30,40 +30,10 @@ jobs:
             tag: "latest"
           - image: "debian"
             tag: "bullseye"
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-=======
->>>>>>> 0c684ef44136c4eee7cbdb074fedf7f75574b1d2
-          - image: "debian"
-            tag: "buster"
-          - image: "enterpriselinux"
-            tag: "8"
-          - image: "enterpriselinux"
-            tag: "latest"
-<<<<<<< HEAD
->>>>>>> bf7ea27 (chore(ci): update fedora versions (#2))
-=======
->>>>>>> 0c684ef44136c4eee7cbdb074fedf7f75574b1d2
           - image: "fedora"
             tag: "38"
           - image: "fedora"
             tag: "39"
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-=======
->>>>>>> 0c684ef44136c4eee7cbdb074fedf7f75574b1d2
-          # TODO no packages for fedora 40 yet: https://download.bareos.org/current/
-          # pipeline will fail for now. replace 38 as soon as 40 is ready and working.
-          - image: "fedora"
-            tag: "latest"
-          - image: "ubuntu"
-            tag: "latest"
-<<<<<<< HEAD
->>>>>>> bf7ea27 (chore(ci): update fedora versions (#2))
-=======
->>>>>>> 0c684ef44136c4eee7cbdb074fedf7f75574b1d2
           - image: "ubuntu"
             tag: "focal"
           - image: "ubuntu"
diff --git a/tasks/main.yml b/tasks/main.yml
index 00ae94d..34f7ba1 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -10,7 +10,7 @@
 - name: Import assert.yml
   ansible.builtin.import_tasks:
     file: assert.yml
-  run_once: true
+  run_once: yes
   delegate_to: localhost
 
 - name: Install requirements
@@ -67,16 +67,16 @@
 - name: Place TLS certificates
   ansible.builtin.copy:
     src: "{{ item.src }}"
-    dest: "{{ item.dest }}"
+    dest: "{{ item.dst }}"
     owner: bareos
     group: bareos
     mode: "0640"
-    backup: true
+    backup: "{{ bareos_dir_backup_configurations }}"
   loop:
-    - src: "{{ bareos_webui_tls_ca_cert_src }}"
-      dest: "{{ bareos_webui_tls_ca_cert_dest }}"
-    - src: "{{ bareos_webui_tls_cert_chain_src }}"
-      dest: "{{ bareos_webui_tls_cert_chain_dest }}"
+    - src: bareos_webui_tls_ca_cert_src
+      dest: bareos_webui_tls_ca_cert_dest
+    - src: bareos_webui_tls_cert_chain_src
+      dest: bareos_webui_tls_cert_chain_dest
   when:
     - bareos_webui_tls_enable
     - bareos_webui_tls_ca_cert_src != ""
@@ -85,8 +85,8 @@
 - name: Set SELinux boolean httpd_can_network_connect
   ansible.posix.seboolean:
     name: httpd_can_network_connect
-    state: true
-    persistent: true
+    state: yes
+    persistent: yes
   when:
     - ansible_selinux.status is defined
     - ansible_selinux.status == "enabled"