Merge pull request voxpupuli#53 from hingstarne/master

Added some minor enhancements

manifests/resource/vhost.pp

@@ -26,6 +26,8 @@
 #   [*rewrite_www_to_non_www*]  - Adds a server directive and rewrite rule to rewrite www.domain.com to domain.com in order to avoid
 #                             duplicate content (SEO);
 #   [*try_files*]           - Specifies the locations for files to be checked as an array. Cannot be used in conjuction with $proxy.
+#   [*rewrite_to_https*]    - Adds a server directive and rewrite rule to rewrite to ssl
+#   [*include_files*] 		- Adds include files to vhost
 #
 # Actions:
 #
@@ -62,6 +64,7 @@
   $server_name            = [$name],
   $www_root               = undef,
   $rewrite_www_to_non_www = false,
+  $rewrite_to_https 	  = undef,
   $location_cfg_prepend   = undef,
   $location_cfg_append    = undef,
   $try_files              = undef) {
@@ -75,6 +78,7 @@
     group  => 'root',
     mode   => '0644',
   }
+  $include_files		  = undef,
 
   # Add IPv6 Logic Check - Nginx service will not start if ipv6 is enabled
   # and support does not exist for it in the kernel.

templates/vhost/vhost_footer.erb

@@ -1,3 +1,6 @@
+<% if @include_files %><% @include_files.each do |file| -%>
+include <%= file %>;
+<% end -%><% end -%>
 }
 
 <% if rewrite_www_to_non_www %>

templates/vhost/vhost_header.erb

@@ -9,3 +9,8 @@ server {
 
   <% proxy_set_header.each do |header| %>
   proxy_set_header        <%= header %>;<% end %>
+  <% if @rewrite_to_https %>
+  if ($ssl_protocol = "") {
+       return 301 https://$host$request_uri ;
+  }
+   <% end %>