From a060f6603475753a97997ca095a21b68355a3c79 Mon Sep 17 00:00:00 2001
From: Ee Durbin <ewdurbin@gmail.com>
Date: Thu, 1 May 2025 08:07:29 -0400
Subject: [PATCH] fixup planet nginx

---
 pillar/base/planet.sls                     | 2 ++
 salt/planet/config/nginx.planet.conf.jinja | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pillar/base/planet.sls b/pillar/base/planet.sls
index b5003ccb..e9b3886a 100644
--- a/pillar/base/planet.sls
+++ b/pillar/base/planet.sls
@@ -4,11 +4,13 @@ planet:
     - www.planetpython.org
   sites:
     planetpython:
+      domain: planetpython.org
       cache: /srv/cache/
       output: /srv/planetpython.org/
       image: ghcr.io/python/planetpython:latest
       config: config.ini
     planetpython-3:
+      domain: 3.planetpython.org
       cache: /srv/cache3/
       output: /srv/planetpython.org/3/
       image: ghcr.io/python/planetpython-3:latest
diff --git a/salt/planet/config/nginx.planet.conf.jinja b/salt/planet/config/nginx.planet.conf.jinja
index eb1dea2b..204417c1 100644
--- a/salt/planet/config/nginx.planet.conf.jinja
+++ b/salt/planet/config/nginx.planet.conf.jinja
@@ -2,13 +2,13 @@
 
 server {
     listen 9000 ssl;
-    server_name {{ site }};
+    server_name {{ info["domain"] }};
     error_log /var/log/nginx/{{ site }}.error.log;
     access_log /var/log/nginx/{{ site }}.access.log;
     ssl_certificate /etc/ssl/private/planet.psf.io.pem;
     ssl_certificate_key /etc/ssl/private/planet.psf.io.pem;
 
-    root /srv/{{ site }}/;
+    root {{ info["output"] }};
 }
 
 {% for domain in info.get("subject_alternative_names", []) %}