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 --- .../debian/preseed/templates/preseed_debian-buster.cfg.j2 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'roles/installer/debian/preseed/templates/preseed_debian-buster.cfg.j2') 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 -- cgit v1.2.3