fix ocserv blank address

ansible/protocols/oc/ocserv-user-env.j2

 # export dev=
+export localAddress={{address}}
 export localPeerAddress={{conn.localPeerAddress}}
 export remotePeerAddress={{conn.remotePeerAddress}}
 export link6Address={{conn.link6Address}}

ansible/protocols/oc/ocserv.conf.j2

@@ -34,7 +34,7 @@ disconnect-script = {{ansible_user_dir}}/nextgen-network/scripts/ocserv-predown.
 use-occtl = true
 pid-file = /run/ocserv.pid
 predictable-ips = true
-ipv4-network = {{address}}/32
+ipv4-network = 10.199.{{id}}.1/24
 ping-leases = false
 device = mcoc
 config-per-user = /etc/ocserv/config-per-user/

ansible/scripts/ocserv-postup.sh.j2

@@ -9,6 +9,8 @@ source /etc/ocserv/env-per-user/$USERNAME
 #ip link set $NEW_DEVICE up
 #ip link property add altname $DEVICE dev $NEW_DEVICE
 
+ip addr add "$localAddress/32" dev "$dev"
+
 {{ansible_user_dir}}/nextgen-network/scripts/predown.sh
 {{ansible_user_dir}}/nextgen-network/scripts/postup.sh
 

src/inventory.ts

@@ -120,7 +120,7 @@ class InventoryBuilder {
     const raw_utility = _.keyBy(await this.load('configurations'), 'key');
     this.routeLists = YAML.parse(fs.readFileSync(path.join('lists', 'result.yaml'), 'utf8'));
     // 所有内网网段
-    this.routeLists.mycard = ['10.198.0.0/16', '10.200.0.0/15', '172.16.0.0/12'];
+    this.routeLists.mycard = ['10.198.0.0/15', '10.200.0.0/15', '172.16.0.0/12'];
     for (const h in this.hosts) {
       const host = this.hosts[h];
       for (const c of host.subnets) {
@@ -194,6 +194,7 @@ class InventoryBuilder {
       ansible_ssh_user: host.user,
       ansible_ssh_port: host.sshPort || 22,
       ansible_python_interpreter: host.python || 'python3',
+      id: host.id,
       address: host.address,
       isCN: host.location.startsWith('CN'),
       key: host.wgPrivateKey,