Merge branch 'master' of git+ssh://code.ungleich.ch/ungleich-public/ungleich-staticcms

content/u/products/django-hosting/contents.lr

@@ -1,4 +1,4 @@
-_discoverable: no
+_discoverable: yes
 ---
 _hidden: no
 ---
@@ -80,4 +80,14 @@ description3:
 
 ## How to get started
 
-No Django project is exactly the same.
+No Django project is exactly the same, so we usually have a chat with
+our new Django hosting customers before starting. And we invite you to
+reach out to **support -at- ungleich.ch**.
+
+For technical details checkout the
+[Django Hosting article in the Open Infrastructure
+project](https://redmine.ungleich.ch/projects/open-infrastructure/wiki/Django-Hosting).
+
+## Related products
+
+* [Webhosting for static files](../zerocarbon-webhosting-with-ipv6/)

content/u/products/hosted-matrix-chat/contents.lr

@@ -146,7 +146,7 @@ description3:
       <p>We try to be as transparent as possible for our Matrix pricing. The pricing is made of 2 essential parts.
       </p>
       <ul>
-      <li> 
+      <li>
       a one-time set up fee for initially setting up the Matrix instance for you. We set up the Matrix and also customize* the login page with your own logo and text.
       </li>
       <li>
@@ -157,8 +157,8 @@ description3:
       You're all set with above 2 costs for starting your own Matrix.
       </p>
 
-      <p> 
+      <p>
-      * Further customization such as favicon, background and more is possible at additional fee, get in touch with us to learn more. 
+      * Further customization such as favicon, background and more is possible at additional fee, get in touch with us to learn more.
       </p>
       <p>
       ** The number of users or size of rooms depend on the size of your VM, and you can scale them anytime you want. The extention will be done according to <a href="https://datacenterlight.ch">our standard VM pricing.</a>
@@ -222,3 +222,48 @@ offer3_text:
 
 ---
 offer3_link: https://ungleich.ch/product/hosted-matrix-l/
+---
+description4:
+
+## Matrix UI/UX development support program
+
+On 2020-04-21 we started our new support program to specifically
+enhance the UI and UX of Matrix. With this program we want to enhance
+the usability of the web client and the apps.
+
+### How the matrix support program works
+
+If you want to support UI/UX improvements of Matrix,
+you can support the work financially with 15 CHF (roughly about 15
+USD) as a one time or monthly payment (below 15 CHF is costing too
+much in transfer fees).
+
+To do so, write an email with the subject "I want to support the
+Matrix UI/UX improvements" to **support -at- ungleich.ch** and include
+the amount that you are willing to contribute and whether you want to
+pay via credit card or wire transfer.
+
+Also mention whether you want to be publicly listed as a supporter on
+this website.
+
+### Development and transparency
+
+All money that comes in will only be used to finance development and
+design work related to Matrix. We will continuously
+update this website with contributions and which tasks we work on.
+
+### Why is ungleich doing this?
+
+We at ungleich think that Matrix has one really, really huge edge over
+almost all other solutions: it is really decentralised and
+federated. It finally solves the problems of **data silos** that
+exists in many places in IT.
+
+However we do acknowledge that Matrix can benefit a lot from UI/UX
+improvements and thus we wanted to create an easy way for anyone to
+contribute to it.
+
+### List of tasks / work
+
+* [UI/UX improvement suggestions for
+  matrix](https://redmine.ungleich.ch/issues/7876)

content/u/products/ipv4-to-ipv6-proxy/contents.lr

@@ -8,7 +8,7 @@ subtitle: Make your IPv6 resources reachable from the IPv4 world
 ---
 image: /u/image/cards/ipv4-ipv6-proxy.jpg
 ---
-headline1: IPv4 to 
+headline1: IPv4 to
 ---
 headline2: IPv6 Proxy
 ---
@@ -49,4 +49,11 @@ customers.
 * Up to 1000 domains: 100 CHF/month (0.1 CHF/domain)
 * Above 1000 domains: on request
 
-The pricing includes traffic.
+The pricing includes 15 TB traffic/month.
+
+## Related products
+
+If you are providing services that are only reachable by IPv4 and want
+to make them accessible by IPv6, our [IPv6-to-IPv4
+Proxy](../ipv6-to-ipv4-proxy/) helps you to accomplish the opposite
+translation.

content/u/products/ipv6-to-ipv4-proxy/contents.lr

@@ -0,0 +1,93 @@
+_discoverable: yes
+---
+_hidden: no
+---
+title: IPv6 to IPv4 Proxy
+---
+subtitle: Enable IPv4 / legacy IP services to be reachable by IPv6
+---
+image: /u/image/cards/ipv6-ipv4-proxy.jpg
+---
+headline1: IPv6 to
+---
+headline2: IPv4 Proxy
+---
+header_background_color: #57B7C1
+---
+header_text_color: text-light
+---
+nav_classes: navbar-dark
+---
+description1:
+
+## Introduction
+
+The IPv6-to-IPv4 proxy allows existing IPv4 (also know as legacy IP)
+resources to be reachable from the current IP (IPv6) Internet.
+It supports the following protocols:
+
+* HTTP
+* HTTPS
+* IMAPS
+
+## When to use the IPv6-to-IPv4 proxy?
+
+More and more clients devices like mobile phones, computers and even
+whole companies network are switched to **IPv6 only** due to the
+IPv4 address shortage and the maintenance overhead for dual stack
+networks.
+
+Most, but not all, of these devices can still reach the IPv4 Internet
+via translation services like NAT64. However with every NAT process, a
+litte bit of latency is added.
+
+And the higher the latency is, the slower a website loads for a customer.
+
+With our IPv6-to-IPv4 proxy you can make your IPv4 only website
+accessible for clients on IPv6 only networks without a NAT service.
+
+## Pricing
+
+You can order the IPv6-to-IPv4 proxy in two different variants: the
+**standard IPv6-to-IPv4 proxy** and the **caching IPv6-to-IPv4
+proxy**.
+
+If you are not sure which one to choose, you can always start with the
+standard IPv6-to-IPv4 proxy and later switch to the caching IPv6-to-IPv4
+proxy.
+
+The pricing includes 15 TB traffic/month.
+
+### The standard IPv6-to-IPv4 proxy
+
+* Up to 10 domains: 5 CHF/month (0.5 CHF/domain)
+* Up to 100 domains: 30 CHF/month (0.3 CHF/domain)
+* Up to 1000 domains: 100 CHF/month (0.1 CHF/domain)
+* Above 1000 domains: on request
+
+### The caching IPv6-to-IPv4 proxy
+
+This proxy allows IPv6 only clients to access the content of your IPv4
+only services even faster.
+
+* Caching IPv6-to-IPv4 proxy S with 1 Core, 2 GB RAM, 10 GB SSD: 35.5 CHF/month
+* Caching IPv6-to-IPv4 proxy M with 4 Core, 8 GB RAM, 50 GB SSD: 82.5 CHF/month
+* Caching IPv6-to-IPv4 proxy L with 8 Core, 16 GB RAM, 10 GB SSD, 1TB
+HDD: 127.5 CHF/month
+
+The price consists of a VM plus 20 CHF maintenance fee/month.
+
+The one time setup fee is 30 CHF.
+
+The higher the amount of RAM and SSD, the more size for caching your
+website is available.
+
+Caching objects requires to inspect the network connection. For this
+reason the caching proxy uses its own SSL certificate and re-encrypts
+the traffic to your backend host.
+
+## Related products
+
+If you are looking for a proxy that enables IPv6 only resources
+(i.e. websites) to be accessible from the IPv4 only Internet, you can
+use the [IPv4-to-IPv6 Proxy](../ipv4-to-ipv6-proxy/).

content/u/products/zerocarbon-webhosting-with-ipv6/contents.lr

@@ -22,7 +22,7 @@ nav_classes: navbar-dark
 ---
 content1_text:
 
-##Webhosting made clean
+## Webhosting made clean
 
 Are you looking for a climate neutral, sustainable and future-proven
 static webhosting? Are you interested in serving a small website or