better support for nat

ansible/protocols/wg/wg-setconf.conf.j2

@@ -9,10 +9,9 @@ FwMark = {{conn.localGatewayMark}}
 [Peer]
 PublicKey = {{conn.wgPublicKey}}
 AllowedIPs = 0.0.0.0/0, ::/0
-{% if conn.remoteAddress is defined %}
-Endpoint = {{conn.remoteAddress}}:{{conn.remotePort}}
+{% if conn.resolvedRemoteAddress %}
+Endpoint = {{conn.resolvedRemoteAddress}}:{{conn.remotePort}}
 PersistentKeepalive = 1
 {% endif %}
 
 # forced change 12.12
-

ansible/protocols/wg/wg.conf.j2

@@ -14,7 +14,7 @@ PreDown = dev=%i localPeerAddress={{conn.localPeerAddress}} remotePeerAddress={{
 [Peer]
 PublicKey = {{conn.wgPublicKey}}
 AllowedIPs = 0.0.0.0/0, ::/0
-{% if conn.remoteAddress is defined %}
+{% if conn.remoteAddress %}
 Endpoint = {{conn.remoteAddress}}:{{conn.remotePort}}
 PersistentKeepalive = 1
 {% endif %}

src/inventory.ts

@@ -17,8 +17,8 @@ class InventoryBuilder {
   resolveCache: Map<string, string>;
   resolver: dns.Resolver;
 
-  async resolve(domain: string) {
-    if (domain.match(/(\d{1,3}\.){3}\d{1,3}/)) {
+  async resolveDomain(domain: string) {
+    if (!domain || domain.match(/(\d{1,3}\.){3}\d{1,3}/)) {
       return domain;
     }
     if (this.resolveCache.has(domain)) {
@@ -198,8 +198,8 @@ class InventoryBuilder {
     const remoteGateway = remoteGatewayName ? this.gateways[remote.name][remoteGatewayName] : _.find(this.gateways[remote.name]);
     //const remoteGatewayMark = remoteGatewayName ? remoteGateway.mark : undefined;
     //console.log(remoteGateway.name);
-    const remoteAddress = remoteGateway.address;
-    const resolvedRemoteAddress = await this.resolve(remoteAddress);
+    const remoteAddress = remoteGateway.address || null;
+    const resolvedRemoteAddress = await this.resolveDomain(remoteAddress);
     const remoteLocalAddress = remote.address;
     const remoteNextMark = remote.nextMark;
     const remoteDestMark = remote.destMark;