From: Shane Jaroch Date: Tue, 20 Jan 2026 19:20:10 +0000 (-0500) Subject: wip tidy up X-Git-Url: https://git.nutra.tk/v1?a=commitdiff_plain;h=2cc768b448960cde7fe7c4a0c3aca1c8be10a900;p=nutratech%2Fvps-root.git wip tidy up --- diff --git a/etc/nginx/conf.d/default.prod.conf b/etc/nginx/conf.d/default.prod.conf index 3e29f99..500897e 100644 --- a/etc/nginx/conf.d/default.prod.conf +++ b/etc/nginx/conf.d/default.prod.conf @@ -167,8 +167,6 @@ server { include /etc/letsencrypt/options-ssl-nginx.conf; ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; - http2 on; - http3 on; add_header Alt-Svc 'h3=":443"; ma=86400' always; add_header Strict-Transport-Security "max-age=31536000; includeSubDomains; preload" always; ssl_trusted_certificate /etc/ssl/private/ca-certs.pem; diff --git a/etc/nginx/conf.d/git-http.conf b/etc/nginx/conf.d/git-http.dev.conf similarity index 95% rename from etc/nginx/conf.d/git-http.conf rename to etc/nginx/conf.d/git-http.dev.conf index b681509..b8162ef 100644 --- a/etc/nginx/conf.d/git-http.conf +++ b/etc/nginx/conf.d/git-http.dev.conf @@ -10,8 +10,8 @@ server { http3 on; # SSL Configuration - ssl_certificate /etc/letsencrypt/live/earthyenergy.mooo.com/fullchain.pem; # managed by Certbot - ssl_certificate_key /etc/letsencrypt/live/earthyenergy.mooo.com/privkey.pem; # managed by Certbot + ssl_certificate /etc/letsencrypt/live/nutra.tk/fullchain.pem; # managed by Certbot + ssl_certificate_key /etc/letsencrypt/live/nutra.tk/privkey.pem; # managed by Certbot include /etc/letsencrypt/options-ssl-nginx.conf; ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; diff --git a/etc/nginx/conf.d/moms-website.conf b/etc/nginx/conf.d/moms-website.conf.disabled similarity index 100% rename from etc/nginx/conf.d/moms-website.conf rename to etc/nginx/conf.d/moms-website.conf.disabled diff --git a/scripts/deploy.sh b/scripts/deploy.sh index 70ab884..60c095d 100755 --- a/scripts/deploy.sh +++ b/scripts/deploy.sh @@ -160,8 +160,8 @@ if sudo nginx -t; then sudo cp "$GITWEB_CONF_SRC" /etc/gitweb.conf fi - # Deploy Gitweb frontend assets - if [ -d "$REPO_ROOT/scripts/gitweb-simplefrontend" ]; then + # Deploy Gitweb frontend assets (Dev Only) + if [ "$ENV" == "dev" ] && [ -d "$REPO_ROOT/scripts/gitweb-simplefrontend" ]; then echo "Generating services map..." if [ -f "$REPO_ROOT/scripts/gen_services_map.py" ]; then python3 "$REPO_ROOT/scripts/gen_services_map.py" diff --git a/scripts/gen_services_map.py b/scripts/gen_services_map.py index 4a14be7..c5bc363 100755 --- a/scripts/gen_services_map.py +++ b/scripts/gen_services_map.py @@ -5,7 +5,7 @@ from pathlib import Path # Paths relative to repo root REPO_ROOT = Path(__file__).parent.parent -NGINX_CONF = REPO_ROOT / "etc/nginx/conf.d/git-http.conf" +NGINX_CONF = REPO_ROOT / "etc/nginx/conf.d/git-http.dev.conf" OUTPUT_HTML = REPO_ROOT / "scripts/gitweb-simplefrontend/services.html" HTML_TEMPLATE = """