diff --git a/.gitignore b/.gitignore index 2d8b5e7..bab3562 100644 --- a/.gitignore +++ b/.gitignore @@ -10,4 +10,5 @@ content thumbs assets/avatars wiki +piwik diff --git a/.htaccess b/.htaccess index 2b614c8..22e251e 100644 --- a/.htaccess +++ b/.htaccess @@ -5,8 +5,11 @@ # enable awesome urls. i.e.: # http://yourdomain.com/about-us/team RewriteEngine on + + RewriteCond %{HTTP_HOST} !^sterzy\.com$ + RewriteRule (.*) https://sterzy.com/$1 [L,R=301] - RewriteCond %{HTTPS} !=on + RewriteCond %{HTTPS} !=on # redirect all trafic to https RewriteCond %{ENV:HTTPS} !=on diff --git a/kirby b/kirby index c490d65..a2678c4 160000 --- a/kirby +++ b/kirby @@ -1 +1 @@ -Subproject commit c490d6564a5bc74ddb78afa02ceecd2998513aa7 +Subproject commit a2678c41c7f57ef176651e257840861d6c21b653 diff --git a/panel b/panel index 73db1d7..f3010a2 160000 --- a/panel +++ b/panel @@ -1 +1 @@ -Subproject commit 73db1d731efb50c0edd768a1254228c56d7564dd +Subproject commit f3010a2676874464016f47a0eec70009bae1f0a5 diff --git a/site/snippets/header.php b/site/snippets/header.php index c4bfe66..2344876 100644 --- a/site/snippets/header.php +++ b/site/snippets/header.php @@ -32,7 +32,7 @@