aboutsummaryrefslogtreecommitdiffstats
path: root/roles/debian/tasks/apt.yml
diff options
context:
space:
mode:
Diffstat (limited to 'roles/debian/tasks/apt.yml')
-rw-r--r--roles/debian/tasks/apt.yml18
1 files changed, 16 insertions, 2 deletions
diff --git a/roles/debian/tasks/apt.yml b/roles/debian/tasks/apt.yml
index b3d0851..82bbedd 100644
--- a/roles/debian/tasks/apt.yml
+++ b/roles/debian/tasks/apt.yml
@@ -16,6 +16,8 @@
mode: 0755
- name: Remove packages
+ vars:
+ apt_packages: '{{ apt_packages_default|combine(apt_packages_role) }}'
apt:
name: "{{ apt_packages|dictsort(true)|selectattr(1,'equalto','absent')|map(attribute=0)|list }}"
state: absent
@@ -25,6 +27,8 @@
- packages
- name: Create /etc/apt/preferences.d
+ vars:
+ apt_preferences: '{{ apt_preferences_default|combine(apt_preferences_role) }}'
template:
dest: '/etc/apt/preferences.d/{{ item.key }}'
src: apt-preferences.j2
@@ -35,6 +39,8 @@
when: item.value
- name: Remove /etc/apt/preferences.d
+ vars:
+ apt_preferences: '{{ apt_preferences_default|combine(apt_preferences_role) }}'
file:
path: '/etc/apt/preferences.d/{{ item.key }}'
state: absent
@@ -42,21 +48,27 @@
when: not item.value
- name: Configure /etc/apt/sources.list
+ vars:
+ apt_repos: '{{ apt_repos_default|combine(apt_repos_role) }}'
+ apt_sources: '{{ apt_sources_default|combine(apt_sources_role) }}'
template:
dest: '/etc/apt/sources.list'
src: sources.list.j2
owner: root
group: root
mode: 0644
- when: apt_sources is defined
+ when: 'apt_sources|length > 0'
- name: Download repository keys
+ vars:
+ apt_repos: '{{ apt_repos_default|combine(apt_repos_role) }}'
+ apt_sources: '{{ apt_sources_default|combine(apt_sources_role) }}'
apt_key:
url: "{{ apt_repos[item.key]['key_url'] }}"
id: "{{ apt_repos[item.key]['key_id'] }}"
state: present
with_dict: '{{ apt_sources }}'
- when: apt_sources is defined and 'key_url' in apt_repos[item.key]
+ when: "'key_url' in apt_repos[item.key]"
- name: Update apt cache
apt:
@@ -66,6 +78,8 @@
- packages
- name: Install packages
+ vars:
+ apt_packages: '{{ apt_packages_default | combine(apt_packages_role) }}'
apt:
name: "{{ apt_packages|dictsort(true)|selectattr(1,'equalto','present')|map(attribute=0)|list }}"
state: present