freifunk/ansible-ffibk
9
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Revert "Role service-bird-lg: update lgproxy.cfg for new p2p vpn links"

Browse source 
This reverts commit 2ca3fdd43e.
This commit is contained in:
Julian Labus 2019-03-20 10:19:48 +01:00
parent 2ca3fdd43e
commit a8784c80eb
No known key found for this signature in database
GPG key ID: 8AF209F2C6B3572A
2 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
roles/service-bird-lg/meta/main.yml
View file

@ -1,5 +1,4 @@
--- ---
dependencies: dependencies:
- { role: wireguard }
- { role: service-bird } - { role: service-bird }
- { role: service-nginx } - { role: service-nginx }

18
roles/service-bird-lg/templates/lgproxy.cfg.j2
View file

@ -3,20 +3,14 @@ DEBUG=False
LOG_FILE="/var/log/bird-lg/lg-proxy.log" LOG_FILE="/var/log/bird-lg/lg-proxy.log"
LOG_LEVEL="WARNING" LOG_LEVEL="WARNING"
BIND_IP = "{{ loopback_net_ipv4 | ipaddr(magic) | ipaddr('address') }}" BIND_IP = "{{ loopback_net_ipv4 | ipsubnet(32, magic) | ipaddr('address') }}"
BIND_PORT = 5000 BIND_PORT = 5000
ACCESS_LIST = [ ACCESS_LIST = [ {% for host in groups["ffmwu-monitoring"] %}"{{ loopback_net_ipv4 | ipsubnet(32, hostvars[host]['magic']) | ipaddr('address') }}"{% if not loop.last %}, {% endif %}{% endfor %} ]
{% for network in my_wireguard_networks %}
{% if network.remote_hostname in groups["ffmwu-monitoring"] %} # ???
{% if magic > network.remote_magic %} IPV4_SOURCE = "10.207.0.37"
"{{ network.ipv4 | ipaddr(0) | ipaddr('address') }}", IPV6_SOURCE = "fec0::a:cf:0:25"
{% else %}
"{{ network.ipv4 | ipaddr(1) | ipaddr('address') }}",
{% endif %}
{% endif %}
{% endfor %}
]
BIRD_SOCKET="/var/run/bird/bird.ctl" BIRD_SOCKET="/var/run/bird/bird.ctl"
BIRD6_SOCKET="/var/run/bird/bird6.ctl" BIRD6_SOCKET="/var/run/bird/bird6.ctl"