From 54ae5768a41ab1a7c745596fb224ccad69a18dd0 Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Wed, 29 Oct 2014 10:28:18 +0100
Subject: [PATCH] Fix SSL redirection

---
 .../etc/httpd/conf/httpd.conf/VirtualHosts/61redirDokuwiki      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/61redirDokuwiki b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/61redirDokuwiki
index d2428d0..71e07ae 100644
--- a/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/61redirDokuwiki
+++ b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/61redirDokuwiki
@@ -3,7 +3,7 @@ my $sslport = $modSSL{'TCPPort'} || '443';
 my $alias = $dokuwiki{'AliasOnPrimary'} || 'enabled';
 my $requiressl = $dokuwiki{'RequireSSL'} || 'yes';
 
-if (($port ne $sslport) && ($requiressl !~ m/^(enabled|yes|on)$/i) && ($alias ne 'disabled')){
+if (($port ne $sslport) && ($requiressl =~ m/^(enabled|yes|on|1|login)$/i) && ($alias ne 'disabled')){
 
     ## Redirect Web Address to Secure Address
     $OUT .= "    RewriteEngine on\n";