From 96cb3794f93d035438682f3dbe1449c1bca5ac21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Greg=20Kar=C3=A9kinian?= Date: Mon, 8 Apr 2019 11:21:45 +0200 Subject: [PATCH] Don't try to enable TLS in the development environment --- site-cookbooks/kosmos-mediawiki/recipes/default.rb | 2 +- .../kosmos-mediawiki/templates/default/nginx.conf.erb | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/site-cookbooks/kosmos-mediawiki/recipes/default.rb b/site-cookbooks/kosmos-mediawiki/recipes/default.rb index a80a3e1..7f25e2f 100644 --- a/site-cookbooks/kosmos-mediawiki/recipes/default.rb +++ b/site-cookbooks/kosmos-mediawiki/recipes/default.rb @@ -84,7 +84,7 @@ nginx_site server_name do action :enable end -nginx_certbot_site server_name +nginx_certbot_site server_name unless node.chef_environment == "development" # # Extensions diff --git a/site-cookbooks/kosmos-mediawiki/templates/default/nginx.conf.erb b/site-cookbooks/kosmos-mediawiki/templates/default/nginx.conf.erb index e50be3e..1492fb3 100644 --- a/site-cookbooks/kosmos-mediawiki/templates/default/nginx.conf.erb +++ b/site-cookbooks/kosmos-mediawiki/templates/default/nginx.conf.erb @@ -1,6 +1,9 @@ -<% if File.exist?(@ssl_cert) && File.exist?(@ssl_key) -%> server { + <% if node.chef_environment != "development" && File.exist?(@ssl_cert) && File.exist?(@ssl_key) -%> listen 443 ssl; + <% else -%> + listen 80; + <% end -%> server_name <%= @server_name %>; access_log /var/log/nginx/<%= @server_name %>.access.log; @@ -24,7 +27,8 @@ server { } add_header Strict-Transport-Security "max-age=15768000; includeSubDomains"; + <% if node.chef_environment != "development" && File.exist?(@ssl_cert) && File.exist?(@ssl_key) -%> ssl_certificate <%= @ssl_cert %>; ssl_certificate_key <%= @ssl_key %>; + <% end -%> } -<% end -%>