summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHugo Hörnquist <hugo@lysator.liu.se>2022-01-21 18:11:58 +0100
committerHugo Hörnquist <hugo@lysator.liu.se>2022-01-21 18:11:58 +0100
commit2637e67307f5faa613c0077e7a49b4a5f37daf39 (patch)
tree5f4d2a4802b840fcaabdb59ab4bf1d90ab7472bc
parentBetter wpa_supplicant. (diff)
downloadwpa_supplicant-2637e67307f5faa613c0077e7a49b4a5f37daf39.tar.gz
wpa_supplicant-2637e67307f5faa613c0077e7a49b4a5f37daf39.tar.xz
wpa_supplicant add country field.
-rw-r--r--manifests/interface.pp2
-rw-r--r--templates/wpa_supplicant.conf.epp4
2 files changed, 5 insertions, 1 deletions
diff --git a/manifests/interface.pp b/manifests/interface.pp
index 3598103..42afe3e 100644
--- a/manifests/interface.pp
+++ b/manifests/interface.pp
@@ -1,5 +1,6 @@
define wpa_supplicant::interface (
String $interface = $name,
+ String[2,2] $country = 'US',
Array[String] $networks = [],
) {
service { "wpa_supplicant@${interface}.service":
@@ -18,6 +19,7 @@ define wpa_supplicant::interface (
file { $conf_file:
ensure => file,
content => epp('wpa_supplicant/wpa_supplicant.conf.epp', {
+ country => $country,
networks => $network_items,
}),
} ~> exec { "Reload wpa_supplicant for ${interface}":
diff --git a/templates/wpa_supplicant.conf.epp b/templates/wpa_supplicant.conf.epp
index 48680bb..9674f2c 100644
--- a/templates/wpa_supplicant.conf.epp
+++ b/templates/wpa_supplicant.conf.epp
@@ -1,10 +1,12 @@
-<%- | Array[Hash] $networks | -%>
+<%- | String $country,
+ Array[Hash] $networks | -%>
# FILE MANAGED BY PUPPET
ctrl_interface=DIR=<%= $wpa_supplicant::ctrl_interface %> GROUP=wheel
update_config=0
ap_scan=1
eapol_version=2
+country=<%= $country %>
<% $networks.each |$network| { %>
network={