Prefix base role variables
This commit is contained in:
@@ -9,12 +9,12 @@
|
||||
- name: Import Firewall tasks
|
||||
ansible.builtin.import_tasks: firewall.yml
|
||||
tags: firewall
|
||||
when: manage_firewall
|
||||
when: base_manage_firewall
|
||||
|
||||
- name: Import Network tasks
|
||||
ansible.builtin.import_tasks: network.yml
|
||||
tags: network
|
||||
when: manage_network
|
||||
when: base_manage_network
|
||||
|
||||
- name: Import Mail tasks
|
||||
ansible.builtin.import_tasks: mail.yml
|
||||
|
||||
@@ -43,4 +43,4 @@
|
||||
from: "{{ item }}"
|
||||
state: enabled
|
||||
loop: "{{ samba.firewall }}"
|
||||
when: manage_firewall
|
||||
when: base_manage_firewall
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
- name: Install useful software
|
||||
ansible.builtin.apt:
|
||||
name: "{{ packages }}"
|
||||
name: "{{ base_packages }}"
|
||||
state: present
|
||||
update_cache: true
|
||||
|
||||
@@ -127,7 +127,7 @@
|
||||
|
||||
- name: Generate locale
|
||||
community.general.locale_gen:
|
||||
name: "{{ locale_default }}"
|
||||
name: "{{ base_locale_default }}"
|
||||
state: present
|
||||
notify: reconfigure_locales
|
||||
|
||||
@@ -135,7 +135,7 @@
|
||||
ansible.builtin.lineinfile:
|
||||
path: /etc/default/locale
|
||||
regexp: "^LANG="
|
||||
line: "LANG={{ locale_default }}"
|
||||
line: "LANG={{ base_locale_default }}"
|
||||
|
||||
- name: Manage root authorized_keys
|
||||
ansible.builtin.template:
|
||||
|
||||
Reference in New Issue
Block a user