diff options
Diffstat (limited to 'roles')
5 files changed, 11 insertions, 15 deletions
diff --git a/roles/install_bind/templates/named.conf.j2 b/roles/install_bind/templates/named.conf.j2 index 056a6ea..feba4de 100644 --- a/roles/install_bind/templates/named.conf.j2 +++ b/roles/install_bind/templates/named.conf.j2 @@ -4,7 +4,6 @@ options { directory "/var/named"; pid-file "/run/named/named.pid"; - dnssec-enable yes; dnssec-validation auto; auth-nxdomain no; # conform to RFC1035 @@ -29,9 +28,9 @@ options { hostname none; server-id none; - dns64 64:ff9b::/96 { - clients { any; }; - }; + //dns64 64:ff9b::/96 { + // clients { any; }; + //}; max-cache-size 1024M; }; @@ -69,47 +68,47 @@ zone "ffaw" IN { type slave; file "bak/ffaw.zone"; allow-query { any; }; - masters { 2a01:4f8:a0:826b:1::17; }; + masters { 2a01:4f8:a0:6396:1::17; }; }; zone "ffcoc" IN { type slave; file "bak/ffcoc.zone"; allow-query { any; }; - masters { 2a01:4f8:a0:826b:1::17; }; + masters { 2a01:4f8:a0:6396:1::17; }; }; zone "ffems" IN { type slave; file "bak/ffems.zone"; allow-query { any; }; - masters { 2a01:4f8:a0:826b:1::17; }; + masters { 2a01:4f8:a0:6396:1::17; }; }; zone "ffko" IN { type slave; file "bak/ffko.zone"; allow-query { any; }; - masters { 2a01:4f8:a0:826b:1::17; }; + masters { 2a01:4f8:a0:6396:1::17; }; }; zone "ffmy" IN { type slave; file "bak/ffmy.zone"; allow-query { any; }; - masters { 2a01:4f8:a0:826b:1::17; }; + masters { 2a01:4f8:a0:6396:1::17; }; }; zone "ffmyk" IN { type slave; file "bak/ffmyk.zone"; allow-query { any; }; - masters { 2a01:4f8:a0:826b:1::17; }; + masters { 2a01:4f8:a0:6396:1::17; }; }; zone "ffsim" IN { type slave; file "bak/ffsim.zone"; allow-query { any; }; - masters { 2a01:4f8:a0:826b:1::17; }; + masters { 2a01:4f8:a0:6396:1::17; }; }; diff --git a/roles/install_monitoring/files/ffmyk-influx/daemon.sh b/roles/install_monitoring/files/ffmyk-influx/daemon.sh index 1cc5a8d..19f5d33 100755 --- a/roles/install_monitoring/files/ffmyk-influx/daemon.sh +++ b/roles/install_monitoring/files/ffmyk-influx/daemon.sh @@ -3,6 +3,5 @@ cd /opt/ffmyk-influx while : ;do php -c ./php.ini -f dhcp.php php -c ./php.ini -f traffic.php - php -c ./php.ini -f fastd.php sleep 15 done diff --git a/roles/install_monitoring/templates/ffmyk-influx/traffic.php.j2 b/roles/install_monitoring/templates/ffmyk-influx/traffic.php.j2 index 9a848da..78220da 100644 --- a/roles/install_monitoring/templates/ffmyk-influx/traffic.php.j2 +++ b/roles/install_monitoring/templates/ffmyk-influx/traffic.php.j2 @@ -21,7 +21,6 @@ function traffic($iface, $alias=false) { {% endif %} {% for site in sites %} (traffic('bat{{ site.name }}')); -(traffic('vpn{{ site.name }}')); (traffic('wg{{ site.name }}')); {% endfor %} diff --git a/roles/install_tayga/templates/tayga.conf.j2 b/roles/install_tayga/templates/tayga.conf.j2 index 8606dcb..d2fe7d7 100644 --- a/roles/install_tayga/templates/tayga.conf.j2 +++ b/roles/install_tayga/templates/tayga.conf.j2 @@ -3,4 +3,3 @@ ipv4-addr {{ tayga_ipv4 }} ipv6-addr 2a03:2260:1016::64 prefix 64:ff9b::/96 dynamic-pool {{ tayga_pool }} -data-dir /var/db/tayga diff --git a/roles/install_wireguard_vpn/templates/up.sh.j2 b/roles/install_wireguard_vpn/templates/up.sh.j2 index c57d16f..7aaa380 100644 --- a/roles/install_wireguard_vpn/templates/up.sh.j2 +++ b/roles/install_wireguard_vpn/templates/up.sh.j2 @@ -5,5 +5,5 @@ ip -6 rule add from {{ wireguard_vpn_client_range }} table ffmyk priority 10 ip -6 rule add from all iif wgmyk type unreachable priority 200 -ip -6 route add {{ wireguard_vpn_client_range }} table ffmyk dev wgmyk +ip -6 route add {{ wireguard_vpn_client_range }} table ffmyk dev wgmyk proto static systemctl restart named.service |