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

3 years ago · 5b564ef85f
3 changed files with 41 additions and 44 deletions
--- a/content/u/blog/video-conference-for-all/jitsi-bg.jpg
+++ b/content/u/blog/video-conference-for-all/jitsi-bg.jpg
--- a/content/u/products/django-hosting/contents.lr
+++ b/content/u/products/django-hosting/contents.lr
@ -39,6 +39,7 @@ application with a good conscience and without emitting extra carbon.

 ---
 content1_text:
+
 ## Development flow

 The diagram gives an overview of a typical development flow with
@ -67,9 +68,16 @@ production) and optionally a backup.

 ## Pricing

-* Setup fee is 35 CHF
-* Monthly fee is 20 CHF + price of the VM
+* Setup fee is 30 CHF
+* Monthly fee is 25 CHF + price of the VM
  * Typical development VM: 1 cores, 2 GB RAM, 10 GB SSD
  * Typical small prod VM:  2 cores, 4 GB RAM, 20 GB SSD
  * Typical default prod VM: 4 cores, 8 GB RAM, 50 GB SSD
 * All VMs can be extended with extra HDD space
+
+---
+description3:
+
+## How to get started
+
+No Django project is exactly the same.
--- a/content/u/products/ipv6-vpn/contents.lr
+++ b/content/u/products/ipv6-vpn/contents.lr
@ -1,63 +1,52 @@
-_discoverable: no
+_discoverable: yes
 ---
 _hidden: no
 ---
 title: IPv6 VPN
 ---
-subtitle: You can have IPv6 anywhere.
+subtitle: Take your IPv6 with you.
 ---
-image: /u/image/cards/ipv6vpn.jpg
+image: /u/image/cards/ipv6-vpn.jpg
 ---
-header:
-
-#### generic-header ####
-headers:
-
-IPv6
-VPN
+headline1: IPv6
+---
+headline2: VPN
 ----
-primary_color: #7B95D4
+header_background_color: #7B95D4
 ----
-header_color: text-light
+header_text_color: text-light
 ----
-nav_link_color: navbar-dark
+nav_classes: navbar-dark
 ---
-description1:
-
-The IPv6 VPN enables you to have IPv6 anywhere.
-
+feature1_title: Versatile
 ---
-feature1_title: Easy
+feature1_text: You can use our IPv6 VPN to connect your office. Or
+your notebook. Or to create your own VPN concentrator.
 ---
-feature1_text:
-
-Webhosting can be so easy. That what we think and that's what you
-should get. For this reason you can login to our webhost with your
-standard credentials and just upload your pages.
+feature2_title: State of the art
 ---
-feature2_title: Secure
+feature2_text: The ungleich IPv6 is powered by Wireguard. Wireguard is
+a light weight, portable and easy to use technology. And it comes with
+a /48 IPv6 network routed!
 ---
-feature2_text:
-
-Latest algorithm. Tested.
-
+feature3_title: Works anywhere
 ---
-feature3_title: Zero Carbon
+feature3_text: The VPN works in situations where you have NAT, NAT64
+or other network inspection modes in place. It just requires UDP
+traffic to pass.
 ---
-feature3_text:
-The VPN terminates in the [zero carbon
-datacenter](/u/projects/data-center-light/) in Switzerland.
+description1:

---
-offer2_title: IPv6 VPN with /48 - 120 CHF/year
---
-offer2_text:
+At ungleich we believe that IPv6 should be available everywhere. To
+help you connecting to IPv6 only resources, we offer the IPv6-VPN.

-* Full routed /48 network
-* Up to 65'536 own /64 networks
-* Modern encryption
+We believe that IPv6 is an enabler for many organisations, companies,
+developers and freelancers. For this reason we created the
+VPN, which enables you to have IPv6
+connectivity from wherever you are for 120 CHF/year.

+One VPN is free for all existing customers with resources on
+[Data Center Light](../projects/data-center-light).

---
-offer2_link: https://ungleich.ch/product/0carbonwebhosting-m/
---
+You can find more about the VPN and technical details,
+on [IPv6VPN.ch](https://ipv6vpn.ch).