diff --git a/playbooks/debian.yml b/playbooks/debian.yml index 3531330..f1ef67f 100644 --- a/playbooks/debian.yml +++ b/playbooks/debian.yml @@ -2,6 +2,10 @@ hosts: all vars_files: ../vault.yml tasks: + - name: Configure virtual machine or host + import_role: + name: debian-host + when: ansible_virtualization_role == 'host' or ansible_virtualization_type == 'kvm' - name: Configure base system import_role: name: debian-base @@ -13,7 +17,3 @@ import_role: name: debian-qemu when: ansible_virtualization_role == 'guest' and ansible_virtualization_type == 'kvm' - - name: Configure virtual machine or host - import_role: - name: debian-host - when: ansible_virtualization_role == 'host' or ansible_virtualization_type == 'kvm' diff --git a/roles/debian-base/tasks/defuser.yaml b/roles/debian-base/tasks/defuser.yml similarity index 100% rename from roles/debian-base/tasks/defuser.yaml rename to roles/debian-base/tasks/defuser.yml diff --git a/roles/debian-host/tasks/apparmor.yml b/roles/debian-host/tasks/apparmor.yml new file mode 100644 index 0000000..38a2e8f --- /dev/null +++ b/roles/debian-host/tasks/apparmor.yml @@ -0,0 +1,5 @@ +- name: Disable AppArmor + service: + name: apparmor + state: stopped + enabled: no diff --git a/roles/debian-host/tasks/hostname.yml b/roles/debian-host/tasks/hostname.yml index 71c9e4a..799a81f 100644 --- a/roles/debian-host/tasks/hostname.yml +++ b/roles/debian-host/tasks/hostname.yml @@ -1,8 +1,8 @@ -- name: Set the hostname in /etc/hostname +- name: Set the hostname hostname: name: "{{ inventory_hostname_short }}" use: debian -- name: Configure hostname in hosts +- name: Configure hosts file blockinfile: path: /etc/hosts marker_begin: '--- BEGIN VN ---' diff --git a/roles/debian-host/tasks/main.yml b/roles/debian-host/tasks/main.yml index 7f49737..e4f179a 100644 --- a/roles/debian-host/tasks/main.yml +++ b/roles/debian-host/tasks/main.yml @@ -2,3 +2,5 @@ tags: hostname - import_tasks: sysctl.yml tags: sysctl +- import_tasks: apparmor.yml + tags: apparmor