kosmos/chef
kosmos/chef
8
3
Fork 0
Code Issues 30 Pull Requests 3 Projects 2 Activity

Update Chef to 14.11.21 #27

Merged
greg merged 44 commits from chef_14 into master 2019-04-12 11:31:37 +00:00
Conversation 8 Commits 44 Files Changed 80 +7 -3
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 96cb3794f9 - Show all commits

2
site-cookbooks/kosmos-mediawiki/recipes/default.rb
View File

@ -84,7 +84,7 @@ nginx_site server_name do
action :enable action :enable
end end
nginx_certbot_site server_name nginx_certbot_site server_name unless node.chef_environment == "development"
# #
# Extensions # Extensions

8
site-cookbooks/kosmos-mediawiki/templates/default/nginx.conf.erb
View File

@ -1,6 +1,9 @@
<% if File.exist?(@ssl_cert) && File.exist?(@ssl_key) -%>
server { server {
<% if node.chef_environment != "development" && File.exist?(@ssl_cert) && File.exist?(@ssl_key) -%>
listen 443 ssl; listen 443 ssl;
<% else -%>
listen 80;
<% end -%>
server_name <%= @server_name %>; server_name <%= @server_name %>;
access_log /var/log/nginx/<%= @server_name %>.access.log; access_log /var/log/nginx/<%= @server_name %>.access.log;
@ -24,7 +27,8 @@ server {
} }
add_header Strict-Transport-Security "max-age=15768000; includeSubDomains"; 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 <%= @ssl_cert %>;
ssl_certificate_key <%= @ssl_key %>; ssl_certificate_key <%= @ssl_key %>;
<% end -%>
} }
<% end -%>