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

ansible/bird.conf.j2

@@ -46,6 +46,41 @@ protocol kernel {
 {% endif %}
 {% endfor %}
 
+ipv4 table gfwiplist;
+ipv4 table chnroute_reverse;
+{% for net in gfwiplist %}
+protocol static {
+        ipv4 {
+            table gfwiplist;
+        };
+        igp table master4;
+        route {{net}} recursive 10.199.0.12;
+}
+{% endfor %}
+{% for net in chnroute_reverse %}
+protocol static {
+        ipv4 {
+            table chnroute_reverse;
+        };
+        igp table master4;
+        route {{net}} recursive 10.199.0.12;
+}
+{% endfor %}
+protocol kernel {
+    ipv4 {
+          table gfwiplist;
+          export all;
+    };
+    kernel table 401;
+}
+protocol kernel {
+    ipv4 {
+          table chnroute_reverse;
+          export all;
+    };
+    kernel table 402;
+}
+
 protocol ospf v2 {
   	ipv4 {
 		import all;

src/inventory.ts

@@ -71,6 +71,7 @@ class InventoryBuilder {
     return {
       ansible_ssh_user: host.user,
       address: host.address,
+      isCN: host.location.startsWith("CN")
       key: host.wgPrivateKey,
       frpsPort: host.frpsPort,
       frpToken: host.frpToken,