From 0587c3f245931eeb45bd6ba88efc9c5c2e3b0942 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Fri, 20 May 2022 18:47:49 -0500 Subject: [PATCH] GitLab CI: test Mastodon Nginx conf --- .gitlab-ci.yml | 9 +++++++++ installation/mastodon.conf | 5 +++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0e9a716ee..faa87ef71 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -59,6 +59,15 @@ jest: - "package.json" - "yarn.lock" +nginx-test: + stage: test + image: nginx:latest + before_script: cp installation/mastodon.conf /etc/nginx/conf.d/default.conf + script: nginx -t + only: + changes: + - "installation/mastodon.conf" + build-production: stage: build script: yarn build diff --git a/installation/mastodon.conf b/installation/mastodon.conf index 33b2bd894..988a098b9 100644 --- a/installation/mastodon.conf +++ b/installation/mastodon.conf @@ -39,8 +39,9 @@ server { } server { - listen 443 ssl http2; - listen [::]:443 ssl http2; + # Uncomment these lines once you acquire a certificate: + # listen 443 ssl http2; + # listen [::]:443 ssl http2; server_name example.com; ssl_protocols TLSv1.2 TLSv1.3;