Fix maverick_network AP parameters, #445

goodrobots · May 29, 2017 · c9e2e79 · c9e2e79
1 parent 228c5a9
commit c9e2e79
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 4 deletions.
diff --git a/manifests/maverick-modules/maverick_network/manifests/init.pp b/manifests/maverick-modules/maverick_network/manifests/init.pp
@@ -259,6 +259,12 @@
 	    $ssid = undef,
 	    $psk = undef,
 	    $dhcp_range = undef,
+        $driver  = "nl80211",
+        $channel = undef,
+        $hw_mode = "g",
+        $disable_broadcast_ssid = false,
+        $dhcp_range = "192.168.10.10,192.168.10.50",
+        $dhcp_leasetime = "24h",
 	) {
 	    # If the mac address is specified, then set the interface name statically in udev
     	if $macaddress {
@@ -290,10 +296,20 @@
 		        addressing  => "master",
 		        macaddress  => $macaddress,
 		        ipaddress   => $apaddress,
+		        gateway     => $gateway,
+		        nameservers => $nameservers,
 		    }
 		    # Then setup the AP
 		    maverick_network::interface_ap { $name:
 		        macaddress  => $macaddress,
+		        ssid        => $ssid,
+		        psk         => $psk,
+                driver      => $driver,
+                channel     => $channel,
+                hw_mode     => $hw_mode,
+                disable_broadcast_ssid => $disable_broadcast_ssid,
+                dhcp_range  => $dhcp_range,
+                dhcp_leasetime => $dhcp_leasetime,
 		    }
 		}
 		# If not defined as monitor mode, ensure monitor disabled for this interface

diff --git a/manifests/maverick-modules/maverick_network/manifests/interface_ap.pp b/manifests/maverick-modules/maverick_network/manifests/interface_ap.pp
@@ -1,6 +1,7 @@
 define maverick_network::interface_ap (
     $macaddress = undef,
     $ssid = "Maverick",
+    $psk = "8097a204e44b0a740d5daad37d0e34ac16e4df353bc827dcd57d49b36d49740d",
     $driver = "nl80211",
     $channel = 1,
     $hw_mode = "g",
@@ -50,4 +51,4 @@
         content     => template('maverick_network/dnsmasq-dhcp.erb'),
     }
 
-}
+}
diff --git a/manifests/maverick-modules/maverick_network/templates/hostapd.conf.erb b/manifests/maverick-modules/maverick_network/templates/hostapd.conf.erb
@@ -18,12 +18,12 @@ auth_algs=1
 #1 - wpa only
 #2 - wpa2 only
 #3 - both
-wpa=3
+wpa=2
 #sets wpa passphrase required by the clients to authenticate themselves on the network
-wpa_passphrase=ifeeltheneed
+wpa_psk=<%= @psk %>
 #sets wpa key management
 wpa_key_mgmt=WPA-PSK
 #sets encryption used by WPA
-wpa_pairwise=TKIP
+wpa_pairwise=TKIP CCMP
 #sets encryption used by WPA2
 rsn_pairwise=CCMP