coc2 -> ff-niyawe4

sim1 -> ff-niyawe4
new niyawe ssh-keys
5 changed files with 102 additions and 78 deletions
--- a/group_vars/all
+++ b/group_vars/all
@ -3,7 +3,10 @@ hetzner_webservice_username: '<hetzner_webservice_username>'
 hetzner_webservice_password: '<hetzner_webservice_password>'
 rescue_authorized_key: '<fingerprint of ssh key to use in rescue mode>'
 authorized_keys:
-  - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHrd5xaZDgYIxjbIHgtheNuySdPEu1hFLph3g1FnhLKt niyawe@niyawe.de
+  - sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIJipjvUGQNrDqXjIulGP/y52+y44BkkZDSguN/1NGI6AAAAABHNzaDo= niyawe@yubikey-uni
+  - sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAILUmx9SpIHap0rpGqR54VBkO6v+JxJn0e6p01eJ8ZMQkAAAABHNzaDo= niyawe@yubikey
+  - sk-ecdsa-sha2-nistp256@openssh.com AAAAInNrLWVjZHNhLXNoYTItbmlzdHAyNTZAb3BlbnNzaC5jb20AAAAIbmlzdHAyNTYAAABBBEgXSSr+3cOG3dlmMVP+uLc1AQLuhzqqDagAs/0MRxdbn9aXvN20KIUF60mxZp5z/uB5wCv0b5fB8HaBOGXgdVoAAAAEc3NoOg== niyawe@solokey
+  - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILF/aG11fx4d+LxQN9xSgbHnY4iHX7zkmNDAbZ9+g6u3 niyawe@offline-backup
  - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC2I7IRe94zaC3BSOEE/eLtVfyJCjSlBiPvmSqCoNBZWFkkdFC7LMbG6YUJgz0O9dQGToPc4Qt5pUszAPCM7XdDxbmWRkHOxhk0aNsnQ22aQT+DU+E2oQn7ovlOXyvrNXyRdsrNSU1AOnK0tsn4bAJnCj/KAvV7Py4JZkpblYX9xqZFwuIvii7zjLch0S2nCibZmJ+fme/l1mYWRChNZNriChFHdcv2bZDz5KQKGJ7pW3rZrbVM6/gSBEfObJkGEtXhnguqt76o0aa5LuMYEqerbbwdWgY8W5Yx3L195I65jgI3Qi6VX6VETT8UXkyxRLfhf/OrPDeblED9dHKUo10n ataflinski@manning
  - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCqHLdqtNAK78MAbQkvuq35sjZ/QvJIQDulhovu4AA5t88WWj91+HCYSRto9rsPXNXG6D9EjiFJFM55UUe1lQjM8wP6/nBCG5BPhqksVd20SR9IY4kmYAniedKwL85MCYsLIptHaH2OUm7aXmY61CvtpwcqTpthQicup9K+Oh1SLQOBNEZ98zBfxLmvebHYBXtHgm+tFuUQrJn8Pnlx1tkjwijgi3ysqdzs24WVV5DbLb4f78NAUuyOWkoVHqMhlF4G8UFPOA/i0fFZLMLzTlOFwknJPDtLoj3QSfAGDRy7hySo+X7c3rPdjnDqd00cggq0XbYAEMqic4+61bPCGzQMAz/+LVntG2N60Uj6YpDNCpVp9NAFzymbye7xYUqUYJ96DGnRSOvBG6mydNteSCqjjWZyMGvMxJNeuXgfwkNX74WKruil/LlB0Y5iao1qW49/bi8ZIMVBpmw+JDKSQn/odNqgU+S4GkUVsiHrg1FMVQj0GHyNATiR3VbSlX9pvzfWzCiNYWNj0lowEQ5grkuRjnUukAjWZNp7rsyO0+JAVwTb/qIyx+pcRw90aWtLTUMYGFBsigpqK+r4rLsv6F9tfyQ7YBRqFMpVgSKoOguChDMvubyjVaj/IUh83W4UFT8Jzq0+4Ruj0PDlX7BHFzqbnySdTuqJr8cOQgK9qIq06w== adlerweb@OP-Server
  - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDViQ3+m2l5GcYcEY+wd8DYbC0r3ChS2eR496XlkUg1+M6LQXbSn2w3SEXAOlSiWEsItfuLEyDaqK4y/8ZuWLo45DdnTWPbBgSakayEd8+a9rhz0woP9fCDKusF8Wj/tzGcD2klF0bhSsB4TfIjEPn0B3H3ikbqBF0X26cZmOnXa1E14yeiyxHaMag0aNV1gmGSKE9XOqen3vVP86Tw23b1mb4qCN+SCK/JQAlLJmhPcuRU3jMIgV7+2F40Z/yhT2utietUtAzsG2Vxt+qnvDPbSoA5l3ygmzgIxmlBXEM0G6M464ZA6FoUXXUZ+HxqBvJI5X+OBAoXS75mRcZyNXS3sFIxZWdwChMGejRnnYfnrkwaCe5RSv+hjHH5B3ysHgmDDV4vTbA21e+yQHGFYAzWAe9kG8CcucHa3fQBwS2s0fhxxaqilxGytTrcL3rBxNTvTgqHIg5oDIRbiJh6T3dr5T871R/BZ9y6hHKx/vcedUI+QwF3B7L+mzNuQY+GJZJXZ3560j7RLJ1mvSBFYCtYjcfBzfbC4kU34HhY4+NAgK8pXwsG+YE0YdcZ4bYgvCpMYyQquKBjvMBzFkzHd6fpWotIU0EKBGSmusGvRykBxNmbphWrp3bd+Oi9dzVRiNf22K0JsfvODWhLOeearuBwWoKjaMQkadNo23YNIdjvMw== norbert
--- a/host_vars/ff-adlerweb1
+++ b/host_vars/ff-adlerweb1
@ -1,82 +1,6 @@
 ---
 ansible_host: 2001:41d0:a:1fa9::902:18
-sites:
-  - name: 'coc'
-    net4: '10.222.56.0/21'
-    net6: '2a03:2260:1016:0102::/64'
-    site_net6: 'fd62:44e1:da:0100::/64'
-    fastd_secret: !vault |
-          $ANSIBLE_VAULT;1.1;AES256
-          64346365626531663039636230633430613338336164623065393964313538633839346537356533
-          3363313832333561373134363136333663313864383466360a333533643462336533336433353030
-          64306535326562343964373931306366613365356335386163303062363663383264353566656438
-          3838323261303331380a613366306566623531323162373266663863393563323232626565346163
-          64333835356662643561373062393831303366656138356464326232363235373734663038316336
-          37313164306565643032373938353434393333653531623635663030613861306663373761336233
-          65373565653939663832353565656262306633306461316461343735336431393033316433313164
-          35346363653832386138
-    fastd_mesh_mac: '02:ff:43:4f:43:20'
-    fastd_port1: 10012
-    fastd_port2: 10013
-    bat_ipv6: '2a03:2260:1016:0102::1'
-    bat_ipv4: '10.222.56.1'
-    bat_ipv4_cidr: 21
-    dhcp_subnet: '10.222.56.0'
-    dhcp_netmask: '255.255.248.0'
-    dhcp_start: '10.222.56.50'
-    dhcp_end: '10.222.63.250'
-    wireguard_mesh_number: 2
-    wireguard_mesh_priv_key: !vault |
-          $ANSIBLE_VAULT;1.1;AES256
-          30616336326166366137353934323334356336353933643561333432303134303766313664666265
-          3834626539666264366566343161636234313036613337340a663937353336333938656362373631
-          36633136386165636362643764306432353632626330386464316639646435323032313262313363
-          3861353234373533310a323166666232613861616637386262356266316336323263656336663366
-          35616566656538373633326531323766303532613861623765653839353933383732613761333230
-          6461633533373466346138656462346532303430653465306334
-    wireguard_mesh_pub_key: 'gQH/0cJAwFzmUyoqQ/zkQt5Ez3r+UL+ZSbWcovJMCCw='
-    wireguard_mesh_port: 10051
-    wireguard_mesh_address: 'fdff:434f:43bb::2'
-    wireguard_mesh_endpoint: '2001:41d0:a:1fa9::902:18'
-    wireguard_mesh_mac_prefix: '02:ff:43:4f:43:2'
-  - name: 'sim'
-    net4: '10.222.176.0/21'
-    net6: '2a03:2260:1016:0401::/64'
-    site_net6: 'fd62:44e1:da:0400::/64'
-    fastd_secret: !vault |
-          $ANSIBLE_VAULT;1.1;AES256
-          36623461376163303538353865656462643537646265393461656337383936363634653063363938
-          3735616161636231633238323935313861346163636565620a353132303235636662366231393236
-          30323734313065356132623736633231326537626462366264653138666533633461393830336634
-          6530666637613164340a663133386134393235636362633833373531323132636138623163656638
-          34363637623331666335353464366539623936306437356538393034376232346566323431636231
-          32653236386632656633636438303130323065386635616462666631386361396233303965393332
-          63333233656336313633303166333638663335363035653230316633303233376131396135373462
-          34343163616561343163
-    fastd_mesh_mac: '02:ff:53:49:4d:10'
-    fastd_port1: 10018
-    fastd_port2: 10019
-    bat_ipv6: '2a03:2260:1016:0401::1'
-    bat_ipv4: '10.222.176.1'
-    bat_ipv4_cidr: 21
-    dhcp_subnet: '10.222.176.0'
-    dhcp_netmask: '255.255.240.0'
-    dhcp_start: '10.222.176.50'
-    dhcp_end: '10.222.183.250'
-    wireguard_mesh_number: 1
-    wireguard_mesh_priv_key: !vault |
-          $ANSIBLE_VAULT;1.1;AES256
-          30613965636361353637353963636263363931616566643364326162323765616266633033336538
-          3038653965303234356665646166623766616163353764300a303033323935376261303161366133
-          66306431323365626366383265303438643964343232383939616134303239633333363638333137
-          3936663331336261620a346263663935643962326663356639613531323735636164396461393936
-          66386466333833393635666431326664383830343765323438613364656631383338373163376537
-          6630303832313539383664366338383333633163633139366338
-    wireguard_mesh_pub_key: 'leFz1AeyMu884CRWkET9epW3jGksyopaANNiskvAkmc='
-    wireguard_mesh_port: 10054
-    wireguard_mesh_address: 'fdff:5349:4dbb::1'
-    wireguard_mesh_endpoint: '2001:41d0:a:1fa9::902:18'
-    wireguard_mesh_mac_prefix: '02:ff:53:49:4d:1'
+sites: []
 wireguard_bb_name: 'adlerweb1'
 wireguard_bb_endpoint: '2001:41d0:a:1fa9::902:18'
 wireguard_bb_priv_key: !vault |
--- a/host_vars/ff-niyawe4
+++ b/host_vars/ff-niyawe4
@ -39,6 +39,82 @@ sites:
    wireguard_mesh_address: 'fdff:5757:bb::1'
    wireguard_mesh_endpoint: '2a01:4f8:a0:9395:2::4'
    wireguard_mesh_mac_prefix: '02:ff:57:57:00:1'
+  - name: 'sim'
+    net4: '10.222.176.0/21'
+    net6: '2a03:2260:1016:0401::/64'
+    site_net6: 'fd62:44e1:da:0400::/64'
+    fastd_secret: !vault |
+          $ANSIBLE_VAULT;1.1;AES256
+          36623461376163303538353865656462643537646265393461656337383936363634653063363938
+          3735616161636231633238323935313861346163636565620a353132303235636662366231393236
+          30323734313065356132623736633231326537626462366264653138666533633461393830336634
+          6530666637613164340a663133386134393235636362633833373531323132636138623163656638
+          34363637623331666335353464366539623936306437356538393034376232346566323431636231
+          32653236386632656633636438303130323065386635616462666631386361396233303965393332
+          63333233656336313633303166333638663335363035653230316633303233376131396135373462
+          34343163616561343163
+    fastd_mesh_mac: '02:ff:53:49:4d:10'
+    fastd_port1: 10018
+    fastd_port2: 10019
+    bat_ipv6: '2a03:2260:1016:0401::1'
+    bat_ipv4: '10.222.176.1'
+    bat_ipv4_cidr: 21
+    dhcp_subnet: '10.222.176.0'
+    dhcp_netmask: '255.255.240.0'
+    dhcp_start: '10.222.176.50'
+    dhcp_end: '10.222.183.250'
+    wireguard_mesh_number: 1
+    wireguard_mesh_priv_key: !vault |
+          $ANSIBLE_VAULT;1.1;AES256
+          30613965636361353637353963636263363931616566643364326162323765616266633033336538
+          3038653965303234356665646166623766616163353764300a303033323935376261303161366133
+          66306431323365626366383265303438643964343232383939616134303239633333363638333137
+          3936663331336261620a346263663935643962326663356639613531323735636164396461393936
+          66386466333833393635666431326664383830343765323438613364656631383338373163376537
+          6630303832313539383664366338383333633163633139366338
+    wireguard_mesh_pub_key: 'leFz1AeyMu884CRWkET9epW3jGksyopaANNiskvAkmc='
+    wireguard_mesh_port: 10054
+    wireguard_mesh_address: 'fdff:5349:4dbb::1'
+    wireguard_mesh_endpoint: '2a01:4f8:a0:9395:2::4'
+    wireguard_mesh_mac_prefix: '02:ff:53:49:4d:1'
+  - name: 'coc'
+    net4: '10.222.56.0/21'
+    net6: '2a03:2260:1016:0102::/64'
+    site_net6: 'fd62:44e1:da:0100::/64'
+    fastd_secret: !vault |
+          $ANSIBLE_VAULT;1.1;AES256
+          64346365626531663039636230633430613338336164623065393964313538633839346537356533
+          3363313832333561373134363136333663313864383466360a333533643462336533336433353030
+          64306535326562343964373931306366613365356335386163303062363663383264353566656438
+          3838323261303331380a613366306566623531323162373266663863393563323232626565346163
+          64333835356662643561373062393831303366656138356464326232363235373734663038316336
+          37313164306565643032373938353434393333653531623635663030613861306663373761336233
+          65373565653939663832353565656262306633306461316461343735336431393033316433313164
+          35346363653832386138
+    fastd_mesh_mac: '02:ff:43:4f:43:20'
+    fastd_port1: 10012
+    fastd_port2: 10013
+    bat_ipv6: '2a03:2260:1016:0102::1'
+    bat_ipv4: '10.222.56.1'
+    bat_ipv4_cidr: 21
+    dhcp_subnet: '10.222.56.0'
+    dhcp_netmask: '255.255.248.0'
+    dhcp_start: '10.222.56.50'
+    dhcp_end: '10.222.63.250'
+    wireguard_mesh_number: 2
+    wireguard_mesh_priv_key: !vault |
+          $ANSIBLE_VAULT;1.1;AES256
+          30616336326166366137353934323334356336353933643561333432303134303766313664666265
+          3834626539666264366566343161636234313036613337340a663937353336333938656362373631
+          36633136386165636362643764306432353632626330386464316639646435323032313262313363
+          3861353234373533310a323166666232613861616637386262356266316336323263656336663366
+          35616566656538373633326531323766303532613861623765653839353933383732613761333230
+          6461633533373466346138656462346532303430653465306334
+    wireguard_mesh_pub_key: 'gQH/0cJAwFzmUyoqQ/zkQt5Ez3r+UL+ZSbWcovJMCCw='
+    wireguard_mesh_port: 10051
+    wireguard_mesh_address: 'fdff:434f:43bb::2'
+    wireguard_mesh_endpoint: '2a01:4f8:a0:9395:2::4'
+    wireguard_mesh_mac_prefix: '02:ff:43:4f:43:2'
 wireguard_bb_name: 'niyawe4'
 wireguard_bb_endpoint: '2a01:4f8:a0:9395:2::4'
 wireguard_bb_priv_key: !vault |
--- a/roles/install_fastd/files/fastd_grep.sh
+++ b/roles/install_fastd/files/fastd_grep.sh
@ -0,0 +1,7 @@
+#!/bin/sh
+
+for file in /run/ff*.socket
+do
+    echo $file
+    nc -U $file | jq -r '.peers | keys[] as $k | "\(.[$k] | .connection.mac_addresses[]) \(.[$k] | .address) \($k)"' | grep $1
+done
--- a/roles/install_fastd/tasks/main.yml
+++ b/roles/install_fastd/tasks/main.yml
@ -39,6 +39,20 @@
      mode: 0744
  with_items: "{{ sites }}"

+- name: add fastd_grep script
+  copy:
+      src: fastd_grep.sh
+      dest: /root/fastd_grep.sh
+      mode: 0744
+
+- name: install fastd_grep dependencies
+  pacman:
+      name:
+        - openbsd-netcat
+        - jq
+      state: present
+
+
 - name: start and enable fastd service
  systemd:
      name: fastd@ff{{ item.name }}.service
Author	SHA1	Message	Date
Niklas Yann Wettengel	a778bc7c93	coc2 -> ff-niyawe4	3 years ago
Niklas Yann Wettengel	1381cce6f4	sim1 -> ff-niyawe4	3 years ago
Niklas Yann Wettengel	acd20615ab	new niyawe ssh-keys	4 years ago
Niklas Yann Wettengel	f8dbb9f988	fastd grep script	4 years ago