Procházet zdrojové kódy

Add local fastd blacklist

Markus Lindenberg před 8 roky
rodič
revize
9493a7e0a3

+ 1 - 1
roles/mesh-vpn-fastd/files/fastd-blacklist.sh

@@ -2,7 +2,7 @@
 
 PEER_KEY=$1
 
-if /bin/grep -Fq $PEER_KEY /etc/fastd/fastd-blacklist.json; then
+if /bin/grep -Fq $PEER_KEY /etc/fastd/fastd-blacklist.json /etc/fastd/ffdo-blacklist.txt; then
   exit 1
 else
   exit 0

+ 1 - 0
roles/mesh-vpn-fastd/files/ffdo-blacklist.txt

@@ -0,0 +1 @@
+

+ 4 - 1
roles/mesh-vpn-fastd/tasks/blacklist.yml

@@ -1,12 +1,15 @@
 ---
 
-- name: Check if blacklist file exists
+- name: Check if global blacklist file exists
   stat: path=/etc/fastd/fastd-blacklist.json
   register: blacklist
 - name: Ensure blacklist file exists
   file: name=/etc/fastd/fastd-blacklist.json state=touch owner=fastd
   when: not blacklist.stat.exists
 
+- name: Ensure ffdo blacklist file exists
+  copy: src=ffdo-blacklist.txt dest=/etc/fastd/ffdo-blacklist.txt
+
 - name: Install crontab to update the blacklist
   cron:
     name: Update fastd blacklist