sprinterfreak/ansible-ffrgb
1
0
Fork 0
forked from FF-RGB/ansible
Code Pull Requests 1 Releases Activity

Blacklist refined, More shortcutters added

Browse Source
This commit is contained in:
Bastian 2019-04-27 14:44:14 +02:00
parent 79e2558732
commit 009639b6a2
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
roles/fastd/files/blacklist.json
View File

@ -1,3 +1,5 @@
{ {
"ffnwshortcutter": "739ef68045fbc0614e526ecdabdf82e8142762e909e4a101d21d0dbd88d282da" "ffnwshortcutter": "739ef68045fbc0614e526ecdabdf82e8142762e909e4a101d21d0dbd88d282da",
"penner1": "3d0bfe6ff87becf0245385dca02206497a8845199742a7d766cc71913ea5e0e6",
"penner2": "f2fca7649bc086366930441d6737ffed7fd1fc809ff775917303493ff27e06fc"
} }

2
roles/fastd/files/blacklist.sh
View File

@ -5,6 +5,6 @@ if /bin/grep -Fq $PEER_KEY /opt/ffrgb_cty/vpn-blacklist/blacklist.json; then
echo "BANNED KEY: $PEER_KEY $PEER_ADDRESS" echo "BANNED KEY: $PEER_KEY $PEER_ADDRESS"
exit 1 exit 1
else else
echo "CLEAN KEY: $PEER_KEY " echo "CLEAN KEY: $PEER_KEY $PEER_ADDRESS"
exit 0 exit 0
fi fi

2
roles/fastd/tasks/main.yml
View File

@ -45,7 +45,7 @@
with_sequence: start=0 count={{ fastd_instances }} with_sequence: start=0 count={{ fastd_instances }}
- name: Create Blacklist Script - name: Create Blacklist Script
copy: src=blacklist.sh dest=/etc/fastd/{{ site_code }}/blacklist.sh mode=0755 force=no copy: src=blacklist.sh dest=/etc/fastd/{{ site_code }}/blacklist.sh mode=0755 force=yes
- name: Create symlinks (blacklist) - name: Create symlinks (blacklist)
file: src=/etc/fastd/{{ site_code }}/blacklist.sh dest=/etc/fastd/{{ site_code }}{{ item }}/blacklist.sh state=link file: src=/etc/fastd/{{ site_code }}/blacklist.sh dest=/etc/fastd/{{ site_code }}{{ item }}/blacklist.sh state=link

2
roles/fastd/templates/fastd.conf.j2
View File

@ -38,7 +38,7 @@ on down "
"; ";
{% if fastd_anonymous %} {% if fastd_anonymous %}
on verify "/etc/fastd/{{ site_code }}/blacklist.sh /opt/{{ site_code }}/vpn-blacklist/blacklist.json"; on verify "/etc/fastd/{{ site_code }}/blacklist.sh $PEER_KEY $PEER_ADDRESS /opt/{{ site_code }}/vpn-blacklist/blacklist.json";
{% endif %} {% endif %}
include peers from "peers"; include peers from "peers";