Skip to content
Snippets Groups Projects
Commit a493e1f9 authored by Thomas Schneider's avatar Thomas Schneider
Browse files

Merge branch 'th/dev' into 'master'

Locales, optional journal and hosts config

See merge request !3
parents 64ebfaeb 37c33ee0
Branches
No related tags found
1 merge request!3Locales, optional journal and hosts config
Pipeline #1704 passed
...@@ -4,3 +4,5 @@ dns_hostname_fqdn: false ...@@ -4,3 +4,5 @@ dns_hostname_fqdn: false
hosts_alternates: [] hosts_alternates: []
hosts_additionals: [] hosts_additionals: []
etckeeper: true etckeeper: true
rsyslog_needed: false
hosts_precious: false
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
when: when:
- syslogserver is not defined or syslogserver.split(":")[0] != ansible_fqdn - syslogserver is not defined or syslogserver.split(":")[0] != ansible_fqdn
- ansible_distribution_major_version|int >= 9 - ansible_distribution_major_version|int >= 9
- not rsyslog_needed
register: syslog_provider register: syslog_provider
tags: tags:
- syslog - syslog
......
...@@ -45,6 +45,7 @@ ...@@ -45,6 +45,7 @@
template: template:
src: hosts.j2 src: hosts.j2
dest: /etc/hosts dest: /etc/hosts
when: not hosts_precious
notify: notify:
- gather network facts once again - gather network facts once again
tags: tags:
......
--- ---
localization_enabled_locales: localization_enabled_locales:
- en_US
- de_DE - de_DE
- en_DK - en_DK
- en_GB
- en_US
localization_locale: locales/en localization_locale: locales/en
localization_vconsole: vconsole.conf localization_vconsole: vconsole.conf
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment