From 0b579b1feafbd5538920e20f2bff04e625598114 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Greg=20Kar=C3=A9kinian?= Date: Mon, 28 Oct 2019 11:18:31 +0100 Subject: [PATCH] Remove the redirection from HTTP to HTTPS from the mastodon vhost This is already done in the certbot vhost (https://gitea.kosmos.org/kosmos/chef/src/branch/master/site-cookbooks/kosmos-nginx/templates/default/nginx_conf_certbot.erb) and it redirects every request to HTTPS, breaking Let's Encrypt validation Fixes #110 --- site-cookbooks/kosmos-mastodon/metadata.rb | 2 +- .../templates/default/nginx_conf_mastodon.erb | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/site-cookbooks/kosmos-mastodon/metadata.rb b/site-cookbooks/kosmos-mastodon/metadata.rb index 0db3753..5617289 100644 --- a/site-cookbooks/kosmos-mastodon/metadata.rb +++ b/site-cookbooks/kosmos-mastodon/metadata.rb @@ -4,7 +4,7 @@ maintainer_email 'mail@kosmos.org' license 'MIT' description 'Installs/Configures kosmos-mastodon' long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version '0.2.0' +version '0.2.1' depends "kosmos-nginx" depends "kosmos-nodejs" diff --git a/site-cookbooks/kosmos-mastodon/templates/default/nginx_conf_mastodon.erb b/site-cookbooks/kosmos-mastodon/templates/default/nginx_conf_mastodon.erb index 1feb218..c07686e 100644 --- a/site-cookbooks/kosmos-mastodon/templates/default/nginx_conf_mastodon.erb +++ b/site-cookbooks/kosmos-mastodon/templates/default/nginx_conf_mastodon.erb @@ -4,12 +4,6 @@ server { include <%= @shared_config_path %>; } -server { - listen 80; - server_name <%= @server_name %>; - return 301 https://$server_name$request_uri; -} - map $http_upgrade $connection_upgrade { default upgrade; '' close;