diff --git a/basic-system/defaults/main.yml b/basic-system/defaults/main.yml index 94731f21a8f1af048f8ae4c331eb238089230b46..232a4d9ad9a06f0fce030593f367a3f04b587883 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 98402327cd29d7cc063f898116ea18373cd5c26b..2910dc865fb79626a9179e08b6b0309ad6193e0c 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 84360828630f6c07313b085bfbefcbfa9927dbbf..57f23f7d34e133b812cb917bdad354e3ea5d7f3f 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: diff --git a/localization/defaults/main.yml b/localization/defaults/main.yml index 808188ac29a35080bcc1a6e8585f42f297669804..18228fa03120b0878ed567597733e024842c2535 100644 --- a/localization/defaults/main.yml +++ b/localization/defaults/main.yml @@ -1,9 +1,10 @@ --- localization_enabled_locales: - - en_US - de_DE - en_DK + - en_GB + - en_US localization_locale: locales/en localization_vconsole: vconsole.conf