Adding support for canonical_exceptions

diff --git a/manifests/init.pp b/manifests/init.pp
index 6b7b382fc37d4775df4e2267d5f58255d2410771..9e9f43fb4a214d474e2ce3868b997f4984b1cf36 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -191,7 +191,7 @@ class apache {
               $comment = '', $sshkey = absent,
               $groups = '', $shell = '/bin/false', $manage_user = true,
               $ssl = false, $listen = '*', $https_redirect = false,
-              $canonical = false) {
+              $canonical = false, $canonical_exceptions = '') {
 
     $vhost = $filename ? {
       ''      => "$title",

diff --git a/templates/site.erb b/templates/site.erb
index 586b158baff309153c01b5bc3a42141bf2795a4a..911d97ada788b47595e74efec22358ee47796c12 100644 (file)
--- a/templates/site.erb
+++ b/templates/site.erb
@@ -26,6 +26,9 @@
    </IfModule>
 <% end %>   
 <% if canonical != false %>
+   <%- for canonical_exception in canonical_exceptions -%>
+   RewriteCond %{HTTP_HOST}   !=<%= canonical_exception %> [NC]
+   <%- end -%>
    RewriteCond %{HTTP_HOST}   !=<%= canonical %> [NC]
    RewriteCond %{HTTP_HOST}   !=""
    RewriteRule ^/(.*)         <%= protocol %>://<%= canonical %>/$1 [L,R=301]