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

content/u/blog/2020-the-year-of-ipv6/contents.lr

@@ -8,7 +8,7 @@ twitter_handle: ungleich
 ---
 _hidden: no
 ---
-_discoverable: no
+_discoverable: yes
 ---
 abstract:
 IPv6 is beginning to take off in 2020
@@ -16,18 +16,18 @@ IPv6 is beginning to take off in 2020
 body:
 
 When is IPv6 beginning to matter? When is IPv6 taking off? These are
-questions that we debate in the IPv6 community at meetings and online.
+questions that we debate in the IPv6 community at meetings, online and offline.
 
 For us, 2020 has already become the year of IPv6, even way before it
 is ending.
 
 ## IPv6 traffic reached more than 33% (1/3) of traffic to Google
 
-Acccording to google, IPv6 search traffic already exceeds 33%:
+According to Google, IPv6 search traffic already exceeds 33%:
 
 ![](/u/image/google-ipv6-2020-08-07.png)
 
-The recent growth this year is also attributed to people more working
+The recent growth this year is also attributed to more people working
 from home, where IPv6 is already more present than in business
 connections.
 
@@ -39,7 +39,7 @@ search request is made using IPv6.
 [India](https://stats.labs.apnic.net/ipv6/IN),
 [Belgium](https://stats.labs.apnic.net/ipv6/BE),
 [the US](https://stats.labs.apnic.net/ipv6/US) and
-[Malaysa](https://stats.labs.apnic.net/ipv6/MY) - all of them have
+[Malaysia](https://stats.labs.apnic.net/ipv6/MY) - all of them have
 passed the 50% IPv6 deployment mark. **India even surpassed the 70%
 mark!**
 
@@ -49,14 +49,14 @@ passing the 50% mark (while we in
 [Switzerland](https://stats.labs.apnic.net/ipv6/CH) only passed the
 40% mark...).
 
-In other words: if you are living or travelling to above countries,
+In other words: if you are living or travelling to the above countries,
 you have a good chance of getting IPv6 - and it's growing.
 
 ## IPv6 community is active and growing
 
 At the moment there are so many cool IPv6 projects and communities
-around, as many as we have never seen active before. Let us list some
+around, more active than we have ever seen before.
-projects we are aware of:
+Let us list some projects/communities we are aware of:
 
 * [IPv6 Buzz](https://packetpushers.net/series/ipv6-buzz/)
   by Ed Horley, Scott Hogg, and Tom Coffeen
@@ -67,22 +67,30 @@ projects we are aware of:
 * [Afrinic is offering education](https://learn.afrinic.net/)
 * [The IPv6 blog](https://ipv6.blog/) is a community maintained link
   collection - add your IPv6 resources there!
-* .. and probably many more! Did we miss a community? Just [let us know about it](/u/contact/).
+* [#IPv6 on Twitter](https://twitter.com/search?q=%23ipv6)
+
+.. and probably many more! Did we miss a community? Just [let us know about it](/u/contact/).
+
+![](/u/image/nico-ripe79.jpeg)
 
 ## IPv6 hardware/software support improving
 
 For many years we have been watching IPv6 support in (network)
 hardware and open source software. And while not every everything is
-fixed, many pain points have been solved. And what is even better:
+fixed, many pain points have been solved.
-even if your network equipment does not nicely work with IPv6, a lot
+And the great thing is, even if your network equipment does not work with IPv6 nicely,
-of equipment can now be made IPv6 usable just by flashing
+a lot of equipment can now be made IPv6 usable just by flashing
 [OpenWRT](https://openwrt.org/).
 
 
 ## IPv6 everywhere
 
-You might have heard the claims of our CEO, Nico Schottelius, that you
+You might have heard the claims of our CEO, [Nico
-can have IPv6 everywhere. This year at ungleich we released the
+ Schottelius](https://twitter.com/NicoSchottelius),
+ that [you can have IPv6
+ everywhere](https://twitter.com/RobbieMitch/status/1183731875292037121).
+
+This year at ungleich we released the
 [VIIRB](u/products/viirb-ipv6-box/), the world's smallest IPv6
 router.
 
@@ -95,7 +103,7 @@ network: all devices in your network have IPv6 via autoconfiguration.
 ## IPv6 in 2020
 
 So in 2020, you can go out, connect yourself anywhere with IPv6, talk
-about it to many people and get your software easily up and
+about it with everybody and get your software up and running easily.
-running. Oh, and if you think it is just us, we are not the only ones
+Oh, and if you think it is just us, we are not the only ones
 who think [the attitude towards IPv6
 changed!](https://blog.apnic.net/2020/08/03/ipv4-ipv6-and-a-sudden-change-in-attitude/).

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

@@ -0,0 +1,40 @@
+_discoverable: yes
+---
+_hidden: no
+---
+title: Mail Hosting
+---
+subtitle: Your mails in Switzerland
+---
+feature1_title: Simple
+---
+feature1_text:
+This is a classic mail hosting. Webmail, SMTP, IMAP. Plain and simple.
+---
+feature2_title: Safe
+---
+feature2_text:
+Your data is saved in Switzerland and stored 3 times on our CEPH
+storage cluster.
+---
+feature3_title: Zero Carbon Infrastructure
+---
+feature3_text:
+Data Center Light runs a zero carbon infrastructure.
+[Read more about it](https://ungleich.ch/u/blog/how-to-sustainable-store-your-data/).
+---
+description2:
+
+This mailhosting is mainly targeted for low volume, single person or
+single system usage.
+
+## What you get
+
+* A single mailbox account (yourname@ungleich.cloud)
+* Up to 100 mail aliases
+* Up to 100GB usage
+
+## Pricing
+
+The one time setup fee is 15 CHF, the monthly recurring fee is 7 CHF
+per month.

content/u/products/monitoring-as-a-service/contents.lr

@@ -0,0 +1,101 @@
+_discoverable: no
+---
+_hidden: no
+---
+title: Hosted Monitoring
+---
+subtitle: Safe monitoring from Switzerland
+---
+headline1: Hosted Monitoring
+---
+headline2: In Switzerland
+---
+headline3: Fully Open Source
+---
+header_background_color: #2EBFC3
+---
+header_text_color: text-light
+---
+nav_classes: navbar-dark
+---
+image:/u/image/cards/datastorage.jpg
+---
+feature1_title: Hosted Monitoring
+---
+feature1_text:
+You want to know how your services are doing, but don't want to spend
+time on managing your monitoring? Then hosted monitoring is the right
+solution for you.
+---
+feature3_title: Open Source
+---
+feature3_text
+Our Monitoring solution is based 100% on Open Source products. There
+is no vendor lockin and also no proprietary software.
+---
+feature2_title: Safe data storage
+---
+feature2_text:
+
+Your monitoring data is stored in Switzerland,
+a country with strong privacy laws that protect your data.
+---
+description2:
+
+## How it works
+
+We setup a dedicated VM with monitoring. Setup and maintain the
+prometheus, grafana and
+
+## Batteries included
+
+* Alerting via E-Mail
+
+## High availability Monitoring
+
+If your organisation depends on critical services, we recommend to use
+highly available monitoring in 2 data centers.
+
+Using it
+
+## Pricing
+
+Transparent pricing: We setup a dual stack VM with 1 core, 1 GB RAM,
+10 GB SSD: 11.5 + 100 GB Storage 1.5 CHF / 100GB = 13 CHF
+
+One time setup fee: 30 CHF
+Maintenance fee: 8 CHF/month
+
+Examples:
+
+* Monitoring-S (1 Core/1 GB RAM/10 GB SSD/100 GB) Suitable for 1-2 systems: 21 CHF/month
+* Monitoring-M (2 Core/2 GB RAM/10 GB SSD/500 GB) Suitable for 5-10 systems: 34 CHF/month
+* Monitoring-L (4 Core/4 GB RAM/10 GB SSD/2000 GB) Suitable for 20-30  systems: 70.5 CHF/month
+
+Note: You can increase storage space with a short downtime (about 5
+minutes) at any time.
+
+## Pricing High Availability Monitoring
+
+Consists of 2 VMs in 2 Data Centers, same model as above. The VMs are
+configured to monitor each other and monitor all your systems.
+
+* HA-Monitoring-S 2x (1 Core/1 GB RAM/10 GB SSD/100 GB) Suitable for 1-2 systems: 42 CHF/month
+* HA-Monitoring-M 2x (2 Core/2 GB RAM/10 GB SSD/500 GB) Suitable for 5-10 systems: 68 CHF/month
+* HA-Monitoring-L 2x (4 Core/4 GB RAM/10 GB SSD/2000 GB) Suitable for 20-30  systems: 141 CHF/month
+
+## Price reduction for IPv6 only monitoring
+
+Above offers are also available as IPv6 only offers.
+The key facts are:
+
+* Dashboards are also reachable by IPv4 (via our IPv4-to-IPv6 proxy)
+* Monitoring only works via IPv6
+* Uses a shared mailserver for sending emails
+
+The price is reduced by:
+
+* 4 CHF/month for the regular monitoring (-9 CHF for the IPv4 address,
+  +5 CHF for the mailservice)
+* 13 CHF/month for the regular monitoring (-18 CHF for the IPv4
+  addresses + 5 CHF for the mailservice)

content/u/projects/data-center-light/contents.lr

@@ -4,7 +4,7 @@ subtitle: A clean and sustainable data center
 ---
 image: /u/image/cards/datacenterlight.jpg
 ---
-content:
+description1:
 
 ## Introduction
 

content/u/projects/digital-chalet/contents.lr

@@ -4,7 +4,7 @@ subtitle: The start of Digital Glarus!
 ---
 image: /u/image/cards/digitalchalet-schwanden.jpg
 ---
-content:
+description1:
 
 ## Introduction
 

content/u/projects/digital-glarus/contents.lr

@@ -4,7 +4,7 @@ image: /u/image/cards/digitalglarus.png
 ---
 subtitle: Using digitalisation for the good
 ---
-content:
+description1:
 
 ## Introduction
 

content/u/projects/digitale-bildung/contents.lr

@@ -8,7 +8,7 @@ Digital Chalet Schwanden and help each other in learning IT.
 ---
 image: /u/image/cards/digitalebildungungleich.jpg
 ---
-content:
+description1:
 
 Being one of the leading IT companies in [Digital
 Glarus](../digital-glarus/) comes with responsibility. For us it is

content/u/projects/education/contents.lr

@@ -6,7 +6,7 @@ Education is the key to digital sustainability
 ---
 image: /u/image/cards/education.jpg
 ---
-content:
+description1:
 
 ## Education by ungleich
 

content/u/projects/hack4glarus/contents.lr

@@ -4,7 +4,7 @@ subtitle: Hack4Glarus is the first hackathon of Glarus.
 ---
 image: /u/image/cards/hack4glarus.png
 ---
-content:
+description1:
 
 ##The Hackathon of Glarus
 

content/u/projects/ipv6-chat/contents.lr

@@ -4,7 +4,7 @@ subtitle: Let's talk about IPv6
 ---
 image: https://ungleich.ch/media/filer_public/c8/86/c8867297-4573-464b-ae60-0f38117626ad/ipv6chat.jpg
 ---
-content:
+description1:
 
 ## IPv6 chat
 

content/u/projects/ipv6-for-you/contents.lr

@@ -2,7 +2,7 @@ title: IPv6 for you
 ---
 subtitle: IPv6 consultancy by ungleich
 ---
-content:
+description1:
 
 ## TL;DR
 

content/u/projects/ipv6-torrent-tracker/contents.lr

@@ -4,7 +4,7 @@ subtitle: Make your Open Source torrent IPv6 reachable
 ---
 image:/u/image/cards/ipv6-torrent-tracker.jpg
 ---
-content:
+description1:
 
 ## Background
 

content/u/projects/jobs-hacks-bounties/contents.lr

@@ -4,7 +4,7 @@ subtitle: Doing stuff with or at ungleich
 ---
 image: /u/image/cards/jobs.jpg
 ---
-content:
+description1:
 
 ## Introduction
 

content/u/projects/open-chat/contents.lr

@@ -4,7 +4,7 @@ subtitle: Open Source requires Open Communication
 ---
 image: /u/image/cards/open-chat.jpg
 ---
-content:
+description1:
 
 You can chat with us on [matrix.ungleich.ch](https://matrix.ungleich.ch).
 

content/u/projects/open-infrastructure/contents.lr

@@ -4,7 +4,7 @@ subtitle: Transparency everywhere
 ---
 image: /u/image/cards/open-infrastructure.jpg
 ---
-content:
+description1:
 
 Next to our [Open Source](../open-source/) efforts, we also believe
 that what you run your services on, should also be open and

content/u/projects/opensource/contents.lr

@@ -4,7 +4,7 @@ subtitle: Open Source literally created ungleich
 ---
 image: /u/image/cards/opensource.jpg
 ---
-content:
+description1:
 
 ## History of Open Source at ungleich
 

content/u/projects/penguin-comics/contents.lr

@@ -5,7 +5,7 @@ Welcome to the world of Linux & IPv6 penguins!
 ---
 image: /u/image/cards/penguincomics.jpg
 ---
-content:
+description1:
 
 Who doesn't love smart and stupid penguins talking about technology? 
 Explore the cutting-edge, real time tech topics with our Linux & IPv6 penguin heroes.

content/u/projects/this-week-via-ipv6/contents.lr

@@ -4,7 +4,7 @@ subtitle: What happens in a week with IPv6?
 ---
 _discoverable: no
 ---
-content:
+description1:
 
 To be able to track what is going on in the IPv6 world, we created a
 dedicated page tracking IPv6 activity that we are aware of. The page

content/u/projects/ubookmark/contents.lr

@@ -5,7 +5,7 @@ ubookmark is a simple link collecting website.
 ---
 image: /u/image/cards/ubookmark.jpg
 ---
-content:
+description1:
 
 ## Introduction
 

content/u/projects/ungleich-quiz-v6/contents.lr

@@ -6,7 +6,7 @@ it to the hall of fame? We're as curious as you are!
 ---
 image: /u/image/cards/ungleichquizv6.jpg
 ---
-content:
+description1:
 
 Who doesn't love quizzes? We certainly do and
 this is why we created the [ungleich quiz