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

configs/atom.ini

@@ -4,8 +4,8 @@ source_path = /u/blog
 filename = feed.xml
 item_model = blog-post
 
-[products]
+# [products]
-name = ungleich products
+# name = ungleich products
-source_path = /u/products
+# source_path = /u/products
-filename = feed.xml
+# filename = feed.xml
-item_body_field = description
+# item_body_field = description

content/u/products/data-storage/contents.lr

@@ -0,0 +1,36 @@
+_discoverable: yes
+---
+_hidden: no
+---
+title: Data Storage
+---
+subtitle: Stored safely in Switzerland
+---
+feature1_title: Neutral
+---
+feature1_text:
+Switzerland is a neutral country and politically stable.
+---
+feature3_title: Safe
+---
+feature3_text:
+Switzerland has strong privacy laws to protect your data.
+---
+feature2_title: Sustainable & Renewable energy
+---
+feature2_text: Our data center is built on core concepts
+of sustainability and only uses 100% renewable energy.
+Read more about [how to sustainably store your data](https://ungleich.ch/u/blog/how-to-sustainable-store-your-data/).
+---
+description2:
+We offer a variety of methods to store your data safely in
+Switzerland. [Glarnercloud](https://glarnercloud.ch) is our Nextcloud
+based offer to allow an easy way of storing your data and
+synchronising it with all your devices.
+
+Alternatively you can also manage your own
+[virtual machine](https://datacenterlight.ch), it is even possible to
+do this with an [IPv6 only VM](https://ipv6onlyhosting.com).
+
+We also have a beta program for S3 compatible storage. Send a mail
+to support at ungleich.ch if you are interested in using it.

content/u/products/ipv6-only-hosting/contents.lr

@@ -6,4 +6,41 @@ _discoverable: yes
 ---
 _hidden: no
 ---
-subtitle: We provide best IPv6 only hosting
+subtitle: Future ready, today.
+---
+feature1_title: Necessary
+---
+feature1_text: We [ran out of IPv4
+space](https://www.ripe.net/publications/news/about-ripe-ncc-and-ripe/the-ripe-ncc-has-run-out-of-ipv4-addresses)
+by the end of 2019. While you can acquire IPv4 space on the market, it
+is very expensive and effectively limiting new projects to come into
+existence. IPv6 fixes all of this, today.
+---
+feature2_title: Sustainable & Simple
+---
+feature2_text: Compared to IPv4 only or Dual Stack VMs, IPv6 only VMs
+are the only ones really ready for the future.
+**IPv4** only VMs already face the problem that they cannot reach resources in the IPv6
+Internet. Dual stack VMs are increasing complexity and difficulty,
+especially when it comes to firewall rules and security.
+---
+feature3_title: Connected
+---
+feature3_text:
+Even with IPv6 only VMs you are not isolated from the legacy (IPv4)
+Internet. Our
+[DNS64](https://redmine.ungleich.ch/projects/open-infrastructure/wiki/The_ungleich_DNS_infrastructure)
+and
+[NAT64](https://redmine.ungleich.ch/projects/open-infrastructure/wiki/The_ungleich_network_infrastructure#IPv6-NAT64)
+services allow your VM to connect anywhere in the legacy
+Internet. And even the legacy Internet can connect to you, using an
+[IPv4-to-IPv6 proxy](https://redmine.ungleich.ch/projects/open-infrastructure/wiki/How_to_use_the_IPv4-to-IPv6-Proxy)!
+---
+description2:
+IPv6 only hosting is giving you access to virtual machines that will
+become the standard tomorrow, already today. Instead of managing
+legacy IP VMs with NAT, creating floating IP addresses and complex
+firewall setups, all this burden is lifted away with IPv6 only VMs.
+
+Additionally you can request a /64 network to be routed to your VM,
+for free!

content/u/products/storage-glarnercloud/contents.lr

@@ -1,20 +0,0 @@
-_discoverable: yes
----
-_hidden: no
----
-title: Cloud Storage
----
-subtitle: Stored safely in Switzerland
----
-feature1_title: Neutral
----
-feature1_text: The text for the first feature
----
-feature2_title: Safe
----
-feature2_text: The text for second feature
----
-feature3_title: Renewable
----
-feature3_text: The text for the third feature
----

content/u/products/virtual-machine-hosting/contents.lr

@@ -6,3 +6,49 @@ title: Virtual Machine Hosting
 ---
 subtitle: Sustainable, green and safe
 ---
+feature1_title: Full virtualisation
+---
+feature1_text: All our virtual machines use full virtualisation. This
+way we can offer a variety of different operating systems that would
+not be possible with container technologies alone.
+---
+feature2_title: Redundancy, redundancy, redundancy!
+---
+feature2_text: Every data block of every virtual machine is saved
+three times on three different computers. This way if one or even two
+storage nodes fail at the same time, no data is lost. The underlying
+technology we use is [CEPH](https://ceph.com).
+
+We also offer creating special backup VMs in a geolocation different
+data center so that even in a disaster case you still have a backup of
+your data.
+---
+feature3_title: Scalable
+---
+feature3_text: It is easy to start small and to grow your VM over
+time. And you can grow quite far:
+You need 64 cores in one VM? We have it. You need 1 TB of RAM in a VM?
+We have it. You need 1 PB (1024 TB) Storage in your VM? You get it.
+---
+description2:
+As you might know, all our data centers are built upon the principle
+of sustainability. We reuse old factory halls, we acquire used
+hardware (with fresh SSDs and fresh HDDs), we produce our own
+electricity locally.
+
+And importantly: we don't cool our servers. Instead we give each
+server enough space to breath (on average: 4 square meters).
+
+We have two different virtual machine offers:
+
+* [The future guiding IPv6 only hosting](https://ipv6onlyhosting.com)
+* [The traditional dual stack hosting on DataCenterLight.ch](https://datacenterlight.ch)
+
+The difference between them is that the **IPv6 Only hosting** comes
+without IPv4 addresses and has a lower pricing. The lower pricing
+comes from the scarcity of IPv4 addresses: there is only a very limited
+pool of IPv4 addresses.
+
+Both offers include an optional /64 IPv6 network that you receive on
+request and both offers can also be extended with HDD storage for 1.5
+CHF/month per 100 GB storage.

models/product.ini

@@ -12,8 +12,12 @@ size = large
 label = Subtitle
 type = string
 
-[fields.description]
+[fields.description1]
-label = Description
+label = Description 1
+type = markdown
+
+[fields.description2]
+label = Description 2
 type = markdown
 
 [fields.link]
@@ -35,15 +39,15 @@ type = string
 
 [fields.feature1_text]
 label = Feature1 Text
-type = text
+type = markdown
 
 [fields.feature2_text]
 label = Feature2 Text
-type = text
+type = markdown
 
 [fields.feature3_text]
 label = Feature3 Text
-type = text
+type = markdown
 
 [fields.content1_text]
 label = Content1 Text

models/products.ini

@@ -12,4 +12,5 @@ label = Subtitle
 type = string
 
 [children]
-model = product
+model = product
+order_by = title

templates/layout-2020.html

@@ -5,11 +5,13 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 
+    <title>{% block title %}Welcome to {% endblock %} | ungleich.ch</title>
     <!-- Bootstrap + helpers2 -->
     <link rel="stylesheet"
           href="/u/static/bootstrap-4.4.1-dist/css/bootstrap.min.css">
 
-    <title>{% block title %}Welcome to {% endblock %} | ungleich.ch</title>
+    <link rel="shortcut icon" href="/u/static/images/favicon.ico"/>
+
   </head>
   <body>
     <nav class="navbar navbar-expand-lg navbar-light bg-light">

templates/product.html

@@ -3,11 +3,11 @@
 {% block subtitle %}{{ this.subtitle }}{% endblock %}
 
 {% block content %}
-{% if this.description %}
+{% if this.description1 %}
 <div class="container">
   <div class="row mb-3">
     <div class="col-md-12">
-      {{ this.description }}
+      {{ this.description1 }}
     </div>
   </div>
 </div>
@@ -28,6 +28,15 @@
     </div>
   </div>
 </div>
+{% if this.description2 %}
+<div class="container">
+  <div class="row mb-3">
+    <div class="col-md-12">
+      {{ this.description2 }}
+    </div>
+  </div>
+</div>
+{% endif %}
 <div class="container">
   <div class="row mb-3">
     <div class="col-md-7">