Development
This commit is contained in:
parent
84118a4c2b
commit
916d238602
9 changed files with 51 additions and 51 deletions
|
|
@ -302,10 +302,10 @@ def config_datasource(name):
|
|||
row['server_identity_gateway'] = (
|
||||
v.get('dhcp_information', {}).get('explicit_overrides', {}).get('gateway', '')
|
||||
)
|
||||
_dns = v.get('dhcp_information', {}).get('explicit_overrides', {}).get('dns_server', [])
|
||||
row['server_identity_dns_server'] = '\n'.join(_dns) if isinstance(_dns, list) else str(_dns or '')
|
||||
_ntp = v.get('dhcp_information', {}).get('explicit_overrides', {}).get('ntp_server', [])
|
||||
row['server_identity_ntp_server'] = '\n'.join(_ntp) if isinstance(_ntp, list) else str(_ntp or '')
|
||||
_dns = v.get('dhcp_information', {}).get('explicit_overrides', {}).get('dns_servers', [])
|
||||
row['server_identity_dns_servers'] = '\n'.join(_dns) if isinstance(_dns, list) else str(_dns or '')
|
||||
_ntp = v.get('dhcp_information', {}).get('explicit_overrides', {}).get('ntp_servers', [])
|
||||
row['server_identity_ntp_servers'] = '\n'.join(_ntp) if isinstance(_ntp, list) else str(_ntp or '')
|
||||
rows.append(row)
|
||||
return rows
|
||||
|
||||
|
|
@ -819,7 +819,7 @@ def collect_tokens():
|
|||
tokens['VPN_LISTEN_PORT'] = str(vpn.get('listen_port', ''))
|
||||
tokens['VPN_SERVER_ENDPOINT'] = str(vpn.get('server_endpoint', ''))
|
||||
tokens['VPN_DOMAIN'] = str(vpn.get('domain', ''))
|
||||
tokens['VPN_DNS_SERVER'] = str(overrides.get('dns_server', ''))
|
||||
tokens['VPN_DNS_SERVER'] = str(overrides.get('dns_servers', ''))
|
||||
tokens['VPN_MTU'] = str(overrides.get('mtu', ''))
|
||||
|
||||
# Compute gateway from server_identities (lowest last-octet), fallback to first subnet host
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue