nginx/nginx-dev/prepare.py

@@ -1,9 +1,9 @@
 from requests import get
 import os
-import sys
 from minio import Minio
 
 
+def main():
     minio_client = Minio(
         "minio.develop.sprinthub.ru:9000",
         access_key="serviceminioadmin",
@@ -11,14 +11,8 @@ minio_client = Minio(
         secure=False
     )
 
-try:
-    response = get('http://configurator/api/v1/fetch?project=certupdater&stage=development')
-    response.raise_for_status()  # Raises an exception for HTTP errors
-    hosts = response.json()['configs']['hosts']
-except Exception as e:
-    print(f"Error fetching config: {e}", file=sys.stderr)
-    sys.exit(1)
 
+    hosts = get('http://configurator/api/v1/fetch?project=certupdater&stage=development').json()['configs']['hosts']
     hosts = {**hosts, 'platform.develop.sprinthub.ru': {'host': 'platform-nginx', 'port': 1238}}
 
     config = ''
@@ -44,26 +38,22 @@ for host, params in hosts.items():
                 }}
             }}\n\n
         '''.format(host=host, target_host=params['host'], port=params['port'])
-    try:
         fullchain = minio_client.get_object("certupdater", f'certificates/{host}/fullchain.pem')
         privkey = minio_client.get_object("certupdater", f'certificates/{host}/privkey.pem')
         try:
-            os.makedirs(f'/etc/nginx/{host}', exist_ok=True)
+            os.mkdir(f'/etc/nginx/{host}')
-        except OSError as e:
+        except FileExistsError:
-            print(f"Error creating directory: {e}", file=sys.stderr)
+            ...
-            continue
-        
         with open(f"/etc/nginx/{host}/fullchain.pem", 'wb') as fp:
             fp.write(fullchain.data)
         with open(f"/etc/nginx/{host}/privkey.pem", 'wb') as fp:
             fp.write(privkey.data)
-    except Exception as e:
-        print(f"Error processing host {host}: {e}", file=sys.stderr)
-        continue
 
-try:
     with open('/etc/nginx/hosts.conf', 'w') as fp:
         fp.write(config)
+
+
+try:
+    main()
 except Exception as e:
-    print(f"Error writing config file: {e}", file=sys.stderr)
+    print(e)
-    sys.exit(1)

nginx/nginx-dev/refre.sh

@@ -1,11 +1,4 @@
 #!/bin/bash
 
-if ! python3 prepare.py; then
+python3 prepare.py
-    echo "Error running prepare.py" >&2
+nginx -s reload
-    exit 1
-fi
-
-if ! nginx -s reload; then
-    echo "Error reloading nginx" >&2
-    exit 1
-fi