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

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

Browse Source 
Reviewed-on: #80
This commit is contained in:
emmatveev 2025-06-10 01:11:41 +03:00
commit cd2e02bb82
2 changed files with 57 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,59 +1,69 @@
from requests import get from requests import get
import os import os
import sys
from minio import Minio from minio import Minio
def main(): minio_client = Minio(
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 )
)
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 = '' 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;
server_name {host}; server_name {host};
ssl_certificate /etc/nginx/{host}/fullchain.pem; ssl_certificate /etc/nginx/{host}/fullchain.pem;
ssl_certificate_key /etc/nginx/{host}/privkey.pem; ssl_certificate_key /etc/nginx/{host}/privkey.pem;
add_header X-Frame-Options "SAMEORIGIN" always; add_header X-Frame-Options "SAMEORIGIN" always;
add_header X-XSS-Protection "1; mode=block" always; add_header X-XSS-Protection "1; mode=block" always;
add_header X-Content-Type-Options "nosniff" always; add_header X-Content-Type-Options "nosniff" always;
add_header Referrer-Policy "no-refferer-when-downgrade" always; add_header Referrer-Policy "no-refferer-when-downgrade" always;
add_header Content-Security-Policy "default-src * data: 'unsafe-eval' 'unsafe-inline'" always; add_header Content-Security-Policy "default-src * data: 'unsafe-eval' 'unsafe-inline'" always;
location / {{ location / {{
resolver 127.0.0.11; resolver 127.0.0.11;
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:
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')
try: try:
os.mkdir(f'/etc/nginx/{host}') os.makedirs(f'/etc/nginx/{host}', exist_ok=True)
except FileExistsError: 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: 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:
with open('/etc/nginx/hosts.conf', 'w') as fp: print(f"Error processing host {host}: {e}", file=sys.stderr)
fp.write(config) continue
try: try:
main() with open('/etc/nginx/hosts.conf', 'w') as fp:
fp.write(config)
except Exception as e: except Exception as e:
print(e) print(f"Error writing config file: {e}", file=sys.stderr)
sys.exit(1)

11
nginx/nginx-dev/refre.sh
View File

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