From 85404dc87569a501e9f1f7ec4125c81da7e537c3 Mon Sep 17 00:00:00 2001 From: mh Date: Mon, 16 Mar 2009 00:45:59 +0000 Subject: this isn't needed in the https section :-/ --- templates/vhosts/perl/CentOS.erb | 3 --- templates/vhosts/php/CentOS.erb | 3 --- templates/vhosts/php_joomla/CentOS.erb | 3 --- templates/vhosts/php_simplemachine/CentOS.erb | 3 --- templates/vhosts/php_wordpress/CentOS.erb | 3 --- 5 files changed, 15 deletions(-) diff --git a/templates/vhosts/perl/CentOS.erb b/templates/vhosts/perl/CentOS.erb index ee10e33..5a5c2b4 100644 --- a/templates/vhosts/perl/CentOS.erb +++ b/templates/vhosts/perl/CentOS.erb @@ -76,9 +76,6 @@ ErrorLog <%= logdir %>/error_log CustomLog <%= logdir %>/access_log combined - <%- if ssl_mode.to_s == 'force' then -%> - Redirect permanent / https://<%= servername %>/ - <%- end -%> <%- if default_charset.to_s != 'absent' then -%> AddDefaultCharset <%= default_charset %> <%- end -%> diff --git a/templates/vhosts/php/CentOS.erb b/templates/vhosts/php/CentOS.erb index 88da60b..7cae983 100644 --- a/templates/vhosts/php/CentOS.erb +++ b/templates/vhosts/php/CentOS.erb @@ -78,9 +78,6 @@ AssignUserId <%= run_uid+" "+run_gid %> <%- end -%> - <%- if ssl_mode.to_s == 'force' then -%> - Redirect permanent / https://<%= servername %>/ - <%- end -%> <%- if default_charset.to_s != 'absent' then -%> AddDefaultCharset <%= default_charset %> <%- end -%> diff --git a/templates/vhosts/php_joomla/CentOS.erb b/templates/vhosts/php_joomla/CentOS.erb index e05c8da..285cf8d 100644 --- a/templates/vhosts/php_joomla/CentOS.erb +++ b/templates/vhosts/php_joomla/CentOS.erb @@ -104,9 +104,6 @@ AssignUserId <%= run_uid+" "+run_gid %> <%- end -%> - <%- if ssl_mode.to_s == 'force' then -%> - Redirect permanent / https://<%= servername %>/ - <%- end -%> <%- if default_charset.to_s != 'absent' then -%> AddDefaultCharset <%= default_charset %> <%- end -%> diff --git a/templates/vhosts/php_simplemachine/CentOS.erb b/templates/vhosts/php_simplemachine/CentOS.erb index ba2eaa0..673d92f 100644 --- a/templates/vhosts/php_simplemachine/CentOS.erb +++ b/templates/vhosts/php_simplemachine/CentOS.erb @@ -78,9 +78,6 @@ AssignUserId <%= run_uid+" "+run_gid %> <%- end -%> - <%- if ssl_mode.to_s == 'force' then -%> - Redirect permanent / https://<%= servername %>/ - <%- end -%> <%- if default_charset.to_s != 'absent' then -%> AddDefaultCharset <%= default_charset %> <%- end -%> diff --git a/templates/vhosts/php_wordpress/CentOS.erb b/templates/vhosts/php_wordpress/CentOS.erb index 37800d5..e315b7b 100644 --- a/templates/vhosts/php_wordpress/CentOS.erb +++ b/templates/vhosts/php_wordpress/CentOS.erb @@ -80,9 +80,6 @@ AssignUserId <%= run_uid+" "+run_gid %> <%- end -%> - <%- if ssl_mode.to_s == 'force' then -%> - Redirect permanent / https://<%= servername %>/ - <%- end -%> <%- if default_charset.to_s != 'absent' then -%> AddDefaultCharset <%= default_charset %> <%- end -%> -- cgit v1.2.3