Merge branch 'master' into feature/ubuntu-16.04

site-cookbooks/kosmos-wordpress/CHANGELOG.md

@@ -1,13 +1,6 @@
 kosmos-wordpress CHANGELOG
 ==========================
 
-This file is used to list changes made in each version of the kosmos-wordpress cookbook.
-
 0.1.0
 -----
-- [your_name] - Initial release of kosmos-wordpress
-
-- - -
-Check the [Markdown Syntax Guide](http://daringfireball.net/projects/markdown/syntax) for help with Markdown.
-
-The [Github Flavored Markdown page](http://github.github.com/github-flavored-markdown/) describes the differences between markdown on github and standard markdown.
+- [Greg Karékinian] - Initial release of kosmos-wordpress

site-cookbooks/kosmos-wordpress/templates/default/nginx.conf.erb

@@ -1,7 +1,7 @@
 server {
         listen 80;
         <% if File.exist?(@ssl_cert) && File.exist?(@ssl_key) -%>
-        listen <%= @server_port %> ssl spdy;
+        listen <%= @server_port %> ssl http2;
         <% end -%>
         server_name <%= @server_name %> <%= @server_aliases.join(" ") %>;
 
@@ -35,6 +35,7 @@ server {
         }
 
         <% if File.exist?(@ssl_cert) && File.exist?(@ssl_key) -%>
+        add_header Strict-Transport-Security "max-age=15768000; includeSubDomains";
         ssl_certificate <%= @ssl_cert %>;
         ssl_certificate_key <%= @ssl_key %>;
         <% end -%>