Adding https_redirect parameter

diff --git a/manifests/init.pp b/manifests/init.pp
index 205b11f054d773e62b5b82d2a6ce8fcd5956c1ee..ee8dc3af60e673180845e54d89ed3a33efaa9cac 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -91,6 +91,11 @@ class apache {
     require => Package["apache"],
   }
 
+  module { "rewrite":
+    ensure  => present,
+    require => Package["apache"],
+  }
+
   # apache mod_macro configuration
   file { "${apache2_macros}":
     ensure  => present,
@@ -147,7 +152,7 @@ class apache {
               $mpm = true, $mpm_user = '', $mpm_group = '', $password = '*',
               $comment = '', $sshkey = absent,
               $groups = '', $shell = '/bin/false', $manage_user = true,
-              $ssl = false, $listen = '*') {
+              $ssl = false, $listen = '*', $https_redirect = false) {
 
     $vhost = $filename ? {
       ''      => "$title",

diff --git a/templates/site.erb b/templates/site.erb
index be929071684dff7a14ddcc4ac0b5900f5319d90c..f02dbe0b4a04a2c474720e66aa1474b14d6b3637 100644 (file)
--- a/templates/site.erb
+++ b/templates/site.erb
@@ -3,6 +3,9 @@
    ServerName <%= title %>.<%= hosting_domain %>
 <% if server_alias != false %>   ServerAlias <%= server_alias %><% end %>
    DocumentRoot <%= docroot %>
+ <% if https_redirect != false %>
+    RewriteEngine On
+    RewriteRule (.*) https://<%= title %>.<%= hosting_domain %>$1<% end %>
 <% if redirect_match != false %>   RedirectMatch ^/$ <%= protocol %>://<%= title %>.<%= hosting_domain %>/<%= redirect_match %><% end %>
 <% if redirect != false %>   Redirect <%= redirect %><% end %>
 <% if aliases != false %><% aliases.each do |map| -%>