self/infra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'fix' (#83) from master into dev

Browse Source 
Reviewed-on: #83
This commit is contained in:
emmatveev 2025-06-12 01:02:55 +03:00
commit e968457afa
2 changed files with 42 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
nginx/nginx-dev/prepare.py
View File

@ -9,26 +9,28 @@ minio_client = Minio(
"minio.develop.sprinthub.ru:9000", "minio.develop.sprinthub.ru:9000",
access_key="serviceminioadmin", access_key="serviceminioadmin",
secret_key=os.getenv("MINIO_SECRET_KEY", "minioadmin"), secret_key=os.getenv("MINIO_SECRET_KEY", "minioadmin"),
secure=False secure=False,
) )
def get(url): def get(url):
with urlopen(url) as response: with urlopen(url) as response:
data = response.read().decode('utf-8') data = response.read().decode("utf-8")
return loads(data) return loads(data)
try: try:
response = get('http://configurator/api/v1/fetch?project=certupdater&stage=development') response = get(
hosts = response['configs']['hosts'] "http://configurator/api/v1/fetch?project=certupdater&stage=development"
)
hosts = response["configs"]["hosts"]
except Exception as e: except Exception as e:
print(f"Error fetching config: {e}", file=sys.stderr) print(f"Error fetching config: {e}", file=sys.stderr)
sys.exit(1) sys.exit(1)
hosts = {**hosts, 'platform.develop.sprinthub.ru': {'host': 'platform-nginx', 'port': 1238}} config = ""
config = ''
for host, params in hosts.items(): for host, params in hosts.items():
config += ''' config += """
server {{ server {{
listen 443 ssl http2; listen 443 ssl http2;
listen [::]:443 ssl http2; listen [::]:443 ssl http2;
@ -48,27 +50,33 @@ for host, params in hosts.items():
proxy_pass http://{target_host}:{port}$request_uri; proxy_pass http://{target_host}:{port}$request_uri;
}} }}
}}\n\n }}\n\n
'''.format(host=host, target_host=params['host'], port=params['port']) """.format(
host=host, target_host=params["host"], port=params["port"]
)
try: try:
fullchain = minio_client.get_object("certupdater", f'certificates/{host}/fullchain.pem') fullchain = minio_client.get_object(
privkey = minio_client.get_object("certupdater", f'certificates/{host}/privkey.pem') "certupdater", f"certificates/{host}/fullchain.pem"
)
privkey = minio_client.get_object(
"certupdater", f"certificates/{host}/privkey.pem"
)
try: try:
os.makedirs(f'/etc/nginx/{host}', exist_ok=True) os.makedirs(f"/etc/nginx/{host}", exist_ok=True)
except OSError as e: except OSError as e:
print(f"Error creating directory: {e}", file=sys.stderr) print(f"Error creating directory: {e}", file=sys.stderr)
continue continue
with open(f"/etc/nginx/{host}/fullchain.pem", 'wb') as fp: with open(f"/etc/nginx/{host}/fullchain.pem", "wb") as fp:
fp.write(fullchain.data) fp.write(fullchain.data)
with open(f"/etc/nginx/{host}/privkey.pem", 'wb') as fp: with open(f"/etc/nginx/{host}/privkey.pem", "wb") as fp:
fp.write(privkey.data) fp.write(privkey.data)
except Exception as e: except Exception as e:
print(f"Error processing host {host}: {e}", file=sys.stderr) print(f"Error processing host {host}: {e}", file=sys.stderr)
continue continue
try: try:
with open('/etc/nginx/hosts.conf', 'w') as fp: with open("/etc/nginx/hosts.conf", "w") as fp:
fp.write(config) fp.write(config)
except Exception as e: except Exception as e:
print(f"Error writing config file: {e}", file=sys.stderr) print(f"Error writing config file: {e}", file=sys.stderr)
sys.exit(1) sys.exit(1)

29
nginx/nginx-prod/prepare.py
View File

@ -7,16 +7,17 @@ minio_client = Minio(
"minio.sprinthub.ru:9000", "minio.sprinthub.ru:9000",
access_key="serviceminioadmin", access_key="serviceminioadmin",
secret_key=os.getenv("MINIO_SECRET_KEY", "minioadmin"), secret_key=os.getenv("MINIO_SECRET_KEY", "minioadmin"),
secure=False secure=False,
) )
hosts = get('http://configurator/api/v1/fetch?project=certupdater&stage=production').json()['configs']['hosts'] hosts = get(
hosts = {**hosts, 'platform.sprinthub.ru': {'host': 'platform-nginx', 'port': 1238}} "http://configurator/api/v1/fetch?project=certupdater&stage=production"
).json()["configs"]["hosts"]
config = '' config = ""
for host, params in hosts.items(): for host, params in hosts.items():
config += ''' config += """
server {{ server {{
listen 443 ssl http2; listen 443 ssl http2;
listen [::]:443 ssl http2; listen [::]:443 ssl http2;
@ -36,17 +37,21 @@ for host, params in hosts.items():
proxy_pass http://{target_host}:{port}$request_uri; proxy_pass http://{target_host}:{port}$request_uri;
}} }}
}}\n\n }}\n\n
'''.format(host=host, target_host=params['host'], port=params['port']) """.format(
fullchain = minio_client.get_object("certupdater", f'certificates/{host}/fullchain.pem') host=host, target_host=params["host"], port=params["port"]
privkey = minio_client.get_object("certupdater", f'certificates/{host}/privkey.pem') )
fullchain = minio_client.get_object(
"certupdater", f"certificates/{host}/fullchain.pem"
)
privkey = minio_client.get_object("certupdater", f"certificates/{host}/privkey.pem")
try: try:
os.mkdir(f'/etc/nginx/{host}') os.mkdir(f"/etc/nginx/{host}")
except FileExistsError: except FileExistsError:
... ...
with open(f"/etc/nginx/{host}/fullchain.pem", 'wb') as fp: with open(f"/etc/nginx/{host}/fullchain.pem", "wb") as fp:
fp.write(fullchain.data) fp.write(fullchain.data)
with open(f"/etc/nginx/{host}/privkey.pem", 'wb') as fp: with open(f"/etc/nginx/{host}/privkey.pem", "wb") as fp:
fp.write(privkey.data) fp.write(privkey.data)
with open('/etc/nginx/hosts.conf', 'w') as fp: with open("/etc/nginx/hosts.conf", "w") as fp:
fp.write(config) fp.write(config)