diff --git a/Rakefile b/Rakefile index 3e80385..c1cfebc 100644 --- a/Rakefile +++ b/Rakefile @@ -19,6 +19,7 @@ def wifi(name) wlan_config.sub!("", wlan['channel'].to_s) wlan_config.sub!("", wlan['bssid'].to_s) wlan_config.sub!("", wlan['txpower'].to_s) + wlan_config.sub!("", wlan['key'].to_s) end #wlan_config.gsub!("# option channel", " option channel") wlan_config.gsub!("# option macaddr", " option macaddr") @@ -57,7 +58,7 @@ task :ap, [:name] do |t, args| end task :all do - aps = %W(ap-wc ap-bar ap-stage) # Foaier + aps = %W(ap-ws-ws1 ap-ws-ws2) # Workshops #aps += %W(ap-ws-noc) # NOC/Team room aps.each do |ap| diff --git a/configurations.yml b/configurations.yml index 689db32..0ad4e2e 100644 --- a/configurations.yml +++ b/configurations.yml @@ -4,52 +4,82 @@ # FLOOR = {00,11} # IP = last octet from 10.20.0.xx configurations: - ap-wc: - config: dap2965 - ip: 10.20.0.22 +# ap-wc: +# config: dap2965 +# ip: 10.20.0.22 +# wlans: +# 0: +# bssid: 0e:50:00:11:00:52 +# channel: 36 +# txpower: 22 +# 1: +# bssid: 0e:24:00:11:00:52 +# channel: 12 +# txpower: 10 +# mixins: +# - all +# - dap2965 +# - dap2965-single-trunk +# ap-bar: +# config: dap2965 +# ip: 10.20.0.21 +# wlans: +# 0: +# bssid: 0e:50:00:11:00:51 +# channel: 52 +# txpower: 22 +# 1: +# bssid: 0e:24:00:11:00:51 +# channel: 6 +# txpower: 10 +# mixins: +# - all +# - dap2965 +# - dap2965-single-trunk + # lower floor + ap-ws-ws1: + config: linksys + ip: 10.20.0.60 wlans: 0: - bssid: 0e:50:00:11:00:52 - channel: 36 + bssid: 0e:50:00:11:00:60 + channel: 44 txpower: 22 1: - bssid: 0e:24:00:11:00:52 - channel: 12 + bssid: 0e:24:00:11:00:60 + channel: 1 txpower: 10 + 2: + bssid: 0e:50:ff:11:00:60 + key: openfest + 3: + bssid: 0e:24:ff:11:00:60 + key: openfest + mixins: - all - - dap2965 - - dap2965-single-trunk - ap-bar: - config: dap2965 - ip: 10.20.0.21 + - linksys + - linksys-single-trunk + ap-ws-ws2: + config: linksys + ip: 10.20.0.61 wlans: 0: - bssid: 0e:50:00:11:00:51 - channel: 52 - txpower: 22 - 1: - bssid: 0e:24:00:11:00:51 - channel: 6 - txpower: 10 - mixins: - - all - - dap2965 - - dap2965-single-trunk - # Main room - ap-stage: - config: archer-c5 - ip: 10.20.0.23 - wlans: - 0: - bssid: 0e:50:00:11:00:53 + bssid: 0e:50:00:11:00:61 channel: 157 txpower: 22 1: - bssid: 0e:24:00:11:00:53 - channel: 1 + bssid: 0e:24:00:11:00:61 + channel: 13 txpower: 10 + 2: + bssid: 0e:50:ff:11:00:61 + key: openfest + 3: + bssid: 0e:24:ff:11:00:61 + key: openfest + mixins: - all - - archer-c5v1 - - archer-c5-single-trunk + - linksys + - linksys-single-trunk diff --git a/files/linksys/etc/config/wireless b/files/linksys/etc/config/wireless index 8579d62..54d3115 100644 --- a/files/linksys/etc/config/wireless +++ b/files/linksys/etc/config/wireless @@ -61,8 +61,8 @@ config wifi-iface option mode 'ap' option ssid 'ofvideo' option encryption 'sae-mixed' - option macaddr '' - option key '' + option macaddr '' + option key '' option wnm_sleep_mode 1 option network 'videowifi' @@ -72,8 +72,8 @@ config wifi-iface option mode 'ap' option ssid 'ofvideo' option encryption 'sae-mixed' - option macaddr '' - option key '' + option macaddr '' + option key '' option wnm_sleep_mode 1 option network 'videowifi'