From: nicoo <nicoo@realraum.at>
Date: Tue, 11 Dec 2018 11:16:36 +0000 (+0100)
Subject: Merge PR#44: added new ctf host
X-Git-Url: https://git.realraum.at/?p=noc.git;a=commitdiff_plain;h=8f3bd35635f7881f3ffbadc323e5e41c370e298f;hp=95c3e54f09db6a50b5b715c079b5b3f6cc84209f

Merge PR#44: added new ctf host
---

diff --git a/ansible/group_vars/accesspoints/main.yml b/ansible/group_vars/accesspoints/main.yml
index 7147bbd..a58aff2 100644
--- a/ansible/group_vars/accesspoints/main.yml
+++ b/ansible/group_vars/accesspoints/main.yml
@@ -15,15 +15,15 @@ accesspoint_wifi_channels:
 
 accesspoint_zones:
   iot:
-    ssid: "TEST realstuff"
+    ssid: "realstuff"
     encryption: "psk2"
     key: "{{ vault_accesspoint_zones.iot.key }}"
   guests:
-    ssid: "TEST realraum"
+    ssid: "realraum"
     encryption: "psk2"
     key: "{{ vault_accesspoint_zones.guests.key }}"
   # members:
-  #   ssid: "TEST r3members"
+  #   ssid: "r3members"
   #   encryption: "psk2"
   #   key: "{{ vault_accesspoint_zones.members.key }}"
 
diff --git a/ansible/roles/preseed/templates/preseed_debian-stretch.cfg.j2 b/ansible/roles/preseed/templates/preseed_debian-stretch.cfg.j2
index a2fb80c..d7a21a8 100644
--- a/ansible/roles/preseed/templates/preseed_debian-stretch.cfg.j2
+++ b/ansible/roles/preseed/templates/preseed_debian-stretch.cfg.j2
@@ -7,6 +7,8 @@ d-i debian-installer/country string AT
 d-i debian-installer/locale string en_US.UTF-8
 d-i keyboard-configuration/xkb-keymap select us
 
+d-i hw-detect/load_firmware boolean false
+
 d-i netcfg/disable_dhcp boolean true
 d-i netcfg/choose_interface select {{ install_interface | default(hostvars[hostname].network_cooked.primary.interface) }}
 d-i netcfg/disable_autoconfig boolean false
@@ -16,7 +18,9 @@ d-i netcfg/get_gateway string {{ hostvars[hostname].network_cooked.primary.gatew
 d-i netcfg/get_nameservers string {{ hostvars[hostname].network_cooked.nameservers | join(' ') }}
 d-i netcfg/confirm_static boolean true
 
+d-i netcfg/hostname string {{ hostname }}
 d-i netcfg/get_hostname string {{ hostname }}
+d-i netcfg/domain string {{ hostvars[hostname].network_cooked.domain }}
 d-i netcfg/get_domain string {{ hostvars[hostname].network_cooked.domain }}
 d-i netcfg/wireless_wep string
 
diff --git a/ansible/roles/preseed/templates/preseed_ubuntu-bionic.cfg.j2 b/ansible/roles/preseed/templates/preseed_ubuntu-bionic.cfg.j2
index 7d8aacf..be37537 100644
--- a/ansible/roles/preseed/templates/preseed_ubuntu-bionic.cfg.j2
+++ b/ansible/roles/preseed/templates/preseed_ubuntu-bionic.cfg.j2
@@ -11,6 +11,8 @@ d-i console-setup/ask_detect boolean false
 d-i keyboard-configuration/xkb-keymap select us
 d-i keyboard-configuration/layoutcode string us
 
+d-i hw-detect/load_firmware boolean false
+
 d-i netcfg/disable_dhcp boolean true
 d-i netcfg/choose_interface select {{ install_interface | default(hostvars[hostname].network_cooked.primary.interface) }}
 d-i netcfg/disable_autoconfig boolean false
@@ -20,7 +22,9 @@ d-i netcfg/get_gateway string {{ hostvars[hostname].network_cooked.primary.gatew
 d-i netcfg/get_nameservers string {{ hostvars[hostname].network_cooked.nameservers | join(' ') }}
 d-i netcfg/confirm_static boolean true
 
+d-i netcfg/hostname string {{ hostname }}
 d-i netcfg/get_hostname string {{ hostname }}
+d-i netcfg/domain string {{ hostvars[hostname].network_cooked.domain }}
 d-i netcfg/get_domain string {{ hostvars[hostname].network_cooked.domain }}
 d-i netcfg/wireless_wep string
 
diff --git a/ansible/roles/preseed/templates/preseed_ubuntu-xenial.cfg.j2 b/ansible/roles/preseed/templates/preseed_ubuntu-xenial.cfg.j2
index ee01602..73fe409 100644
--- a/ansible/roles/preseed/templates/preseed_ubuntu-xenial.cfg.j2
+++ b/ansible/roles/preseed/templates/preseed_ubuntu-xenial.cfg.j2
@@ -11,6 +11,8 @@ d-i console-setup/ask_detect boolean false
 d-i keyboard-configuration/xkb-keymap select us
 d-i keyboard-configuration/layoutcode string us
 
+d-i hw-detect/load_firmware boolean false
+
 d-i netcfg/disable_dhcp boolean true
 d-i netcfg/choose_interface select {{ install_interface | default(hostvars[hostname].network_cooked.primary.interface) }}
 d-i netcfg/disable_autoconfig boolean false
@@ -20,7 +22,9 @@ d-i netcfg/get_gateway string {{ hostvars[hostname].network_cooked.primary.gatew
 d-i netcfg/get_nameservers string {{ hostvars[hostname].network_cooked.nameservers | join(' ') }}
 d-i netcfg/confirm_static boolean true
 
+d-i netcfg/hostname string {{ hostname }}
 d-i netcfg/get_hostname string {{ hostname }}
+d-i netcfg/domain string {{ hostvars[hostname].network_cooked.domain }}
 d-i netcfg/get_domain string {{ hostvars[hostname].network_cooked.domain }}
 d-i netcfg/wireless_wep string