update to kirby 3

.gitignore

@@ -11,4 +11,5 @@ thumbs
 assets/avatars
 wiki
 piwik
-
+media
+site/sessions

.gitmodules

@@ -1,9 +1,3 @@
-[submodule "site/fields/markdown"]
-	path = site/fields/markdown
-	url = https://github.com/JonasDoebertin/kirby-visual-markdown.git
 [submodule "kirby"]
 	path = kirby
 	url = https://github.com/getkirby/kirby.git
-[submodule "panel"]
-	path = panel
-	url = https://github.com/getkirby/panel.git

.htaccess

@@ -2,49 +2,53 @@
 
 # rewrite rules
 <IfModule mod_rewrite.c>
-    # 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
+  # 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]
 
-    # redirect all trafic to https
+  RewriteCond %{HTTPS} !=on
-    RewriteCond %{ENV:HTTPS} !=on
-    RewriteRule .* https://%{SERVER_NAME}%{REQUEST_URI} [R=301,L]
 
-    Redirect 301 /.well-known/carddav /owncloud/remote.php/carddav
+  # redirect all trafic to https
-    Redirect 301 /.well-known/caldav /owncloud/remote.php/caldav
+  RewriteCond %{ENV:HTTPS} !=on
+  RewriteRule .* https://%{SERVER_NAME}%{REQUEST_URI} [R=301,L]
 
-    # make sure to set the RewriteBase correctly
+  Redirect 301 /.well-known/carddav /owncloud/remote.php/carddav
-    # if you are running the site in a subfolder.
+  Redirect 301 /.well-known/caldav /owncloud/remote.php/caldav
-    # Otherwise links or the entire site will break.
-    #
-    # If your homepage is http://yourdomain.com/mysite
-    # Set the RewriteBase to:
-    #
-    # RewriteBase /mysite
 
-    # block text files in the content folder from being accessed directly
+  # block files and folders beginning with a dot, such as .git
-    RewriteRule ^content/(.*)\.(txt|md|mdown)$ index.php [L]
+  # except for the .well-known folder, which is used for Let's Encrypt and security.txt
+  RewriteRule (^|/)\.(?!well-known\/) index.php [L]
 
-    # block all files in the site folder from being accessed directly
+  # make sure to set the RewriteBase correctly
-    RewriteRule ^site/(.*) index.php [L]
+  # if you are running the site in a subfolder.
+  # Otherwise links or the entire site will break.
+  #
+  # If your homepage is http://yourdomain.com/mysite
+  # Set the RewriteBase to:
+  #
+  # RewriteBase /mysite
 
-    # block all files in the kirby folder from being accessed directly
+  # block text files in the content folder from being accessed directly
-    RewriteRule ^kirby/(.*) index.php [L]
+  RewriteRule ^content/(.*)\.(txt|md|mdown)$ index.php [L]
 
-    # make panel links work
+  # block all files in the site folder from being accessed directly
-    RewriteCond %{REQUEST_FILENAME} !-f
+  RewriteRule ^site/(.*) index.php [L]
-    RewriteCond %{REQUEST_FILENAME} !-d
+
-    RewriteRule ^panel/(.*) panel/index.php [L]
+  # Enable authentication header
+  SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=$1
+
+  # block all files in the kirby folder from being accessed directly
+  RewriteRule ^kirby/(.*) index.php [L]
+
+  # make site links work
+  RewriteCond %{REQUEST_FILENAME} !-f
+  RewriteCond %{REQUEST_FILENAME} !-d
+  RewriteRule ^(.*) index.php [L]
 
-    # make site links work
-    RewriteCond %{REQUEST_FILENAME} !-f
-    RewriteCond %{REQUEST_FILENAME} !-d
-    RewriteRule ^(.*) index.php [L]
 </IfModule>
 
 # Additional recommended values
@@ -63,3 +67,16 @@ ExpiresActive On
 ExpiresByType application/x-javascript M604800
 ExpiresByType text/css M604800
 ExpiresByType text/x-javascript M604800
+
+# compress text file responses
+<IfModule mod_deflate.c>
+
+  AddOutputFilterByType DEFLATE text/plain
+  AddOutputFilterByType DEFLATE text/html
+  AddOutputFilterByType DEFLATE text/css
+  AddOutputFilterByType DEFLATE text/javascript
+  AddOutputFilterByType DEFLATE application/json
+  AddOutputFilterByType DEFLATE application/javascript
+  AddOutputFilterByType DEFLATE application/x-javascript
+
+</IfModule>

README.md

@@ -6,6 +6,6 @@ The rest of the code is under this license: [License](https://svs.ankaa.uberspac
 # Installing 
 ```
 $ git clone --recursive https://svs.ankaa.uberspace.de/sterzy/sterzycom.git
-$ mkdir site/config site/accounts thumbs content assets/avatars
+$ mkdir site/config media content
 ```
-Then [add your license](http://getkirby.com/docs/installation/license-code) and visit yoursite.com/panel.
+Then visit yoursite.com/panel.