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

Reviewed-on: #80

nginx/nginx-dev/prepare.py

@@ -1,22 +1,28 @@
 from requests import get
 import os
+import sys
 from minio import Minio
 
 
-def main():
-    minio_client = Minio(
+minio_client = Minio(
     "minio.develop.sprinthub.ru:9000",
     access_key="serviceminioadmin",
     secret_key=os.getenv("MINIO_SECRET_KEY", "minioadmin"),
     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}}
+hosts = {**hosts, 'platform.develop.sprinthub.ru': {'host': 'platform-nginx', 'port': 1238}}
 
-    config = ''
-    for host, params in hosts.items():
+config = ''
+for host, params in hosts.items():
     config += '''
         server {{
             listen      443 ssl http2;
@@ -38,22 +44,26 @@ def main():
             }}
         }}\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.mkdir(f'/etc/nginx/{host}')
-        except FileExistsError:
-            ...
+            os.makedirs(f'/etc/nginx/{host}', exist_ok=True)
+        except OSError as e:
+            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)
-
-    with open('/etc/nginx/hosts.conf', 'w') as fp:
-        fp.write(config)
-
+    except Exception as e:
+        print(f"Error processing host {host}: {e}", file=sys.stderr)
+        continue
 
 try:
-    main()
+    with open('/etc/nginx/hosts.conf', 'w') as fp:
+        fp.write(config)
 except Exception as e:
-    print(e)
+    print(f"Error writing config file: {e}", file=sys.stderr)
+    sys.exit(1)

nginx/nginx-dev/refre.sh

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