From dd8453ff1c1c7848ede270780a74212bbdb07035 Mon Sep 17 00:00:00 2001
From: Thomas Schneider <tschneider@asta.rwth-aachen.de>
Date: Thu, 12 Dec 2019 15:45:35 +0100
Subject: [PATCH] basic-system: Configure journal and hosts only optionally

---
 basic-system/defaults/main.yml | 2 ++
 basic-system/tasks/logging.yml | 1 +
 basic-system/tasks/network.yml | 1 +
 3 files changed, 4 insertions(+)

diff --git a/basic-system/defaults/main.yml b/basic-system/defaults/main.yml
index 94731f2..232a4d9 100644
--- a/basic-system/defaults/main.yml
+++ b/basic-system/defaults/main.yml
@@ -4,3 +4,5 @@ dns_hostname_fqdn: false
 hosts_alternates: []
 hosts_additionals: []
 etckeeper: true
+rsyslog_needed: false
+hosts_precious: false
diff --git a/basic-system/tasks/logging.yml b/basic-system/tasks/logging.yml
index 9840232..2910dc8 100644
--- a/basic-system/tasks/logging.yml
+++ b/basic-system/tasks/logging.yml
@@ -18,6 +18,7 @@
   when:
     - syslogserver is not defined or syslogserver.split(":")[0] != ansible_fqdn
     - ansible_distribution_major_version|int >= 9
+    - not rsyslog_needed
   register: syslog_provider
   tags:
     - syslog
diff --git a/basic-system/tasks/network.yml b/basic-system/tasks/network.yml
index 8436082..57f23f7 100644
--- a/basic-system/tasks/network.yml
+++ b/basic-system/tasks/network.yml
@@ -45,6 +45,7 @@
   template:
     src: hosts.j2
     dest: /etc/hosts
+  when: not hosts_precious
   notify:
     - gather network facts once again
   tags:
-- 
GitLab