From 0220ace94a589ca8db351769e74626cbaa5c12ca Mon Sep 17 00:00:00 2001 From: Rene Date: Sat, 2 Jul 2022 17:05:49 +0200 Subject: [PATCH] moved polupating /etc/hosts to role "base" --- roles/base/tasks/main.yml | 1 + roles/{server => base}/tasks/system_setup/hosts.yml | 0 roles/server/tasks/main.yml | 7 +++---- 3 files changed, 4 insertions(+), 4 deletions(-) rename roles/{server => base}/tasks/system_setup/hosts.yml (100%) diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml index 5a683f9..6635435 100644 --- a/roles/base/tasks/main.yml +++ b/roles/base/tasks/main.yml @@ -8,6 +8,7 @@ msg: Debug # basics - import_tasks: system_setup/hostname.yml + - include_tasks: system_setup/hosts.yml - import_tasks: system_setup/git.yml # install software # - import_tasks: software/repositories.yml diff --git a/roles/server/tasks/system_setup/hosts.yml b/roles/base/tasks/system_setup/hosts.yml similarity index 100% rename from roles/server/tasks/system_setup/hosts.yml rename to roles/base/tasks/system_setup/hosts.yml diff --git a/roles/server/tasks/main.yml b/roles/server/tasks/main.yml index c79eca4..7060e9d 100644 --- a/roles/server/tasks/main.yml +++ b/roles/server/tasks/main.yml @@ -7,7 +7,6 @@ ignore_errors: True - block: - - include_tasks: system_setup/hosts.yml - include_tasks: utilities/ssmtp.yml - include_tasks: utilities/netdata.yml when: netdata is defined and netdata == true @@ -23,8 +22,8 @@ - ansible_default_ipv4.address | ipaddr('public') ignore_errors: True - include_tasks: system_setup/cron.yml - - include_role: - name: base - tasks_from: users.yml + # - include_role: + # name: base + # tasks_from: users.yml # vim: ts=2 sw=2 \ No newline at end of file