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

content/u/offers/timesale-2020-03/contents.lr

@@ -35,24 +35,17 @@ You get 100% discount for your next month invoice when you order a VM at [DataCe
 * ArchLinux: 2020/03/22
 * OpenBSD: 2020/03/23
 * CentOS: 2020/03/24
+* FreeBSD: 2020/03/25
 * Debian: to be announced
 * Devuan: to be announced
 * Fedora: to be announced
-* FreeBSD: to be announced
-
-
 
 We announce which OS will get discount beforehand on this page and on our [Twitter.](https://twitter.com/ungleich)
 
-The first OS getting discount on 2020/03/20, 13:00 - 15:00 CET is Alpine Linux.
-The second OS getting discount on 2020/03/21, 13:00 - 15:00 CET is Ubuntu.
-The third OS getting discount on 2020/03/22,13:00 - 15:00 CET is Archlinux.
-The fourth OS getting discount on 2020/03/23,13:00 - 15:00 CET is OpenBSD.
-The fifth OS getting discount on 2020/03/24,13:00 - 15:00 CET is CentOS.
 
 ## How to get one month for free
 
 Order a monthly or yearly plan on [Data Center Light](https://datacenterlight.ch) and go through the checkout, and send us the following message to support@ungleich.ch or Twitter @ungleich
-"I want the next month free for my CentOS VM."
+"I want the next month free for my FreeBSD VM."
 
 As soon as our team checks your message, we will apply the 100% discount coupon for your next month's payment. You only pay for 1 month but get 2 months.

content/u/products/backup/contents.lr

@@ -1,4 +1,4 @@
-_discoverable: no
+_discoverable: yes
 ---
 _hidden: no
 ---
@@ -41,7 +41,7 @@ offer1_text:
 
 * 1 TB space
 * 4 daily, 4 weekly, 12 monthly backups
-* [30 CHF Setup fee](https://ungleich.ch/product/0carbonwebhosting-setup/)
+* [30 CHF Setup fee](https://ungleich.ch/product/backup-setup/)
 
 ---
 offer1_link: https://ungleich.ch/product/managed-backup-s/
@@ -52,7 +52,7 @@ offer2_text:
 
 * 5 TB space
 * 4 daily, 4 weekly, 12 monthly backups
-* [30 CHF Setup fee](https://ungleich.ch/product/0carbonwebhosting-setup/)
+* [30 CHF Setup fee](https://ungleich.ch/product/backup-setup/)
 
 ---
 offer2_link: https://ungleich.ch/product/managed-backup-m/
@@ -63,7 +63,7 @@ offer3_text:
 
 * 10 TB space
 * 4 daily, 4 weekly, 12 monthly backups
-* [30 CHF Setup fee](https://ungleich.ch/product/0carbonwebhosting-setup/)
+* [30 CHF Setup fee](https://ungleich.ch/product/backup-setup/)
 
 ---
 offer3_link: https://ungleich.ch/product/managed-backup-l/
@@ -80,7 +80,7 @@ HDD storage on top as you want.
 ---
 content2_image: /u/image/diy-backup.jpg
 ---
-offer4_title: Backup-S 40.5 CHF/Month
+offer4_title: DIY Backup (S) 40.5 CHF/Month
 ---
 offer4_text:
 
@@ -88,9 +88,9 @@ offer4_text:
 * 2 Cores, 4 GB RAM, 10 GB SSD VM
 * HDD storage can be added with 1.5 CHF for 100 GB per month.
 ---
-offer4_link: https://ungleich.ch/product/0carbonwebhosting-s/
+offer4_link: https://ungleich.ch/product/diy-backup-s/
 ---
-offer5_title: Backup-M 100.5 CHF/Month
+offer5_title: DIY Backup (M) 100.5 CHF/Month
 ---
 offer5_text:
 
@@ -99,9 +99,9 @@ offer5_text:
 * HDD storage can be added with 1.5 CHF for 100 GB per month.
 
 ---
-offer5_link: https://ungleich.ch/product/0carbonwebhosting-m/
+offer5_link: https://ungleich.ch/product/diy-backup-m/
 ---
-offer6_title: Backup-L 175.5 CHF/Month
+offer6_title: DIY Backup (L) 175.5 CHF/Month
 ---
 offer6_text:
 
@@ -110,4 +110,4 @@ offer6_text:
 * HDD storage can be added with 1.5 CHF for 100 GB per month.
 
 ---
-offer6_link: https://ungleich.ch/product/0carbonwebhosting-l/
+offer6_link: https://ungleich.ch/product/diy-backup-l/

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

@@ -179,9 +179,9 @@ offer1_title: Matrix-S 36 CHF/Month
 offer1_text:
 
 * VM with 1 Core, 2 GB RAM, 10 GB SSD and 100 GB HDD
+* Maintenance fee 20 CHF/month included
 * Application firewall included
 * [Initial setup fee 30 CHF](https://ungleich.ch/product/0carbonchat-setup/)
-* Maintenance fee 20 CHF/month
 
 ---
 offer1_link: https://ungleich.ch/product/hosted-matrix-s/
@@ -191,9 +191,10 @@ offer2_title: Matrix-M 63 CHF/Month
 offer2_text:
 
 * VM with 2 Core, 4 GB RAM, 10 GB SSD and 500 GB HDD
+* Maintenance fee 30 CHF/month included
 * Application firewall included
 * [Initial setup fee 30 CHF](https://ungleich.ch/product/0carbonchat-setup/)
-* Maintenance fee 30 CHF/month
+
 
 ---
 offer2_link: https://ungleich.ch/product/hosted-matrix-m/
@@ -203,9 +204,10 @@ offer3_title: Matrix-L 157 CHF/Month
 offer3_text:
 
 * VM with 8 Core, 16 GB RAM, 10 GB SSD and 1000 GB HDD
+* Maintenance fee 50 CHF/month included
 * Application firewall included
 * [Initial setup fee 30 CHF](https://ungleich.ch/product/0carbonchat-setup/)
-* Maintenance fee 50 CHF/month
+
 
 ---
 offer3_link: https://ungleich.ch/product/hosted-matrix-l/