X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=ansible%2Fgroup_vars%2Faccesspoints%2Fmain.yml;h=a58aff2851a418fb390f715353099e1c358a87a5;hb=66e930078474421bc1c8c7296468537c9753f2d6;hp=1df3d418e2ed8ad398ee6b14f650ca2aa7954db6;hpb=4a649ea0ae12b38a5ef352b0dba174887d5330a4;p=noc.git

diff --git a/ansible/group_vars/accesspoints/main.yml b/ansible/group_vars/accesspoints/main.yml
index 1df3d41..a58aff2 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,15 +15,15 @@ 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 }}"
   # members:
-  #   ssid: "TEST r3members"
+  #   ssid: "r3members"
   #   encryption: "psk2"
   #   key: "{{ vault_accesspoint_zones.members.key }}"
 
@@ -141,39 +145,10 @@ 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:
-    content: |
-      # Beware! This file is rewritten by htop when settings are changed in the interface.
-      # The parser is also very primitive, and not human-friendly.
-      fields=0 48 17 18 38 39 40 2 46 47 49 1
-      sort_key=46
-      sort_direction=1
-      hide_threads=0
-      hide_kernel_threads=1
-      hide_userland_threads=0
-      shadow_other_users=0
-      show_thread_names=0
-      show_program_path=1
-      highlight_base_name=1
-      highlight_megabytes=1
-      highlight_threads=1
-      tree_view=1
-      header_margin=1
-      detailed_cpu_time=0
-      cpu_count_from_zero=0
-      update_process_names=0
-      account_guest_in_cpu_meter=0
-      color_scheme=0
-      delay=15
-      left_meters=AllCPUs Memory Swap
-      left_meter_modes=1 1 1
-      right_meters=Tasks LoadAverage Uptime
-      right_meter_modes=2 2 2
+  /etc/htoprc:
+    file: "{{ global_files_dir }}/common/htoprc"
 
 
 openwrt_uci: