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

Makefile

@@ -1,11 +1,17 @@
 BUILDDIR?=../ungleich-staticcms-build
 DESTINATION=ungleichstatic@staticweb.ungleich.ch:/home/services/www/ungleichstatic/staticcms.ungleich.ch/www/u/
 
-all: publish
+all: goodpush
 
 pull:
 	git pull
 
+push:
+	git push
+
+goodpush:
+	make publish && make push
+
 publish: pull build deploy
 
 deploy: permissions

content/u/blog/2021-12-11-ungleich-container-registries/contents.lr

@@ -0,0 +1,78 @@
+title: Public release of the ungleich container registries
+---
+pub_date: 2021-12-11
+---
+author: ungleich
+---
+twitter_handle: ungleich
+---
+_hidden: no
+---
+_discoverable: yes
+---
+abstract:
+Today we published our container registries.
+---
+body:
+
+## TL;DR
+
+Today we opened up two public container registries from ungleich.
+You can use them to pull container images released by ungleich or to
+utilise the container registry caches.
+
+## Overview
+
+* You can pull public ungleich container releases from https://harbor.ungleich.svc.p10.k8s.ooo/ungleich-public
+* You can use the hub.docker.com cache on https://harbor.ungleich.svc.p10.k8s.ooo/dockerhub
+* You can use the quay.io cache on https://harbor.ungleich.svc.p10.k8s.ooo/quayio
+* You can use the hub.docker.com cache on
+  https://harbor.ungleich.svc.c2.k8s.ooo/dockerhub (development cluster)
+* You can use the quay.io cache on
+  https://harbor.ungleich.svc.c2.k8s.ooo/quayio (development cluster)
+
+All registries are **IPv6 only** and the caches are intended to be used
+by [Data Center Light customers](/u/projects/data-center-light)
+to avoid the IPv4 throttling that one encounters when
+pulling images from IPv6 only VM.
+
+You can test the ungleich-public repository as follows:
+
+```
+docker pull harbor.ungleich.svc.p10.k8s.ooo/ungleich-public/ungleich-certbot:0.3.3
+```
+
+
+## Usage
+
+If you are using [cri-o](https://cri-o.io/) you can use a
+registries.conf as follows:
+
+```
+unqualified-search-registries = ["docker.io"]
+
+[[registry]]
+prefix = "docker.io"
+location = "harbor.ungleich.svc.p10.k8s.ooo/dockerhub"
+
+[[registry]]
+prefix = "quay.io"
+location = "harbor.ungleich.svc.p10.k8s.ooo/quayio"
+
+[[registry.mirror]]
+location = "harbor.ungleich.svc.c2.k8s.ooo/dockerhub"
+
+[[registry.mirror]]
+location = "harbor.ungleich.svc.c2.k8s.ooo/quayio"
+```
+
+## Next steps and more of it
+
+More caches are to follow and we will add a list of publicly available
+images in the future. We do not plan to make the registries IPv4
+accessible, as all workload inside Data Center Light is IPv6 reachable
+and we think there is no need for IPv4 connectivity anymore.
+You can read more about
+[the ungleich kubernetes
+infrastructure](https://redmine.ungleich.ch/projects/open-infrastructure/wiki/The_ungleich_kubernetes_infrastructure)
+or join the [#kubernetes:ungleich.ch Matrix chat](/u/projects/open-chat/).

content/u/blog/has-a-name-for-every-ipv6-address/contents.lr

@@ -18,11 +18,16 @@ body:
 ## TL;DR
 
 You can use **IPv6address.has-a.name** as a domain name
-for any of your containers or VMs. The required format is
+for any of your computers, containers or VMs. The required format is
 **1234-5678-9abc-def0-1234-5678-9abc-def0.has-a.name**. This is
 already a
 valid name and points to the IPv6 address
 *1234:5678:9abc:def0:1234:5678:9abc:def0*.
+Alternatively you can also use the domain **has-aaaa.name**, which
+implies IPv6 stronger.
+
+Both domains support IPv6 abbreviation using dashes,
+you can f.i. use **2a0a-e5c0--3.has-aaaa.name**.
 
 ## Introduction
 

content/u/blog/ungleich-tech-talk-4-ipv4-as-a-service/contents.lr

@@ -18,7 +18,8 @@ body:
 In the
 [fourth
 ungleich tech talk](https://youtu.be/RcgB7S6lo54)
-you can see how to get IPv4 via IPv6.
+you can see how to get IPv4 via IPv6 using the IPv6VPN and
+NAT64.
 
 <iframe width="560" height="315"
 src="https://www.youtube.com/embed/RcgB7S6lo54" title="YouTube video

content/u/offers/alpine-315-dedicated-apu/contents.lr

@@ -0,0 +1,130 @@
+_model: product
+---
+_discoverable: yes
+---
+_hidden: no
+---
+title: Dedicated Low Power Alpine
+---
+subtitle: Celebrating Alpine Linux 3.15 (2021-12-06..2021-12-24)
+---
+headline1: Alpine Linux 3.15
+---
+headline2: Low Power
+---
+headline3: APU Servers
+---
+header_background_color: #05450B
+---
+image: /u/image/cards/dedicated-alpine.jpg
+---
+header_text_color: text-light
+---
+nav_classes: navbar-dark
+---
+description1:
+
+## Alpine Linux 3.15 celebration
+
+Just recently [Alpine Linux
+3.15](https://alpinelinux.org/posts/Alpine-3.15.0-released.html) has
+ben released. Also just a few days ago the first public
+[dedicated server offer from ungleich](../dedicated-december-2021) has
+been released. Enough reason to add one on top of it:
+
+**Dedicated, low power servers running with Alpine Linux 3.15**
+
+
+## Low Power Servers
+
+We are proudly using the [PC Engines
+APU](https://pcengines.ch/apu2.htm) in a lot of places at Data Center
+Light. They are small, robust and easy to handle. And furthermore:
+they consume only about 10W of power.
+
+While there are other systems that are more power efficient, these
+boxes are very suitable to be running as a tiny cluster. Webserver? No
+problem. Mail server? No problem.
+
+So let's have a look at the specifications:
+
+* 4 real cores
+* 4 GB RAM
+* 1x 120GB SSD (usable: ca. 100GB)
+* Gigabit Ethernet
+
+
+## The offer in detail
+
+The offer is valid for all orders received between 2021-12-06 to
+2021-12-24. The monthly price is 100 CHF instead 150 CHF.
+The price stays the same until the end of the contract.
+
+You get:
+
+* A dedicated, routed /48 IPv6 network
+* A dedicated layer 2 network
+* (optional, add on) IPv4 addresses (mapped via NAT64)
+* **No setup fee** (instead of regular setup fee of 50 CHF)
+* A server powered by 100% hydro power
+
+The fine print:
+
+* Minimum contract duration: 3 months
+
+On order, you get access to the server with Alpine Linux 3.15
+installed. You will need to provide your public SSH key for accessing
+the device.
+
+The server includes 15TB traffic per month. Additional 30TB traffic
+can be added for 75 CHF/month. The server is located in an *IPv6 only*
+network. It can reach the IPv4 Internet via outgoing NAT64. If you
+need **incoming** IPv4 connectivity, we offer dedicated public IPv4
+addresses for 9 CHF/month. They are mapped via NAT64-SIIT
+to an IPv6 address of your choice.
+
+The default setup fee of 50 CHF for dedicated servers is removed for
+this offers.
+
+The offer is limited to 10 dedicated servers on a first come, first
+serve basis.
+
+## The costs in the offer and even more competitve offer
+
+Some of you will be doing the calculation of what it costs for hosting
+it yourself. And we want to be as transparent as possible so that you
+understand how the price is calculated.
+
+The costs for ungleich consist roughly of:
+
+* The hardware itself (~150~200 CHF)
+* The manual work (~150 CHF)
+* The support work (~100 CHF)
+* The electricity (~5-10 CHF/month)
+* The network traffic (~20~90 CHF/month)
+
+Some of these can be optimised with larger quantities, but some of
+them are rather static. However you can see that the network traffic
+(based on 10~50 Mbit/s average) is one of the bigger parts of the
+monthly cost.
+
+For that reason, we offer a second, even more affordable version: if
+you commit on using less than 10 Mbit/s on average (still burstable up
+to 1000 Mbit/s), we can offer the dedicated APU for 50 CHF/month.
+
+## What if it hardware breaks?
+
+As this is real hardware, hardware failures can occur and they will be
+repaired without any extra cost. It is however your responsibility to
+inform the Data Center Light team about issues. Response times
+according to [your selected SLA level](/u/products/ungleich-sla/).
+
+## How can I start / how can order?
+
+You can order at the
+[Data Center Light / Dedicated APU Alpine 3.15](https://datacenterlight.ch/product/dedicated-apu/) or
+on [Data Center Light / Dedicated APU Alpine 3.15 10
+Mbit/s](https://datacenterlight.ch/product/dedicated-apu-10mbit/).
+
+
+After the order is confirmed you will get access to the server within 5 working days.

content/u/offers/dedicated-december-2021/contents.lr

@@ -6,13 +6,15 @@ _hidden: no
 ---
 title: Dedicated December 2021
 ---
-subtitle: Access to dedicated servers
+subtitle: Access to dedicated servers (2021-12-01...2021-12-31)
 ---
 headline1: Dedicated Servers
 ---
 headline2: Exclusive Access
 ---
-header_background_color: #211C1E
+image: /u/image/cards/dedicated-december.jpg
+---
+header_background_color: #B61818
 ---
 header_text_color: text-light
 ---

content/u/products/viirb-ipv6-box/contents.lr

@@ -270,9 +270,9 @@ for **145 CHF** (203 CHF including the VIIRB).
 
 ### Price
 
-**Update 2021-11-01: Back in stock!**
+**Update 2021-12-17: Only very few left!**
 
-Thank you for waiting, VIIRB is back in stock again!  
+There is only a few of VIIRB left in stock. If you are looking for a VIIRB with WiFi option, check out [VIWIB](https://ungleich.ch/u/products/viwib-wifi-ipv6-box/) or [VIGIR!](https://ungleich.ch/u/products/vigir/)
 
 **The price of the VIIRB is 58 CHF**.
 

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

@@ -75,7 +75,7 @@ offer1_text:
 * SFTP access
 * IPv6 and legacy IP reachable
 * Data storage replicated 3 times
-* [30 CHF Setup fee](https://ungleich.ch/product/0carbonwebhosting-setup/)
+* [35 CHF Setup fee](https://ungleich.ch/product/0carbonwebhosting-setup/)
 * Suitable for bigger websites
 
 ---
@@ -89,7 +89,7 @@ offer2_text:
 * SFTP access
 * IPv6 and legacy IP reachable
 * Data storage replicated 3 times
-* [30 CHF Setup fee](https://ungleich.ch/product/0carbonwebhosting-setup/)
+* [35 CHF Setup fee](https://ungleich.ch/product/0carbonwebhosting-setup/)
 * Suitable for most websites
 
 ---
@@ -103,7 +103,7 @@ offer3_text:
 * SFTP access
 * IPv6 and legacy IP reachable
 * Data storage replicated 3 times
-* [30 CHF Setup fee](https://ungleich.ch/product/0carbonwebhosting-setup/)
+* [35 CHF Setup fee](https://ungleich.ch/product/0carbonwebhosting-setup/)
 * Suitable for websites publishing big data
 
 ---