X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;ds=sidebyside;f=ansible%2Fgroup_vars%2Faccesspoints%2Fmain.yml;h=a06696eb9945da96a52227362563ed85940a8ba5;hb=c7f8e5c937c3a93c37c748e3c2686b2895132105;hp=233b08a34bd62c4c035f6ab410f57c4ef1ca61e6;hpb=a32fd86b0ed57921615f002dce60dc761eea40b3;p=noc.git

diff --git a/ansible/group_vars/accesspoints/main.yml b/ansible/group_vars/accesspoints/main.yml
index 233b08a..a06696e 100644
--- a/ansible/group_vars/accesspoints/main.yml
+++ b/ansible/group_vars/accesspoints/main.yml
@@ -1,4 +1,8 @@
 ---
+ssh_users_root:
+  - equinox
+  - nicoo
+
 accesspoint_wifi_channels:
   2.4g:
     ap0: 3
@@ -11,17 +15,23 @@ 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 }}"
+    extra_options:
+      disassoc_low_ack: '1'
+      rsn_preauth: '1'
   # members:
-  #   ssid: "TEST r3members"
+  #   ssid: "r3members"
   #   encryption: "psk2"
   #   key: "{{ vault_accesspoint_zones.members.key }}"
+  #   extra_options:
+  #     disassoc_low_ack: '1'
+  #     rsn_preauth: '1'
 
 
 
@@ -109,11 +119,12 @@ accesspoint_wireless_ifaces_yaml: |
       device: 'radio{{ item.freq }}'
       network: '{{ zone }}'
       mode: 'ap'
-      disassoc_low_ack: '1'
-      rsn_preauth: '1'
       ssid: '{{ accesspoint_zones[zone].ssid }}{{ item.ssid }}'
       encryption: '{{ accesspoint_zones[zone].encryption }}'
       key: '{{ accesspoint_zones[zone].key }}'
+  {%     for opt, val in (accesspoint_zones[zone].extra_options | default({}) ).items() %}
+      {{ opt }}: '{{ val }}'
+  {%     endfor %}
   {%   endfor %}
   {% endfor %}
 
@@ -141,12 +152,9 @@ openwrt_mixin:
       net.ipv6.conf.all.forwarding=0
 
   /etc/dropbear/authorized_keys:
-    content: |-
-      {% for key in noc_ssh_keys %}
-      {{ key }}
-      {% endfor %}
+    content: "{{ ssh_users_root | user_ssh_keys(users) | join('\n') }}\n"
 
-  /root/.config/htop/htoprc:
+  /etc/htoprc:
     file: "{{ global_files_dir }}/common/htoprc"