From dfb7fef3fb85711d096c7894c941b9c356982d1e Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Sat, 8 Jun 2024 21:46:52 +0200
Subject: debian/installer: make gateway and nameservers optional

---
 .../debian/preseed/templates/preseed_debian-bookworm.cfg.j2       | 4 ++--
 .../debian/preseed/templates/preseed_debian-bullseye.cfg.j2       | 4 ++--
 .../debian/preseed/templates/preseed_debian-buster.cfg.j2         | 4 ++--
 .../debian/preseed/templates/preseed_debian-jessie.cfg.j2         | 8 ++++----
 .../debian/preseed/templates/preseed_debian-stretch.cfg.j2        | 4 ++--
 .../debian/preseed/templates/preseed_kali-kali-rolling.cfg.j2     | 4 ++--
 .../debian/preseed/templates/preseed_ubuntu-bionic.cfg.j2         | 4 ++--
 .../debian/preseed/templates/preseed_ubuntu-focal.cfg.j2          | 4 ++--
 .../debian/preseed/templates/preseed_ubuntu-xenial.cfg.j2         | 4 ++--
 9 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'roles/installer/debian/preseed')

diff --git a/roles/installer/debian/preseed/templates/preseed_debian-bookworm.cfg.j2 b/roles/installer/debian/preseed/templates/preseed_debian-bookworm.cfg.j2
index 3e86b048..c27ea93f 100644
--- a/roles/installer/debian/preseed/templates/preseed_debian-bookworm.cfg.j2
+++ b/roles/installer/debian/preseed/templates/preseed_debian-bookworm.cfg.j2
@@ -23,8 +23,8 @@ d-i netcfg/disable_dhcp boolean true
 d-i netcfg/disable_autoconfig boolean true
 d-i netcfg/get_ipaddress string {{ network.primary.address | ansible.utils.ipaddr('address') }}
 d-i netcfg/get_netmask string {{ network.primary.address | ansible.utils.ipaddr('netmask') }}
-d-i netcfg/get_gateway string {{ network.primary.gateway }}
-d-i netcfg/get_nameservers string {{ network.nameservers | join(' ') }}
+d-i netcfg/get_gateway string {{ network.primary.gateway | default('') }}
+d-i netcfg/get_nameservers string {{ network.nameservers | default([]) | join(' ') }}
 d-i netcfg/confirm_static boolean true
 {% endif %}
 
diff --git a/roles/installer/debian/preseed/templates/preseed_debian-bullseye.cfg.j2 b/roles/installer/debian/preseed/templates/preseed_debian-bullseye.cfg.j2
index 0649b18f..27986272 100644
--- a/roles/installer/debian/preseed/templates/preseed_debian-bullseye.cfg.j2
+++ b/roles/installer/debian/preseed/templates/preseed_debian-bullseye.cfg.j2
@@ -23,8 +23,8 @@ d-i netcfg/disable_dhcp boolean true
 d-i netcfg/disable_autoconfig boolean true
 d-i netcfg/get_ipaddress string {{ network.primary.address | ansible.utils.ipaddr('address') }}
 d-i netcfg/get_netmask string {{ network.primary.address | ansible.utils.ipaddr('netmask') }}
-d-i netcfg/get_gateway string {{ network.primary.gateway }}
-d-i netcfg/get_nameservers string {{ network.nameservers | join(' ') }}
+d-i netcfg/get_gateway string {{ network.primary.gateway | default('') }}
+d-i netcfg/get_nameservers string {{ network.nameservers | default([]) | join(' ') }}
 d-i netcfg/confirm_static boolean true
 {% endif %}
 
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 209cd1b7..b6257e0c 100644
--- a/roles/installer/debian/preseed/templates/preseed_debian-buster.cfg.j2
+++ b/roles/installer/debian/preseed/templates/preseed_debian-buster.cfg.j2
@@ -23,8 +23,8 @@ d-i netcfg/disable_dhcp boolean true
 d-i netcfg/disable_autoconfig boolean true
 d-i netcfg/get_ipaddress string {{ network.primary.address | ansible.utils.ipaddr('address') }}
 d-i netcfg/get_netmask string {{ network.primary.address | ansible.utils.ipaddr('netmask') }}
-d-i netcfg/get_gateway string {{ network.primary.gateway }}
-d-i netcfg/get_nameservers string {{ network.nameservers | join(' ') }}
+d-i netcfg/get_gateway string {{ network.primary.gateway | default('') }}
+d-i netcfg/get_nameservers string {{ network.nameservers | default([]) | join(' ') }}
 d-i netcfg/confirm_static boolean true
 {% endif %}
 
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 87a90060..f629df6d 100644
--- a/roles/installer/debian/preseed/templates/preseed_debian-jessie.cfg.j2
+++ b/roles/installer/debian/preseed/templates/preseed_debian-jessie.cfg.j2
@@ -23,8 +23,8 @@ d-i netcfg/disable_dhcp boolean true
 d-i netcfg/disable_autoconfig boolean true
 d-i netcfg/get_ipaddress string {{ network.primary.address | ansible.utils.ipaddr('address') }}
 d-i netcfg/get_netmask string {{ network.primary.address | ansible.utils.ipaddr('netmask') }}
-d-i netcfg/get_gateway string {{ network.primary.gateway }}
-d-i netcfg/get_nameservers string {{ network.nameservers | join(' ') }}
+d-i netcfg/get_gateway string {{ network.primary.gateway | default('') }}
+d-i netcfg/get_nameservers string {{ network.nameservers | default([]) | join(' ') }}
 d-i netcfg/confirm_static boolean true
 {% endif %}
 
@@ -61,8 +61,8 @@ d-i base-installer/kernel/image string {{ debian_preseed_kernel_image }}
 {% endif %}
 
 d-i base-installer/install-recommends boolean false
-d-i apt-setup/security_host string
-#d-i apt-setup/security_host string
+d-i apt-setup/security_host string {{ apt_repo_providers[apt_repo_provider].debian_security.host }}
+d-i apt-setup/security_path string {{ apt_repo_providers[apt_repo_provider].debian_security.path }}
 
 tasksel tasksel/first multiselect {{ debian_preseed_install_tasks | join(', ') }}
 d-i pkgsel/include string openssh-server {{ python_basename }} {{ 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 3c682d81..95cd44a0 100644
--- a/roles/installer/debian/preseed/templates/preseed_debian-stretch.cfg.j2
+++ b/roles/installer/debian/preseed/templates/preseed_debian-stretch.cfg.j2
@@ -23,8 +23,8 @@ d-i netcfg/disable_dhcp boolean true
 d-i netcfg/disable_autoconfig boolean true
 d-i netcfg/get_ipaddress string {{ network.primary.address | ansible.utils.ipaddr('address') }}
 d-i netcfg/get_netmask string {{ network.primary.address | ansible.utils.ipaddr('netmask') }}
-d-i netcfg/get_gateway string {{ network.primary.gateway }}
-d-i netcfg/get_nameservers string {{ network.nameservers | join(' ') }}
+d-i netcfg/get_gateway string {{ network.primary.gateway | default('') }}
+d-i netcfg/get_nameservers string {{ network.nameservers | default([]) | join(' ') }}
 d-i netcfg/confirm_static boolean true
 {% endif %}
 
diff --git a/roles/installer/debian/preseed/templates/preseed_kali-kali-rolling.cfg.j2 b/roles/installer/debian/preseed/templates/preseed_kali-kali-rolling.cfg.j2
index 7e2fe535..261704f8 100644
--- a/roles/installer/debian/preseed/templates/preseed_kali-kali-rolling.cfg.j2
+++ b/roles/installer/debian/preseed/templates/preseed_kali-kali-rolling.cfg.j2
@@ -20,8 +20,8 @@ d-i netcfg/disable_dhcp boolean true
 d-i netcfg/disable_autoconfig boolean true
 d-i netcfg/get_ipaddress string {{ network.primary.address | ansible.utils.ipaddr('address') }}
 d-i netcfg/get_netmask string {{ network.primary.address | ansible.utils.ipaddr('netmask') }}
-d-i netcfg/get_gateway string {{ network.primary.gateway }}
-d-i netcfg/get_nameservers string {{ network.nameservers | join(' ') }}
+d-i netcfg/get_gateway string {{ network.primary.gateway | default('') }}
+d-i netcfg/get_nameservers string {{ network.nameservers | default([]) | join(' ') }}
 d-i netcfg/confirm_static boolean true
 {% endif %}
 
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 1446ab2c..69d87df6 100644
--- a/roles/installer/debian/preseed/templates/preseed_ubuntu-bionic.cfg.j2
+++ b/roles/installer/debian/preseed/templates/preseed_ubuntu-bionic.cfg.j2
@@ -27,8 +27,8 @@ d-i netcfg/disable_dhcp boolean true
 d-i netcfg/disable_autoconfig boolean true
 d-i netcfg/get_ipaddress string {{ network.primary.address | ansible.utils.ipaddr('address') }}
 d-i netcfg/get_netmask string {{ network.primary.address | ansible.utils.ipaddr('netmask') }}
-d-i netcfg/get_gateway string {{ network.primary.gateway }}
-d-i netcfg/get_nameservers string {{ network.nameservers | join(' ') }}
+d-i netcfg/get_gateway string {{ network.primary.gateway | default('') }}
+d-i netcfg/get_nameservers string {{ network.nameservers | default([]) | join(' ') }}
 d-i netcfg/confirm_static boolean true
 {% 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 c2689623..f44ea32e 100644
--- a/roles/installer/debian/preseed/templates/preseed_ubuntu-focal.cfg.j2
+++ b/roles/installer/debian/preseed/templates/preseed_ubuntu-focal.cfg.j2
@@ -27,8 +27,8 @@ d-i netcfg/disable_dhcp boolean true
 d-i netcfg/disable_autoconfig boolean true
 d-i netcfg/get_ipaddress string {{ network.primary.address | ansible.utils.ipaddr('address') }}
 d-i netcfg/get_netmask string {{ network.primary.address | ansible.utils.ipaddr('netmask') }}
-d-i netcfg/get_gateway string {{ network.primary.gateway }}
-d-i netcfg/get_nameservers string {{ network.nameservers | join(' ') }}
+d-i netcfg/get_gateway string {{ network.primary.gateway | default('') }}
+d-i netcfg/get_nameservers string {{ network.nameservers | default([]) | join(' ') }}
 d-i netcfg/confirm_static boolean true
 {% 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 b8fd1110..e6580d0b 100644
--- a/roles/installer/debian/preseed/templates/preseed_ubuntu-xenial.cfg.j2
+++ b/roles/installer/debian/preseed/templates/preseed_ubuntu-xenial.cfg.j2
@@ -24,8 +24,8 @@ d-i netcfg/disable_dhcp boolean true
 d-i netcfg/disable_autoconfig boolean true
 d-i netcfg/get_ipaddress string {{ network.primary.address | ansible.utils.ipaddr('address') }}
 d-i netcfg/get_netmask string {{ network.primary.address | ansible.utils.ipaddr('netmask') }}
-d-i netcfg/get_gateway string {{ network.primary.gateway }}
-d-i netcfg/get_nameservers string {{ network.nameservers | join(' ') }}
+d-i netcfg/get_gateway string {{ network.primary.gateway | default('') }}
+d-i netcfg/get_nameservers string {{ network.nameservers | default([]) | join(' ') }}
 d-i netcfg/confirm_static boolean true
 {% endif %}
 
-- 
cgit v1.2.3