master #73

Merged
emmatveev merged 2 commits from master into prod 2025-06-04 21:20:54 +03:00
2 changed files with 8 additions and 8 deletions

View File

@ -12,10 +12,10 @@ minio_client = Minio(
hosts = get('http://configurator/api/v1/fetch?project=certupdater&stage=development').json()['configs']['hosts'] hosts = get('http://configurator/api/v1/fetch?project=certupdater&stage=development').json()['configs']['hosts']
hosts = list(set(hosts + ['platform.develop.sprinthub.ru'])) hosts = {**hosts, 'platform.develop.sprinthub.ru': {'host': 'platform-nginx', 'port': 1238}}
config = '' config = ''
for host in hosts: for host, params in hosts.items():
config += ''' config += '''
server {{ server {{
listen 443 ssl http2; listen 443 ssl http2;
@ -33,10 +33,10 @@ for host in hosts:
location / {{ location / {{
resolver 127.0.0.11; resolver 127.0.0.11;
proxy_pass http://{pre_domain}-nginx:1238$request_uri; proxy_pass http://{target_host}:{port}$request_uri;
}} }}
}}\n\n }}\n\n
'''.format(host=host, pre_domain=host.split('.')[0]) '''.format(host=host, target_host=params['host'], port=params['port'])
fullchain = minio_client.get_object("certupdater", f'certificates/{host}/fullchain.pem') fullchain = minio_client.get_object("certupdater", f'certificates/{host}/fullchain.pem')
privkey = minio_client.get_object("certupdater", f'certificates/{host}/privkey.pem') privkey = minio_client.get_object("certupdater", f'certificates/{host}/privkey.pem')
os.mkdir(f'/etc/nginx/{host}') os.mkdir(f'/etc/nginx/{host}')

View File

@ -12,10 +12,10 @@ minio_client = Minio(
hosts = get('http://configurator/api/v1/fetch?project=certupdater&stage=production').json()['configs']['hosts'] hosts = get('http://configurator/api/v1/fetch?project=certupdater&stage=production').json()['configs']['hosts']
hosts = list(set(hosts + ['platform.sprinthub.ru'])) hosts = {**hosts, 'platform.sprinthub.ru': {'host': 'platform-nginx', 'port': 1238}}
config = '' config = ''
for host in hosts: for host, params in hosts.items():
config += ''' config += '''
server {{ server {{
listen 443 ssl http2; listen 443 ssl http2;
@ -33,10 +33,10 @@ for host in hosts:
location / {{ location / {{
resolver 127.0.0.11; resolver 127.0.0.11;
proxy_pass http://{pre_domain}-nginx:1238$request_uri; proxy_pass http://{target_host}:{port}$request_uri;
}} }}
}}\n\n }}\n\n
'''.format(host=host, pre_domain=host.split('.')[0]) '''.format(host=host, target_host=params['host'], port=params['port'])
fullchain = minio_client.get_object("certupdater", f'certificates/{host}/fullchain.pem') fullchain = minio_client.get_object("certupdater", f'certificates/{host}/fullchain.pem')
privkey = minio_client.get_object("certupdater", f'certificates/{host}/privkey.pem') privkey = minio_client.get_object("certupdater", f'certificates/{host}/privkey.pem')
os.mkdir(f'/etc/nginx/{host}') os.mkdir(f'/etc/nginx/{host}')