Skip to content

Commit 5ee619a

Browse files
authored
fixup planet nginx (#569)
1 parent 6ca95ca commit 5ee619a

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

pillar/base/planet.sls

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,13 @@ planet:
44
- www.planetpython.org
55
sites:
66
planetpython:
7+
domain: planetpython.org
78
cache: /srv/cache/
89
output: /srv/planetpython.org/
910
image: ghcr.io/python/planetpython:latest
1011
config: config.ini
1112
planetpython-3:
13+
domain: 3.planetpython.org
1214
cache: /srv/cache3/
1315
output: /srv/planetpython.org/3/
1416
image: ghcr.io/python/planetpython-3:latest

salt/planet/config/nginx.planet.conf.jinja

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
server {
44
listen 9000 ssl;
5-
server_name {{ site }};
5+
server_name {{ info["domain"] }};
66
error_log /var/log/nginx/{{ site }}.error.log;
77
access_log /var/log/nginx/{{ site }}.access.log;
88
ssl_certificate /etc/ssl/private/planet.psf.io.pem;
99
ssl_certificate_key /etc/ssl/private/planet.psf.io.pem;
1010

11-
root /srv/{{ site }}/;
11+
root {{ info["output"] }};
1212
}
1313

1414
{% for domain in info.get("subject_alternative_names", []) %}

0 commit comments

Comments
 (0)