Merge branch 'master' of git.mycard.moe:mycard/network

README.md

+# MyCard Network
+SD-WAN that REALLY WORKS, even in China.  
+在现实世界中可以运作的 SD-WAN.
\ No newline at end of file

ansible/ansible.cfg

 [defaults]
 host_key_checking = False
 strategy_plugins = mitogen-0.2.9/ansible_mitogen/plugins/strategy
-strategy = mitogen_linear
+strategy = mitogen_free

ansible/bird.conf.j2

@@ -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 {

ansible/configure.yaml

@@ -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'

ansible/scripts/global-postdown.sh.j2

 #!/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 %}
 

ansible/scripts/global-postup.sh.j2

@@ -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 %}