From db3b71df8aeb62574610b2fb387bdd69868eb72a Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Thu, 16 Apr 2020 21:25:53 +0200 Subject: [PATCH 1/3] remove image that breaks the build workflow Signed-off-by: Nico Schottelius --- .../u/blog/video-conference-for-all/jitsi-bg.jpg | Bin 6642 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 content/u/blog/video-conference-for-all/jitsi-bg.jpg diff --git a/content/u/blog/video-conference-for-all/jitsi-bg.jpg b/content/u/blog/video-conference-for-all/jitsi-bg.jpg deleted file mode 100644 index 84f52564ad90827da7f35be27ac5da65f9701dff..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6642 zcmeH}I|{-;5QhKRq)-uYJ8Ms27d(KMkXU;O!P*<8uoZm8CtktYZd^fP)Fv=Eh0H)8 znIZX?4>tSpfzOzLs+W6JRMhizM--;vDh5?=_<|TyzM|Dn$HNiQ3;=NkU!y$kMera` z&J)iu2+IxAa@8LTC^vw5qy5nV{8xuhXhtE)JC6jjMW=gv|IBZm5?(51trWA?idh@Q ztgT{Ju9&q`%-Snv+5VFLxe~VhC1+^+OU}^FFF8XyzvK+<{E{;?Ka?{xKa?{xKa?{x kKa?{xKa?{xKa?{xKa?{xKa?{xKa?{xKa?~4S3f-70Xjb=tpET3 From 7cd6f45c04815bf9333a9aedd2cf54418ad09566 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Fri, 17 Apr 2020 11:53:54 +0200 Subject: [PATCH 2/3] [vpn] make public + add content --- content/u/products/ipv6-vpn/contents.lr | 81 +++++++++++-------------- 1 file changed, 35 insertions(+), 46 deletions(-) diff --git a/content/u/products/ipv6-vpn/contents.lr b/content/u/products/ipv6-vpn/contents.lr index 8f7a27f..a67a6e6 100644 --- 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 --- -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 +--- +feature1_title: Versatile +--- +feature1_text: You can use our IPv6 VPN to connect your office. Or +your notebook. Or to create your own VPN concentrator. +--- +feature2_title: State of the art +--- +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! +--- +feature3_title: Works anywhere +--- +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. --- description1: -The IPv6 VPN enables you to have IPv6 anywhere. +At ungleich we believe that IPv6 should be available everywhere. To +help you connecting to IPv6 only resources, we offer the IPv6-VPN. ---- -feature1_title: Easy ---- -feature1_text: +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. -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: Secure ---- -feature2_text: +One VPN is free for all existing customers with resources on +[Data Center Light](../projects/data-center-light). -Latest algorithm. Tested. - ---- -feature3_title: Zero Carbon ---- -feature3_text: -The VPN terminates in the [zero carbon -datacenter](/u/projects/data-center-light/) in Switzerland. - ---- -offer2_title: IPv6 VPN with /48 - 120 CHF/year ---- -offer2_text: - -* Full routed /48 network -* Up to 65'536 own /64 networks -* Modern encryption - - ---- -offer2_link: https://ungleich.ch/product/0carbonwebhosting-m/ ---- +You can find more about the VPN and technical details, +on [IPv6VPN.ch](https://ipv6vpn.ch). From b36745f3cddd5707dc0b4a2bbfe80a26796049b7 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Fri, 17 Apr 2020 13:30:10 +0200 Subject: [PATCH 3/3] Correct image name, update django hosting --- content/u/products/django-hosting/contents.lr | 12 ++++++++++-- content/u/products/ipv6-vpn/contents.lr | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/content/u/products/django-hosting/contents.lr b/content/u/products/django-hosting/contents.lr index 4e2d3e6..a448c05 100644 --- a/content/u/products/django-hosting/contents.lr +++ b/content/u/products/django-hosting/contents.lr @@ -27,6 +27,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 @@ -55,9 +56,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. diff --git a/content/u/products/ipv6-vpn/contents.lr b/content/u/products/ipv6-vpn/contents.lr index a67a6e6..c9ae664 100644 --- a/content/u/products/ipv6-vpn/contents.lr +++ b/content/u/products/ipv6-vpn/contents.lr @@ -6,7 +6,7 @@ title: IPv6 VPN --- subtitle: Take your IPv6 with you. --- -image: /u/image/cards/ipv6vpn.jpg +image: /u/image/cards/ipv6-vpn.jpg --- headline1: IPv6 ---