Skip to content

fixup planet nginx #569

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ewdurbin merged 1 commit into from
May 1, 2025
Merged

fixup planet nginx #569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions pillar/base/planet.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions salt/planet/config/nginx.planet.conf.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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", []) %}
Expand Down