improve handling of apt-repo providers

11 files changed, 36 insertions, 31 deletions

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(' ') }}
diff --git a/roles/installer/debian/fetch/defaults/main.yml b/roles/installer/debian/fetch/defaults/main.yml
index eebc59bf..1b9f8206 100644
--- a/roles/installer/debian/fetch/defaults/main.yml
+++ b/roles/installer/debian/fetch/defaults/main.yml
@@ -6,7 +6,5 @@ debian_installer_arch: amd64
 
 debian_installer_force_download: no
 debian_installer_url:
-#  debian: "https://debian.ffgraz.net/debian"
-#  ubuntu: "https://debian.ffgraz.net/ubuntu"
-  debian: "http://deb.debian.org/debian"
-  ubuntu: "http://archive.ubuntu.com/ubuntu"
+  debian: "http://{{ apt_repo_providers[apt_repo_provider].debian.host }}{{ apt_repo_providers[apt_repo_provider].debian.path }}"
+  ubuntu: "http://{{ apt_repo_providers[apt_repo_provider].ubuntu.host }}{{ apt_repo_providers[apt_repo_provider].ubuntu.path }}"
diff --git a/roles/installer/debian/preseed/templates/preseed_debian-buster.cfg.j2 b/roles/installer/debian/preseed/templates/preseed_debian-buster.cfg.j2
index a6e7b3fc..ad421b78 100644
--- a/roles/installer/debian/preseed/templates/preseed_debian-buster.cfg.j2
+++ b/roles/installer/debian/preseed/templates/preseed_debian-buster.cfg.j2
@@ -31,8 +31,8 @@ d-i netcfg/wireless_wep string
 
 
 d-i mirror/country string manual
-d-i mirror/http/hostname string {{ apt_repo_providers[hostvars[install_hostname].apt_repo_provider].debian }}
-d-i mirror/http/directory string /debian
+d-i mirror/http/hostname string {{ apt_repo_providers[hostvars[install_hostname].apt_repo_provider].debian.host }}
+d-i mirror/http/directory string {{ apt_repo_providers[hostvars[install_hostname].apt_repo_provider].debian.path }}
 d-i mirror/http/proxy string
 
 
@@ -50,7 +50,8 @@ d-i clock-setup/ntp boolean false
 
 
 d-i base-installer/install-recommends boolean false
-d-i apt-setup/security_host string {{ apt_repo_providers[hostvars[install_hostname].apt_repo_provider].debian }}
+d-i apt-setup/security_host string {{ apt_repo_providers[hostvars[install_hostname].apt_repo_provider].debian_security.host }}
+d-i apt-setup/security_path string {{ apt_repo_providers[hostvars[install_hostname].apt_repo_provider].debian_security.path }}
 
 tasksel tasksel/first multiselect
 d-i pkgsel/include string openssh-server {{ hostvars[install_hostname].python_basename }} {{ hostvars[install_hostname].python_basename }}-apt
diff --git a/roles/installer/debian/preseed/templates/preseed_debian-jessie.cfg.j2 b/roles/installer/debian/preseed/templates/preseed_debian-jessie.cfg.j2
index bb275e98..cc1f5037 100644
--- a/roles/installer/debian/preseed/templates/preseed_debian-jessie.cfg.j2
+++ b/roles/installer/debian/preseed/templates/preseed_debian-jessie.cfg.j2
@@ -31,8 +31,8 @@ d-i netcfg/wireless_wep string
 
 
 d-i mirror/country string manual
-d-i mirror/http/hostname string archive.debian.org
-d-i mirror/http/directory string /debian
+d-i mirror/http/hostname string {{ apt_repo_providers[hostvars[install_hostname].apt_repo_provider].debian_archive.host }}
+d-i mirror/http/directory string {{ apt_repo_providers[hostvars[install_hostname].apt_repo_provider].debian_archive.path }}
 d-i mirror/http/proxy string
 
 
@@ -51,6 +51,7 @@ d-i clock-setup/ntp boolean false
 
 d-i base-installer/install-recommends boolean false
 d-i apt-setup/security_host string
+#d-i apt-setup/security_host string
 
 tasksel tasksel/first multiselect
 d-i pkgsel/include string openssh-server {{ hostvars[install_hostname].python_basename }} {{ hostvars[install_hostname].python_basename }}-apt
diff --git a/roles/installer/debian/preseed/templates/preseed_debian-stretch.cfg.j2 b/roles/installer/debian/preseed/templates/preseed_debian-stretch.cfg.j2
index fc41e876..773ebbb1 100644
--- a/roles/installer/debian/preseed/templates/preseed_debian-stretch.cfg.j2
+++ b/roles/installer/debian/preseed/templates/preseed_debian-stretch.cfg.j2
@@ -31,8 +31,8 @@ d-i netcfg/wireless_wep string
 
 
 d-i mirror/country string manual
-d-i mirror/http/hostname string {{ apt_repo_providers[hostvars[install_hostname].apt_repo_provider].debian }}
-d-i mirror/http/directory string /debian
+d-i mirror/http/hostname string {{ apt_repo_providers[hostvars[install_hostname].apt_repo_provider].debian.host }}
+d-i mirror/http/directory string {{ apt_repo_providers[hostvars[install_hostname].apt_repo_provider].debian.path }}
 d-i mirror/http/proxy string
 
 
@@ -50,7 +50,8 @@ d-i clock-setup/ntp boolean false
 
 
 d-i base-installer/install-recommends boolean false
-d-i apt-setup/security_host string {{ apt_repo_providers[hostvars[install_hostname].apt_repo_provider].debian }}
+d-i apt-setup/security_host string {{ apt_repo_providers[hostvars[install_hostname].apt_repo_provider].debian_security.host }}
+d-i apt-setup/security_path string {{ apt_repo_providers[hostvars[install_hostname].apt_repo_provider].debian_security.path }}
 
 tasksel tasksel/first multiselect
 d-i pkgsel/include string openssh-server {{ hostvars[install_hostname].python_basename }} {{ hostvars[install_hostname].python_basename }}-apt
diff --git a/roles/installer/debian/preseed/templates/preseed_ubuntu-bionic.cfg.j2 b/roles/installer/debian/preseed/templates/preseed_ubuntu-bionic.cfg.j2
index 7a21c082..019e9fcb 100644
--- a/roles/installer/debian/preseed/templates/preseed_ubuntu-bionic.cfg.j2
+++ b/roles/installer/debian/preseed/templates/preseed_ubuntu-bionic.cfg.j2
@@ -38,8 +38,8 @@ d-i netcfg/wireless_wep string
 
 
 d-i mirror/country string manual
-d-i mirror/http/hostname string {{ apt_repo_providers[hostvars[install_hostname].apt_repo_provider].ubuntu }}
-d-i mirror/http/directory string /ubuntu
+d-i mirror/http/hostname string {{ apt_repo_providers[hostvars[install_hostname].apt_repo_provider].ubuntu.host }}
+d-i mirror/http/directory string {{ apt_repo_providers[hostvars[install_hostname].apt_repo_provider].ubuntu.path }}
 d-i mirror/http/proxy string
 
 
@@ -58,7 +58,8 @@ d-i clock-setup/ntp boolean false
 
 
 d-i base-installer/install-recommends boolean false
-d-i apt-setup/security_host string {{ apt_repo_providers[hostvars[install_hostname].apt_repo_provider].ubuntu }}
+d-i apt-setup/security_host string {{ apt_repo_providers[hostvars[install_hostname].apt_repo_provider].ubuntu.host }}
+d-i apt-setup/security_path string {{ apt_repo_providers[hostvars[install_hostname].apt_repo_provider].ubuntu.path }}
 {% if hostvars[install_hostname].install_cooked.arch | default('amd64') == 'amd64' %}
 d-i apt-setup/multiarch string amd64
 {% endif %}
diff --git a/roles/installer/debian/preseed/templates/preseed_ubuntu-focal.cfg.j2 b/roles/installer/debian/preseed/templates/preseed_ubuntu-focal.cfg.j2
index 9280e3ca..59bb5282 100644
--- a/roles/installer/debian/preseed/templates/preseed_ubuntu-focal.cfg.j2
+++ b/roles/installer/debian/preseed/templates/preseed_ubuntu-focal.cfg.j2
@@ -38,8 +38,8 @@ d-i netcfg/wireless_wep string
 
 
 d-i mirror/country string manual
-d-i mirror/http/hostname string {{ apt_repo_providers[hostvars[install_hostname].apt_repo_provider].ubuntu }}
-d-i mirror/http/directory string /ubuntu
+d-i mirror/http/hostname string {{ apt_repo_providers[hostvars[install_hostname].apt_repo_provider].ubuntu.host }}
+d-i mirror/http/directory string {{ apt_repo_providers[hostvars[install_hostname].apt_repo_provider].ubuntu.path }}
 d-i mirror/http/proxy string
 
 
@@ -58,7 +58,8 @@ d-i clock-setup/ntp boolean false
 
 
 d-i base-installer/install-recommends boolean false
-d-i apt-setup/security_host string {{ apt_repo_providers[hostvars[install_hostname].apt_repo_provider].ubuntu }}
+d-i apt-setup/security_host string {{ apt_repo_providers[hostvars[install_hostname].apt_repo_provider].ubuntu.host }}
+d-i apt-setup/security_path string {{ apt_repo_providers[hostvars[install_hostname].apt_repo_provider].ubuntu.path }}
 {% if hostvars[install_hostname].install_cooked.arch | default('amd64') == 'amd64' %}
 d-i apt-setup/multiarch string amd64
 {% endif %}
diff --git a/roles/installer/debian/preseed/templates/preseed_ubuntu-xenial.cfg.j2 b/roles/installer/debian/preseed/templates/preseed_ubuntu-xenial.cfg.j2
index 758cf961..4b144cef 100644
--- a/roles/installer/debian/preseed/templates/preseed_ubuntu-xenial.cfg.j2
+++ b/roles/installer/debian/preseed/templates/preseed_ubuntu-xenial.cfg.j2
@@ -35,8 +35,8 @@ d-i netcfg/wireless_wep string
 
 
 d-i mirror/country string manual
-d-i mirror/http/hostname string {{ apt_repo_providers[hostvars[install_hostname].apt_repo_provider].ubuntu }}
-d-i mirror/http/directory string /ubuntu
+d-i mirror/http/hostname string {{ apt_repo_providers[hostvars[install_hostname].apt_repo_provider].ubuntu.host }}
+d-i mirror/http/directory string {{ apt_repo_providers[hostvars[install_hostname].apt_repo_provider].ubuntu.path }}
 d-i mirror/http/proxy string
 
 
@@ -55,7 +55,8 @@ d-i clock-setup/ntp boolean false
 
 
 d-i base-installer/install-recommends boolean false
-d-i apt-setup/security_host string {{ apt_repo_providers[hostvars[install_hostname].apt_repo_provider].ubuntu }}
+d-i apt-setup/security_host string {{ apt_repo_providers[hostvars[install_hostname].apt_repo_provider].ubuntu.host }}
+d-i apt-setup/security_path string {{ apt_repo_providers[hostvars[install_hostname].apt_repo_provider].ubuntu.path }}
 {% if hostvars[install_hostname].install_cooked.arch | default('amd64') == 'amd64' %}
 d-i apt-setup/multiarch string amd64
 {% endif %}
diff --git a/roles/installer/debian/preseed/templates/preseed_xubuntu-focal-desktop.cfg.j2 b/roles/installer/debian/preseed/templates/preseed_xubuntu-focal-desktop.cfg.j2
index 5eafb358..66974576 100644
--- a/roles/installer/debian/preseed/templates/preseed_xubuntu-focal-desktop.cfg.j2
+++ b/roles/installer/debian/preseed/templates/preseed_xubuntu-focal-desktop.cfg.j2
@@ -41,8 +41,8 @@ d-i netcfg/wireless_wep string
 
 
 d-i mirror/country string manual
-d-i mirror/http/hostname string {{ apt_repo_providers[hostvars[install_hostname].apt_repo_provider].ubuntu }}
-d-i mirror/http/directory string /ubuntu
+d-i mirror/http/hostname string {{ apt_repo_providers[hostvars[install_hostname].apt_repo_provider].ubuntu.host }}
+d-i mirror/http/directory string {{ apt_repo_providers[hostvars[install_hostname].apt_repo_provider].ubuntu.path }}
 d-i mirror/http/proxy string
 
 
@@ -61,7 +61,8 @@ d-i clock-setup/ntp boolean false
 
 
 d-i base-installer/install-recommends boolean false
-d-i apt-setup/security_host string {{ apt_repo_providers[hostvars[install_hostname].apt_repo_provider].ubuntu }}
+d-i apt-setup/security_host string {{ apt_repo_providers[hostvars[install_hostname].apt_repo_provider].ubuntu.host }}
+d-i apt-setup/security_path string {{ apt_repo_providers[hostvars[install_hostname].apt_repo_provider].ubuntu.path }}
 {% if hostvars[install_hostname].install_cooked.arch | default('amd64') == 'amd64' %}
 d-i apt-setup/multiarch string amd64
 {% endif %}