Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
1 change: 1 addition & 0 deletions files/nginx/odk.conf.template
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
server {
listen 443 default_server ssl;
server_tokens off;

ssl_certificate /etc/nginx/ssl/nginx.default.crt;
ssl_certificate_key /etc/nginx/ssl/nginx.default.key;
Expand Down
2 changes: 2 additions & 0 deletions files/nginx/redirector.conf
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ server {
listen 80 reuseport;
listen [::]:80 reuseport;
server_name ${DOMAIN};
server_tokens off;

# Anything requesting this particular URL should be served content from
# Certbot's folder so the HTTP-01 ACME challenges can be completed for the
Expand All @@ -23,6 +24,7 @@ server {
server {
listen 80 default_server;
listen [::]:80 default_server;
server_tokens off;

return 421;
}
3 changes: 2 additions & 1 deletion files/nginx/setup-odk.sh
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,8 @@ else
echo "starting nginx for upstream ssl..."
else
# remove letsencrypt challenge reply, but keep 80 to 443 redirection
perl -i -ne 'print if $. < 7 || $. > 14' /etc/nginx/conf.d/redirector.conf
perl -i -ne 'print if $. < 8 || $. > 15' /etc/nginx/conf.d/redirector.conf

echo "starting nginx for custom ssl and self-signed certs..."
fi
exec nginx -g "daemon off;"
Expand Down
11 changes: 11 additions & 0 deletions test/nginx/run-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,15 @@ wait_for_http_response 5 localhost:9000 421

npm run test:nginx

log "Linting nginx config with gixy-ng..."
# see: https://github.com/dvershinin/gixy
docker_compose exec nginx bash -euc '
apt update
apt install -y python3-venv
python3 -m venv .venv
. .venv/bin/activate
pip install gixy-ng
gixy -lll
'

log "Completed OK."