Added multiple rewrites support (with optional conditions)

manifests/resource/vhost.pp

@@ -74,8 +74,9 @@
 #      options like log format to the end.
 #   [*error_log*]               - Where to write error log. May add additional
 #      options like error level to the end.
-#   [*passenger_cgi_param*]     - Allows one to define additional CGI environment 
+#   [*passenger_cgi_param*]     - Allows one to define additional CGI environment
 #      variables to pass to the backend application
+#   [*rewrites*]                - Rewrite rules for the server
 # Actions:
 #
 # Requires:
@@ -136,13 +137,15 @@
   $error_log              = undef,
   $passenger_cgi_param    = undef,
   $use_default_location   = true,
+  $rewrites               = {},
 ) {
 
   validate_array($location_allow)
   validate_array($location_deny)
   validate_array($proxy_set_header)
   validate_array($index_files)
   validate_array($server_name)
+  validate_hash($rewrites)
 
   File {
     ensure => $ensure ? {
@@ -197,7 +200,7 @@
   if ($ssl == true) and ($ssl_port == $listen_port) {
     $ssl_only = true
   }
-  
+
   if $use_default_location == true {
     # Create the default location reference for the vHost
     nginx::resource::location {"${name}-default":

templates/vhost/vhost_header.erb

@@ -5,6 +5,17 @@ server {
   listen [<%= @ipv6_listen_ip %>]:<%= @ipv6_listen_port %> <% if @ipv6_listen_options %><%= @ipv6_listen_options %><% end %> ipv6only=on;
 <% end %>
   server_name           <%= @rewrite_www_to_non_www ? @name.gsub(/^www\./, '') : @server_name.join(" ") %>;
+<%- if (defined? @rewrites) %>
+  <% @rewrites.each do |i, rewrite| %>
+    <% if (rewrite['when'] && !rewrite['when'].empty?) %>
+  if (<%= rewrite['when'] %>){
+    rewrite "<%= rewrite['regex'] %>" <%= rewrite['target'] %>;
+  }
+    <% else %>
+  rewrite <%= rewrite['regex'] %> <%= rewrite['target'] %>;
+    <% end %>
+  <% end %>
+<% end -%>
 <% if defined? @auth_basic -%>
   auth_basic           "<%= @auth_basic %>";
 <% end -%>
@@ -34,4 +45,3 @@ server {
 
   access_log            <%= @access_log_real %>;
   error_log             <%= @error_log_real %>;
-

templates/vhost/vhost_ssl_header.erb

@@ -5,6 +5,18 @@ server {
   <% end %>
   server_name  <%= @rewrite_www_to_non_www ? @name.gsub(/^www\./, '') : @server_name.join(" ") %>;
 
+  <%- if (defined? @rewrites) %>
+    <% @rewrites.each do |i, rewrite| %>
+      <% if (rewrite['when'] && !rewrite['when'].empty?) %>
+  if (<%= rewrite['when'] %>){
+    rewrite "<%= rewrite['regex'] %>" <%= rewrite['target'] %>;
+  }
+      <% else %>
+  rewrite <%= rewrite['regex'] %> <%= rewrite['target'] %>;
+      <% end %>
+    <% end %>
+  <% end -%>
+
   ssl on;
 
   ssl_certificate           <%= scope.lookupvar('nginx::params::nx_conf_dir') %>/<%= @name.gsub(' ', '_') %>.crt;
@@ -30,5 +42,3 @@ server {
 <% if @passenger_cgi_param -%><% @passenger_cgi_param.each do |key,value| -%>
   passenger_set_cgi_param  <%= key %> <%= value %>;
 <% end -%><% end -%>
-
-