From def14f0993b863bba310488a26e981e8587bbe22 Mon Sep 17 00:00:00 2001 From: Niklas Yann Wettengel Date: Sun, 23 Aug 2020 13:23:57 +0200 Subject: [PATCH] fastd: accept all keys --- roles/install_fastd/files/verify.sh | 2 ++ roles/install_fastd/tasks/main.yml | 24 +++++---------------- roles/install_fastd/templates/fastd.conf.j2 | 5 +---- 3 files changed, 8 insertions(+), 23 deletions(-) create mode 100644 roles/install_fastd/files/verify.sh diff --git a/roles/install_fastd/files/verify.sh b/roles/install_fastd/files/verify.sh new file mode 100644 index 0000000..039e4d0 --- /dev/null +++ b/roles/install_fastd/files/verify.sh @@ -0,0 +1,2 @@ +#!/bin/sh +exit 0 diff --git a/roles/install_fastd/tasks/main.yml b/roles/install_fastd/tasks/main.yml index 03004ce..76bee05 100644 --- a/roles/install_fastd/tasks/main.yml +++ b/roles/install_fastd/tasks/main.yml @@ -32,25 +32,11 @@ notify: restart fastd{{ item.name }} with_items: "{{ sites }}" -- name: add fastd peers folder - file: - path: /etc/fastd/ff{{ item.name }}/peers - state: directory - with_items: "{{ sites }}" - -- name: add fastd peer api script - template: - src: fastd-api.php.j2 - dest: /etc/fastd/ff{{ item.name }}/bin/fastd-api.php - with_items: "{{ sites }}" - -- name: setup cronjob for fastd-api - cron: - name: fastd-api-{{ item.name }} - minute: '*/10' - user: root - cron_file: fastd-api - job: '/usr/bin/php /etc/fastd/ff{{ item.name }}/bin/fastd-api.php' +- name: add fastd verify script + copy: + src: verify.sh + dest: /etc/fastd/ff{{ item.name }}/bin/verify.sh + mode: 0744 with_items: "{{ sites }}" - name: start and enable fastd service diff --git a/roles/install_fastd/templates/fastd.conf.j2 b/roles/install_fastd/templates/fastd.conf.j2 index 1ec818d..417d8e8 100644 --- a/roles/install_fastd/templates/fastd.conf.j2 +++ b/roles/install_fastd/templates/fastd.conf.j2 @@ -7,10 +7,7 @@ bind any:{{ item.fastd_port1 }}; hide ip addresses yes; hide mac addresses yes; mtu 1280; -peer group "clients" { - include peers from "peers"; -} secret "{{ item.fastd_secret }}"; on up "/etc/fastd/ff{{ item.name }}/bin/up.sh $INTERFACE"; status socket "/run/ff{{ item.name }}1.socket"; - +on verify "/etc/fastd/ff{{ item.name }}/bin/verify.sh";