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

ansible/route-plans.j2

+# force reload 8.5
 declare -A ROUTE_PLANS=(
 {% for plan in routePlans %}
 	[{{plan.destMark}}]="{{plan.addressesString}}"

ansible/scripts/switch-rules-up.sh.j2

 #!/bin/bash
-## reloaded at 6.24
+## reloaded at 8.5 3
 source {{ansible_user_dir}}/nextgen-network/scripts/utility.sh
 
 ## route plans

config-with-proxy.sh

 #!/bin/bash
 LADDER="jue"
 ssh root@10.198.1.1 -p 55322 ipset add u_${LADDER}_oversea 10.198.1.57
-#ssh nanahira@10.198.0.6 sudo ipset add u_${LADDER}_oversea 10.198.1.57
+ssh nanahira@10.198.0.6 sudo ipset add u_${LADDER}_oversea 10.198.1.57
 ./config.sh
 ssh root@10.198.1.1 -p 55322 ipset del u_${LADDER}_oversea 10.198.1.57
-#ssh nanahira@10.198.0.6 sudo ipset del u_${LADDER}_oversea 10.198.1.57
+ssh nanahira@10.198.0.6 sudo ipset del u_${LADDER}_oversea 10.198.1.57

lists/special.txt

 0.0.0.0/8
-1.1.1.0/24
 1.0.0.0/24
-8.8.8.0/24
-8.8.4.0/24
 10.0.0.0/7
 100.64.0.0/10
 127.0.0.0/8