forked from stove/risotto
Compare commits
2 commits
1ce00d81cb
...
55b0140edd
| Author | SHA1 | Date | |
|---|---|---|---|
| 55b0140edd | |||
| 2edf4d2e86 |
1 changed files with 4 additions and 4 deletions
|
|
@ -296,7 +296,7 @@ class Loader:
|
|||
zones_name = server_datas['zones_name']
|
||||
values = [f'{server_name}.{self.zones[zone_name]["domain_name"]}' for zone_name in zones_name]
|
||||
if server_datas['applicationservice'] == 'tls':
|
||||
true_host_name = f'{server_name}.{self.zones[list(self.zones)[0]]["domain_name"]}'
|
||||
true_host_name = f'{server_name}.{self.zones[server_datas["zones_name"][0]]["domain_name"]}'
|
||||
else:
|
||||
true_host_name = values[0]
|
||||
cfg['risotto_globals'][true_host_name] = {'global:host_name': host_name,
|
||||
|
|
@ -334,7 +334,7 @@ class Loader:
|
|||
def add_tls(self):
|
||||
dns_module_name = None
|
||||
for host in self.servers_json['hosts'].values():
|
||||
zones = [self.servers_json['zones']['external_zone']]
|
||||
zones = [self.servers_json['zones']['external_zone'], None]
|
||||
for server_name, datas in host['servers'].items():
|
||||
if not 'applicationservice' in datas:
|
||||
raise Exception(f'cannot find applicationservice for "{server_name}"')
|
||||
|
|
@ -345,8 +345,8 @@ class Loader:
|
|||
if dns_module_name:
|
||||
break
|
||||
zones[1] = datas['provider_zone']
|
||||
if zones[0] == zones[1]:
|
||||
zones = [zones[0]]
|
||||
if zones[0] == zones[1] or not zones[1]:
|
||||
zones.pop(1)
|
||||
host['servers']['tls'] = {'applicationservice': 'tls',
|
||||
'zones_name': zones,
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue