gnunux/risotto
1
0
Fork 0
forked from stove/risotto
Code Issues Pull requests Projects Releases Wiki Activity

Compare commits

base: gnunux:1ce00d81cb7d9c25b3622ed8eb63c946e06fa9d5
Branches Tags
gnunux:main
stove:main
...
compare: gnunux:55b0140edd45b637becfbeeaedd6728329f8588b
Branches Tags
gnunux:main
stove:main

2 commits
1ce00d81cb ... 55b0140edd

Author SHA1 Message Date
Emmanuel Garette
55b0140edd better tls zone calculation 2023-07-31 19:11:01 +02:00
Emmanuel Garette
2edf4d2e86 better tls zone calculation 2023-07-31 18:50:05 +02:00
1 changed files with 4 additions and 4 deletions
Show stats Expand all files Collapse all files

8
src/risotto/machine.py
View file

@ -296,7 +296,7 @@ class Loader:
zones_name = server_datas['zones_name'] zones_name = server_datas['zones_name']
values = [f'{server_name}.{self.zones[zone_name]["domain_name"]}' for zone_name in zones_name] values = [f'{server_name}.{self.zones[zone_name]["domain_name"]}' for zone_name in zones_name]
if server_datas['applicationservice'] == 'tls': 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: else:
true_host_name = values[0] true_host_name = values[0]
cfg['risotto_globals'][true_host_name] = {'global:host_name': host_name, cfg['risotto_globals'][true_host_name] = {'global:host_name': host_name,
@ -334,7 +334,7 @@ class Loader:
def add_tls(self): def add_tls(self):
dns_module_name = None dns_module_name = None
for host in self.servers_json['hosts'].values(): 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(): for server_name, datas in host['servers'].items():
if not 'applicationservice' in datas: if not 'applicationservice' in datas:
raise Exception(f'cannot find applicationservice for "{server_name}"') raise Exception(f'cannot find applicationservice for "{server_name}"')
@ -345,8 +345,8 @@ class Loader:
if dns_module_name: if dns_module_name:
break break
zones[1] = datas['provider_zone'] zones[1] = datas['provider_zone']
if zones[0] == zones[1]: if zones[0] == zones[1] or not zones[1]:
zones = [zones[0]] zones.pop(1)
host['servers']['tls'] = {'applicationservice': 'tls', host['servers']['tls'] = {'applicationservice': 'tls',
'zones_name': zones, 'zones_name': zones,
} }