Commit e57895fe authored by nanahira's avatar nanahira

changes while deploying

parent 5c3adadb
[defaults]
host_key_checking = False
strategy_plugins = mitogen-0.2.9/ansible_mitogen/plugins/strategy
strategy = mitogen_linear
strategy = mitogen_free
......@@ -3,18 +3,19 @@ router id {{address}};
protocol device {
}
protocol direct {
disabled;
ipv4;
ipv6;
}
#protocol direct {
# disabled;
# ipv4;
# ipv6;
#}
{% for interface in lan_interfaces %}
protocol direct {
ipv4 {
import all;
};
ipv4;
ipv6;
interface "{{interface}}";
}
{% endfor %}
protocol kernel {
ipv4 {
......
......@@ -24,11 +24,11 @@
# conn: '{{item}}'
# with_items: '{{ connections }}'
# when: "item.protocol == 'null'"
- name: 'loop through list from a variable'
include_tasks: 'protocols/{{item.protocol}}/configure.yaml'
vars:
conn: '{{item}}'
with_items: '{{ connections }}'
# - name: 'loop through list from a variable'
# include_tasks: 'protocols/{{item.protocol}}/configure.yaml'
# vars:
# conn: '{{item}}'
# with_items: '{{ connections }}'
# when: "item.protocol != 'null'"
- name: 'frps'
include_tasks: 'protocols/wgfrp/frps.yaml'
......
#!/usr/bin/env bash
{% for net in route_lists.mycard %}
ip rule del pref 299 to {{net}} lookup main
{% endfor %}
# 针对网关设置mark
{% for gateway in gateways %}
......
......@@ -5,6 +5,10 @@
ipset restore -f /etc/wireguard/{{list}}.ipset
{% endfor %}
{% for net in route_lists.mycard %}
ip rule add pref 299 to {{net}} lookup main
{% endfor %}
# 针对网关设置mark
{% for gateway in gateways %}
......
......@@ -56,7 +56,7 @@ class InventoryBuilder {
plan.gatewayAddress = hosts[plan.gateway].address;
}
// 所有内网网段
this.route_lists.mycard = ["10.199.0.0/16", "10.200.0.0/15"];
this.route_lists.mycard = ["10.198.0.0/16", "10.200.0.0/15"];
for (const h in this.hosts) {
const host = this.hosts[h]
for (const c of host.subnets.split(",")) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment