diff options
Diffstat (limited to 'roles/sane_debian_system/tasks')
| -rw-r--r-- | roles/sane_debian_system/tasks/apt.yml | 5 | ||||
| -rw-r--r-- | roles/sane_debian_system/tasks/env.yml | 15 | ||||
| -rw-r--r-- | roles/sane_debian_system/tasks/main.yml | 7 |
3 files changed, 14 insertions, 13 deletions
diff --git a/roles/sane_debian_system/tasks/apt.yml b/roles/sane_debian_system/tasks/apt.yml index 9bf6086..0da3332 100644 --- a/roles/sane_debian_system/tasks/apt.yml +++ b/roles/sane_debian_system/tasks/apt.yml @@ -16,8 +16,6 @@ - name: update package lists shell: | apt-get update --allow-releaseinfo-change - args: - warn: false - name: update package lists ignore_errors: yes @@ -74,8 +72,7 @@ - name: update package lists shell: | apt-get update --allow-releaseinfo-change - args: - warn: false + - name: add archive keyrings with_items: "{{ sane_debian_system_sources_lists }}" diff --git a/roles/sane_debian_system/tasks/env.yml b/roles/sane_debian_system/tasks/env.yml index 20f93ef..eedd864 100644 --- a/roles/sane_debian_system/tasks/env.yml +++ b/roles/sane_debian_system/tasks/env.yml @@ -14,13 +14,6 @@ name: "{{ sane_debian_system_hostname }}" when: sane_debian_system_hostname != "" -- name: add hostname to /etc/hosts - lineinfile: - dest: /etc/hosts - regexp: '^127\.0\.1\.1 ' - line: "127.0.1.1 {{ sane_debian_system_hostname }}" - when: sane_debian_system_hostname is defined - - name: set timezone timezone: name: "{{ sane_debian_system_timezone }}" @@ -31,6 +24,14 @@ name: - locales +- name: install systemd-timesyncd or ntp + shell: | + if apt-cache show systemd-timesyncd > /dev/null; then + DEBIAN_FRONTEND=noninteractife apt-get install -y systemd-timesyncd + else + DEBIAN_FRONTEND=noninteractife apt-get install -y ntp + fi + - name: generate locales locale_gen: name: "{{ item }}" diff --git a/roles/sane_debian_system/tasks/main.yml b/roles/sane_debian_system/tasks/main.yml index 30a3f0c..bc8c6d3 100644 --- a/roles/sane_debian_system/tasks/main.yml +++ b/roles/sane_debian_system/tasks/main.yml @@ -3,5 +3,8 @@ [ "{{ sane_debian_system_version }}" = "2" ] || \ (echo "Unexpected version {{ sane_debian_system_version }}" 1>&2; exit 1) -- include: apt.yml -- include: env.yml +- ansible.builtin.import_tasks: + file: apt.yml + +- ansible.builtin.import_tasks: + file: env.yml |