From 4d9d925db8dbc6c0da711cabb663d687105005fa Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Sun, 12 Apr 2020 15:29:14 -0500 Subject: [PATCH] one template - 2 copies --- roles/network/tasks/hostapd.yml | 2 +- .../templates/hostapd/iiab-hostapd.conf.j2 | 32 ------------------- 2 files changed, 1 insertion(+), 33 deletions(-) delete mode 100644 roles/network/templates/hostapd/iiab-hostapd.conf.j2 diff --git a/roles/network/tasks/hostapd.yml b/roles/network/tasks/hostapd.yml index 0cd9a2d5d..1e6326258 100644 --- a/roles/network/tasks/hostapd.yml +++ b/roles/network/tasks/hostapd.yml @@ -24,7 +24,7 @@ - name: Create backup /etc/hostapd/hostapd.conf.iiab from template template: - src: hostapd/iiab-hostapd.conf.j2 + src: hostapd/hostapd.conf.j2 dest: /etc/hostapd/hostapd.conf.iiab owner: root group: root diff --git a/roles/network/templates/hostapd/iiab-hostapd.conf.j2 b/roles/network/templates/hostapd/iiab-hostapd.conf.j2 deleted file mode 100644 index 097a8d41a..000000000 --- a/roles/network/templates/hostapd/iiab-hostapd.conf.j2 +++ /dev/null @@ -1,32 +0,0 @@ -# Basic configuration - -interface=ap0 - -ssid={{ host_ssid }} -channel={{ host_channel }} -{%if iiab_lan_iface == "br0" %} -bridge=br0 -{% endif %} - -# Hardware configuration -driver={{ driver_name }} -{%if host_wireless_n %} -ieee80211n=1 -{% endif %} -country_code={{ host_country_code }} -# limit emissions to what is legal in country -ieee80211d=1 -hw_mode={{ host_wifi_mode }} - -{%if hostapd_secure %} -# Use WPA authentication -auth_algs=1 -# Use WPA2 -wpa=2 -# Use a pre-shared key -wpa_key_mgmt=WPA-PSK -# The network passphrase -wpa_passphrase={{ hostapd_password }} -# Use AES, instead of TKIP -rsn_pairwise=CCMP -{% endif %}