From a9ae6e7d0731f19cf5d01a429a5b5b5b2e7e5d04 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Tue, 15 Sep 2020 20:39:22 +0200 Subject: improve handling of apt-repo providers --- roles/apt-repo/backports/tasks/main.yml | 2 +- roles/apt-repo/base/templates/Debian.list.j2 | 6 +++--- roles/apt-repo/base/templates/Ubuntu.list.j2 | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'roles/apt-repo') diff --git a/roles/apt-repo/backports/tasks/main.yml b/roles/apt-repo/backports/tasks/main.yml index 20854816..7f182ca7 100644 --- a/roles/apt-repo/backports/tasks/main.yml +++ b/roles/apt-repo/backports/tasks/main.yml @@ -2,7 +2,7 @@ - name: add repository entry copy: content: | - deb http://{{ apt_repo_providers[apt_repo_provider][(ansible_distribution | lower)] }}/{{ ansible_distribution | lower }} {{ ansible_distribution_release }}-backports {{ apt_repo_components | default(apt_repo_backports_components[(ansible_distribution | lower)]) | join(' ') }} + deb http://{{ apt_repo_providers[apt_repo_provider][(ansible_distribution | lower)].host }}{{ apt_repo_providers[apt_repo_provider][(ansible_distribution | lower)].path }} {{ ansible_distribution_release }}-backports {{ apt_repo_components | default(apt_repo_backports_components[(ansible_distribution | lower)]) | join(' ') }} dest: /etc/apt/sources.list.d/backports.list notify: update apt cache diff --git a/roles/apt-repo/base/templates/Debian.list.j2 b/roles/apt-repo/base/templates/Debian.list.j2 index 44b4abdd..a3cfae8a 100644 --- a/roles/apt-repo/base/templates/Debian.list.j2 +++ b/roles/apt-repo/base/templates/Debian.list.j2 @@ -1,3 +1,3 @@ -deb http://{{ apt_repo_providers[apt_repo_provider].debian }}/debian {{ ansible_distribution_release }} {{ apt_repo_components | default(apt_repo_base_components.debian) | join(' ') }} -deb http://{{ apt_repo_providers[apt_repo_provider].debian }}/debian {{ ansible_distribution_release }}-updates {{ apt_repo_components | default(apt_repo_base_components.debian) | join(' ') }} -deb http://{{ apt_repo_providers[apt_repo_provider].debian }}/debian-security {{ ansible_distribution_release }}/updates {{ apt_repo_components | default(apt_repo_base_components.debian) | join(' ') }} +deb http://{{ apt_repo_providers[apt_repo_provider].debian.host }}{{ apt_repo_providers[apt_repo_provider].debian.path }} {{ ansible_distribution_release }} {{ apt_repo_components | default(apt_repo_base_components.debian) | join(' ') }} +deb http://{{ apt_repo_providers[apt_repo_provider].debian.host }}{{ apt_repo_providers[apt_repo_provider].debian.path }} {{ ansible_distribution_release }}-updates {{ apt_repo_components | default(apt_repo_base_components.debian) | join(' ') }} +deb http://{{ apt_repo_providers[apt_repo_provider].debian_security.host }}{{ apt_repo_providers[apt_repo_provider].debian_security.path }} {{ ansible_distribution_release }}/updates {{ apt_repo_components | default(apt_repo_base_components.debian) | join(' ') }} diff --git a/roles/apt-repo/base/templates/Ubuntu.list.j2 b/roles/apt-repo/base/templates/Ubuntu.list.j2 index 2a336994..0fb4d04a 100644 --- a/roles/apt-repo/base/templates/Ubuntu.list.j2 +++ b/roles/apt-repo/base/templates/Ubuntu.list.j2 @@ -1,3 +1,3 @@ -deb http://{{ apt_repo_providers[apt_repo_provider].ubuntu }}/ubuntu {{ ansible_distribution_release }} {{ apt_repo_components | default(apt_repo_base_components.ubuntu) | join(' ') }} -deb http://{{ apt_repo_providers[apt_repo_provider].ubuntu }}/ubuntu {{ ansible_distribution_release }}-updates {{ apt_repo_components | default(apt_repo_base_components.ubuntu) | join(' ') }} -deb http://{{ apt_repo_providers[apt_repo_provider].ubuntu }}/ubuntu {{ ansible_distribution_release }}-security {{ apt_repo_components | default(apt_repo_base_components.ubuntu) | join(' ') }} +deb http://{{ apt_repo_providers[apt_repo_provider].ubuntu.host }}{{ apt_repo_providers[apt_repo_provider].ubuntu.path }} {{ ansible_distribution_release }} {{ apt_repo_components | default(apt_repo_base_components.ubuntu) | join(' ') }} +deb http://{{ apt_repo_providers[apt_repo_provider].ubuntu.host }}{{ apt_repo_providers[apt_repo_provider].ubuntu.path }} {{ ansible_distribution_release }}-updates {{ apt_repo_components | default(apt_repo_base_components.ubuntu) | join(' ') }} +deb http://{{ apt_repo_providers[apt_repo_provider].ubuntu.host }}{{ apt_repo_providers[apt_repo_provider].ubuntu.path }} {{ ansible_distribution_release }}-security {{ apt_repo_components | default(apt_repo_base_components.ubuntu) | join(' ') }} -- cgit v1.2.3