add [Aliases] support
This commit is contained in:
parent
841e6043c6
commit
df66e50d47
@ -19,7 +19,7 @@ from ovh import ovh
|
|||||||
def load_conf():
|
def load_conf():
|
||||||
global zone_filename, log_filename
|
global zone_filename, log_filename
|
||||||
global wan_hostname, zone_domain, zone_subdomain
|
global wan_hostname, zone_domain, zone_subdomain
|
||||||
global hosts_list, hosts_ipv4_nat_list
|
global hosts_list, hosts_ipv4_nat_list, hosts_alias_list
|
||||||
global mail_from, mail_to
|
global mail_from, mail_to
|
||||||
|
|
||||||
conf = configparser.ConfigParser(allow_no_value=True)
|
conf = configparser.ConfigParser(allow_no_value=True)
|
||||||
@ -36,6 +36,7 @@ def load_conf():
|
|||||||
|
|
||||||
hosts_list = [ host for host in conf['Hosts'] ]
|
hosts_list = [ host for host in conf['Hosts'] ]
|
||||||
hosts_ipv4_nat_list = [ host for host in conf['NatHosts'] ]
|
hosts_ipv4_nat_list = [ host for host in conf['NatHosts'] ]
|
||||||
|
hosts_alias_list = conf['Aliases']
|
||||||
|
|
||||||
|
|
||||||
def ping(hostname):
|
def ping(hostname):
|
||||||
@ -43,6 +44,7 @@ def ping(hostname):
|
|||||||
ret = subprocess.run(cmd.split(), stdout=subprocess.PIPE, stderr=subprocess.PIPE)
|
ret = subprocess.run(cmd.split(), stdout=subprocess.PIPE, stderr=subprocess.PIPE)
|
||||||
return 0 if ret.returncode else 1
|
return 0 if ret.returncode else 1
|
||||||
|
|
||||||
|
|
||||||
def get_ipv6_hosts():
|
def get_ipv6_hosts():
|
||||||
r = sysbus.requete('Devices:get')
|
r = sysbus.requete('Devices:get')
|
||||||
|
|
||||||
@ -51,6 +53,8 @@ def get_ipv6_hosts():
|
|||||||
if not 'IPv6Address' in h or not h['IPv6Address']:
|
if not 'IPv6Address' in h or not h['IPv6Address']:
|
||||||
continue
|
continue
|
||||||
hostname = h['Name']
|
hostname = h['Name']
|
||||||
|
if hostname in hosts_alias_list:
|
||||||
|
hostname = hosts_alias_list[hostname]
|
||||||
for a in h['IPv6Address']:
|
for a in h['IPv6Address']:
|
||||||
if a['Scope'] != 'global' or a['Status'] != 'reachable':
|
if a['Scope'] != 'global' or a['Status'] != 'reachable':
|
||||||
continue
|
continue
|
||||||
|
@ -13,6 +13,9 @@ mypc1
|
|||||||
mypc2
|
mypc2
|
||||||
mypc3
|
mypc3
|
||||||
|
|
||||||
|
[Aliases]
|
||||||
|
mypc1-wifi = mypc1
|
||||||
|
|
||||||
[NatHosts]
|
[NatHosts]
|
||||||
mypc2
|
mypc2
|
||||||
mypc4
|
mypc4
|
||||||
|
Loading…
Reference in New Issue
Block a user