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

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

@@ -185,12 +185,12 @@ at ungleich, since Matrix is especially convenient to reach out to the world!
 </div>
 
 ---
-offer1_title: Matrix-S 36 CHF/Month
+offer1_title: Matrix-S 40 CHF/Month
 ---
 offer1_text:
 
 * VM with 1 Core, 2 GB RAM, 10 GB SSD and 100 GB HDD
-* Maintenance fee 20 CHF/month included
+* Maintenance fee 25 CHF/month included
 * Application firewall included
 * [Initial setup fee 30 CHF](https://ungleich.ch/product/0carbonchat-setup/)
 

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

@@ -51,19 +51,7 @@ So what can you do with the VIIRB?
 Going to a friend and the network does not have IPv6? Just bring your
 VIIRB, plug it in and enjoy a fully enabled IPv6 network.
 
-### 2. IPv6 only Wifi
-
-Once the VIIRB is started, it will present you with the wifi network
-**IPv6 everywhere**. The pre-configured WPA2 password is
-**iloveipv6**. As opposed to the root password, which is random,
-we intentionally set a default here, so you can just drop the box and
-people who see the SSID "IPv6 everywhere" and know about the project,
-can connect right away.
-
-If you don't like this, you can turn the wifi off or change the name
-and password.
-
-### 3. IPv6 world wide reachable audio system
+### 2. IPv6 world wide reachable audio system
 
 You can install the [music player daemon](https://www.musicpd.org/) on
 the VIIRB and allow remote control of the music from anywhere in the
@@ -73,7 +61,7 @@ can even mount your music collection or stream music to it.
 Just connect the VIIRB to your audio system, configure it and enjoy
 remotely controlled music!
 
-### 4. A BGP router
+### 3. A BGP router
 
 With
 [bird2](https://openwrt.org/packages/pkgdata/bird2)
@@ -84,7 +72,7 @@ OpenWRT, you can use it directly for peering with other ASNs.
 In fact, if you let us know before ordering, we can even connect your
 VIIRB to a VPN endpoint that allows peering with the real Internet.
 
-### 5. A hacking box
+### 4. A hacking box
 
 Thi VIIRB contains a variety of additional features like PWM, GPIO,
 A/D converter, D/A converter and so on. It can also plug in a small
@@ -175,7 +163,6 @@ things are using IPv6?
 You can add the USB GPS tracker add on for **25 CHF** as a single
 device.
 
-
 ### Multiple Add-Ons via USB Hub
 
 To connect more than one add-on to the VIIRB, you will need a
@@ -256,6 +243,7 @@ All prices exluding VAT.
 
 ## VIIRB in the Media
 
+* [APNIC blog: Connect to IPv6 everywhere with VIIRB](https://blog.apnic.net/2020/09/30/connect-to-ipv6-everywhere-with-viirb/)
 * [Packetpushers podcast about the VIIRB](https://packetpushers.net/podcast/ipv6-buzz-058-tackling-ipv6-access-challenges/)
 * [Blog post on
   gnulinux.ch](https://gnulinux.ch/viirb-die-vpn-ipv6-iot-router-box)