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

Makefile

@@ -16,8 +16,12 @@ permissions: build
 	find $(BUILDDIR) -type f -exec chmod 0644 {} \;
 	find $(BUILDDIR) -type d -exec chmod 0755 {} \;
 
-build:
-	lektor build -O $(BUILDDIR)
+build: venv
+	. ./venv/bin/activate && lektor build -O $(BUILDDIR)
 
 clean:
 	rm -rf $(BUILDDIR)
+
+venv: requirements.txt
+	python3 -m venv venv
+	sh -c ". ./venv/bin/activate && pip install -r requirements.txt"

content/u/blog/DRAFT-kubernetes-based-ipv6-ipv4-proxies/contents.lr

@@ -0,0 +1,57 @@
+title: Introducting Kubernetes based IPv4 to IPv6 proxies
+---
+pub_date: 2021-11-22
+---
+author: ungleich
+---
+twitter_handle: ungleich
+---
+_hidden: no
+---
+_discoverable: no
+---
+abstract:
+How to proxy from IPv4 to IPv6 in an IPv6 only kubernetes cluster.
+---
+body:
+
+## The crazy project: IPv6 based IPv4 proxies in Kubernetes
+
+If you know ungleich, you know that we always push the limits of what
+is possible. Today we want to push the barrier of "where can
+IPv4-to-IPv6 proxies live" a bit further. Let's see how that is going
+to look like!
+
+## IPv4-to-IPv6 proxies in general
+
+Before going into the details, let's see how and why we use
+IPv4-to-IPv6 proxies in general:
+
+![](/u/image/ipv6-to-ipv4-proxy.png)
+
+The basic idea is that IPv6 only services are made reachable via
+IPv4-to-IPv6 proxies towards the IPv4 world. So far we are offering
+this based on standard virtual machines. You can checkout
+[our previous tech
+talk](/u/blog/ungleich-tech-talk-2-accessing-ipv4-only-devices-via-ipv6/)
+for details on how this works.
+
+Let's try to dial things up a few notches, shall we?
+
+## Moving the IPv4-to-IPv6 proxy into kubernetes
+
+You are probably aware that at ungleich we are moving our workload
+from [cdist](https://cdi.st) + virtual machine automated workloads
+towards Kubernetes. At ungleich we are using
+[haproxy](http://www.haproxy.org/) as a basis for our IPv4-to-IPv6
+proxies. Moving this into kubernetes
+
+
+
+## Other solution?
+
+As you can see, mixing the dynamic IP generation and coupling it with
+static DNS entries for IPv4 resolution is not the easiest tasks. If
+you have a smart idea on how to solve this without manually creating
+entries for each and every service,
+[give us a shout!](/u/contact)

content/u/blog/ipv6-link-local-support-in-browsers/contents.lr

@@ -203,6 +203,25 @@ to fe80::1"
 
 Thanks again for the pointer!
 
+### The prettysocks SOCKS5 proxy (update 2021-11-24)
+
+On 2021-11-23 we have been notified that there is a new workaround
+available:
+[prettysock](https://github.com/twisteroidambassador/prettysocks/tree/ipv6-literal)
+is a Socks5 proxy written in python that allows the use of Microsoft's
+**ipv6-literal.net** domain, but from any OS or browser, which is
+pointed to the proxy. So to access **fe80::1ff:fe23:4567:890a%3**,
+configure your browser to use the local prettysocks Socks5 proxy,
+replace the link local address with
+**fe80--1ff-fe23-4567-890as3.ipv6-literal.net** and there you go.
+
+There are two interesting things to say about this solution:
+
+* It is a very simple solution
+* It is surprising that browser vendors haven't implement such a
+  simple solution themselves so far - does it need an RFC that defines
+  the domain to be used?
+
 ## Other resources
 
 If you are aware of other resources regarding IPv6 link local support

content/u/offers/black-friday-2021/contents.lr

@@ -0,0 +1,93 @@
+_model: product
+---
+_discoverable: yes
+---
+_hidden: no
+---
+title: Black Friday 2021 (Closed)
+---
+subtitle: Special deals 2021.11.23-11.30
+---
+headline1: Black Friday
+---
+headline2: 2021.11.23 - 2021.11.30
+---
+image: /u/image/cards/blackfriday21.jpg
+---
+header_background_color: #211C1E
+---
+header_text_color: text-light
+---
+nav_classes: navbar-dark
+---
+description1:
+
+
+## Black Friday
+
+We prepared some exciting deals for the limited time of 2021.11.23 - 2021.11.30.
+Get yourself a treat with sustainable technology!
+
+* Deal 1: Get an IPv4 Subscription for 2 years for the price of 1 year
+* Deal 2: Get an IPv6 Router(VIIRB, VIWIB, VIGIR) and get 2 years of VPN with it
+* Deal 3: 50% Discount for the VPN extension for VIIRB, VIWIB and VIGIR users
+
+---
+content1_text:
+
+## Deal 1. IPv4 Address for 2 years for the price of 1.
+
+During Black Friday sales, we offer our IPv4 subscription for 2 years for the price of 1 year!
+
+### About IPv4 Subscription
+
+Our IPv4 Subscription is usable with any wireguard compatible device. Wireguard is a secure and easy to use VPN protocol: it is supported on Linux, BSD, MacOS, and Windows. You can even use wireguard on your mobile phone.
+
+
+### Order IPv4 Address now and save 144 CHF!
+
+Our IPv4 address is 144 CHF per year. Now you can pay just 144 CHF for 2 year's IPv4 subscription instead of 288 CHF, you save 144 CHF.
+
+The deal is limited to 24 IPv4 addresses.
+
+* Order IPv4 Subscription for 2 years for the price of 1 year
+
+---
+content1_image: ipv4-address.jpg
+---
+content2_text:
+
+## Deal 2. VIWIB, VIGIR, VIIRB,  with 2 years of free IPv6 VPN
+
+Everyone who orders ungleich IPv6 routers (VIWIB, VIGIR, VIIRB) during the Black Friday Sales gets a router with 2 years IPv6 VPN included instead of 1 year. Buy a router now, and you get the special deal included automatically.
+
+* [Buy VIWIB](https://ungleich.ch/u/products/viwib-wifi-ipv6-box/)
+* [Buy VIGIR](https://ungleich.ch/u/products/vigir/)
+* [Buy VIIRB](https://ungleich.ch/u/products/viirb-ipv6-box/)
+
+---
+content2_image: ipv6router.jpg
+---
+content3_text:
+
+## Deal 3. 50% Discount on IPv6 VPN extension for VIIRB, VIWIB, VIGIR users
+
+Do you already have our star product [VIWIB,](https://ungleich.ch/u/products/viwib-wifi-ipv6-box/) [VIIRB,](https://ungleich.ch/u/products/viirb-ipv6-box/) or [VIGIR](https://ungleich.ch/u/products/vigir/)? Now we offer the next year's VPN for your router with 50% discount. Our standard VPN costs 120 CHF per year, but with this deal you can have your current VPN extended for another year for just half the price. Enjoy the IPv6 router and keep your IPv6 VPN uninterrupted!
+Offer is valid for VIIRB, VIGIR or VIWIB users.
+
+* Order IPv6 VPN extension for VIIRB, VIWIB, VIGIR with 50% discount
+
+---
+content3_image: vigir-extension.jpg
+---
+
+description6:
+
+## More Info
+
+* Our IPv6 VPN is running fully on renewable energy and Open Source. You can find more information on it on our [IPv6 VPN page.](https://ipv6vpn.ch)
+* Our VIWIB is the mini WiFi Router with a versatile use. You can find more information on it on our [VIWIB product page.](https://ungleich.ch/u/products/viwib-wifi-ipv6-box/)
+* Our VIIRB is the world's smalledst IPv6 router box that lets you have IPv6 anywhere, anytime. You can find more information on it on our [VIIRB product page.](https://ungleich.ch/u/products/viirb-ipv6-box/)
+* Our VIGIR is the powerful, professional IPv6 router box that lets you do your serious work with IPv6. You can find more information on it on our [VIGIR product page.](https://ungleich.ch/u/products/vigir/)
+
+Any questions, you can drop us a mail to support@ungleich.ch and our team will get back to you as soon as possible! Happy IPv6 Black Friday everyone!

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

@@ -0,0 +1,105 @@
+_model: product
+---
+_discoverable: yes
+---
+_hidden: no
+---
+title: Dedicated December 2021
+---
+subtitle: Access to dedicated servers
+---
+headline1: Dedicated Servers
+---
+headline2: Exclusive Access
+---
+header_background_color: #211C1E
+---
+header_text_color: text-light
+---
+nav_classes: navbar-dark
+---
+description1:
+
+## Dedicated December Highlights
+
+This December you have the chance to get 1 out of 10
+dedicated servers hosted in Data Center Light:
+
+* Real, dedicated hardware
+* 24 logical cores
+* 48 GB RAM
+* 2x 2TB SSD
+* Remove access via IPMIView
+* Dedicated, routed /48 IPv6 network
+* Dedicated layer 2 network
+* (optional, add on) IPv4 addresses (mapped via NAT64)
+* **No setup fee**
+* Minimum contract duration: 3 months
+* Powered by 100% hydro power
+
+## The offer in detail
+
+The offer is valid for all orders received between 2021-12-01 to
+2021-12-31. The monthly price is 250 CHF. The price stays the same
+until the end of the contract.
+
+On order, you get access to an server without operating system
+or booted into Alpine Linux via USB stick.
+
+You have remote access (keyboard/mouse/video) via IPMIview (access
+protected using Wireguard VPN), which allows you to install an
+operating system.
+
+It has power efficient Intel Xeon L5640 CPUs running at 2.27GHz.
+
+You can configure the SSDs in as one operating system disk or in a
+software raid.
+
+The supplied power is 100% renewable hydro power.
+
+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.
+
+## What can you do with it?
+
+You can use this server to host your own services, virtual machines or
+even Kubernetes clusters on it.
+
+You can host your photos and data (f.i. via Nextcloud), run a
+community chat (f.i. via Matrix) or host your company website
+(f.i. via wordpress) on it.
+
+Or you can deploy your own cluster of virtual machines - maybe even
+IPv6 only Kubernetes on top of it?
+
+## 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 Server
+1](https://datacenterlight.ch/product/dedicated-server-1/) page.
+
+After the order is confirmed you will get access to the server via
+wireguard and IPMIView within 5 working days. We will need a public
+wireguard key for you to grant you access to your server. You can
+already install
+[IPMIView](https://www.thomas-krenn.com/en/download/frame.only_content/hide_filter.1/hide_filter_serial.1/product.3133.html)
+on your machine.
+
+If you opted for Alpine Linux on a USB stick, you can send us a public
+ssh key for direct access.

content/u/products/vigir/contents.lr

@@ -140,9 +140,9 @@ Let us know if you want tracked or untracked shipping.
 
 ### Price
 
-**Update 2021-09-14: we are sold out!**
+**Update 2021-11-01: Back in stock!**
 
-Thanks to your love, we ran out of our stock of VIGIR. You can preorder now and we will start shipping our next batch of VIGIR from 2021-10-21 again.
+Thank you for waiting, VIIRB is back in stock again!  
 
 **The price of the VIGIR is 250 CHF**, including the LTE modem,
 6 antennas and the power supply.

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

@@ -270,9 +270,9 @@ for **145 CHF** (203 CHF including the VIIRB).
 
 ### Price
 
-**Update 2021-09-14: we are sold out!**
+**Update 2021-11-01: Back in stock!**
 
-Thanks to your love, we ran out of our stock of VIIRB. You can preorder now and we will start shipping our next batch of VIIRB from 2021-10-21 again.
+Thank you for waiting, VIIRB is back in stock again!  
 
 **The price of the VIIRB is 58 CHF**.
 

content/u/products/viwib-wifi-ipv6-box/contents.lr

@@ -94,9 +94,9 @@ the VIWIB and just get started with IPv6.
 
 ### Price
 
-**Update 2021-09-14: we are sold out!**
+**Update 2021-11-01: Back in stock!**
 
-Thanks to your love, we ran out of our stock of VIWIB. You can preorder now and we will start shipping our next batch of VIWIB from 2021-10-21 again.
+Thank you for waiting, VIWIB is back in stock again!  
 
 **The price of the VIWIB is 68 CHF**.
 
@@ -190,7 +190,7 @@ The autonomous security system set can be added to your VIWIB order for 145 CHF
 ## More of it
 
 If you need more ports, Gigabit support, more RAM and more storage,
-you can checkout our [Pro IPv6 Box](../pro-ipv6-box).
+you can checkout our [VIGIR](../vigir/).
 
 If you prefer a smaller device and you do not need wifi, we recommend to
 checkout our [VIIRB](/u/products/viirb-ipv6-box/).

requirements.txt

@@ -0,0 +1 @@
+lektor