Bachir Soussi Chiadmi 8 年 前
コミット
0a863fc1bb
1 ファイル変更8 行追加5 行削除
  1. 8 5
      .htaccess

+ 8 - 5
.htaccess

@@ -71,8 +71,8 @@ DirectoryIndex index.php index.html index.htm
   # downloaded.
   RewriteRule "(^|/)\." - [F]
 
-# redirect all materiau domains to materio.com
-  RewriteCond %{HTTPS} off
+  # redirect all materiau domains to materio.com
+  RewriteCond %{HTTPS} off [OR]
   RewriteCond %{HTTP_HOST} ^basebeta\.materio\.com [OR]
   RewriteCond %{HTTP_HOST} ^materio\.com [OR]
   RewriteCond %{HTTP_HOST} ^www\.materio\.fr [OR]
@@ -80,10 +80,13 @@ DirectoryIndex index.php index.html index.htm
   RewriteCond %{HTTP_HOST} ^www\.materio\.net [OR]
   RewriteCond %{HTTP_HOST} ^materio\.net [OR]
   RewriteCond %{HTTP_HOST} ^www\.materio\.eu [OR]
-  RewriteCond %{HTTP_HOST} ^materio\.eu [NC]
-  RewriteRule ^ http://www.materio.com%{REQUEST_URI} [L,R=301]
-
+  RewriteCond %{HTTP_HOST} ^materio\.eu
+  RewriteRule ^ https://www.materio.com%{REQUEST_URI} [L,R=301]
 
+  # SSL
+  # RewriteCond %{HTTPS} off [OR]
+  # RewriteCond %{HTTP_HOST} ^materio\.com*
+  # RewriteRule ^(.*)$ https://www.materio.com/$1 [L,R=301]
 
 
   # If your site can be accessed both with and without the 'www.' prefix, you