diff --git a/assets/u/image/cards/ipv6vpn.jpg b/assets/u/image/cards/ipv6vpn.jpg new file mode 100644 index 0000000..24bdef4 Binary files /dev/null and b/assets/u/image/cards/ipv6vpn.jpg differ diff --git a/assets/u/image/ipv6-vpn-ungleich-swiss.jpg b/assets/u/image/ipv6-vpn-ungleich-swiss.jpg new file mode 100644 index 0000000..e984bed Binary files /dev/null and b/assets/u/image/ipv6-vpn-ungleich-swiss.jpg differ diff --git a/content/contents.lr b/content/contents.lr index 4775b03..b5f0c98 100644 --- a/content/contents.lr +++ b/content/contents.lr @@ -8,3 +8,16 @@ There is not much here - everything is stored below /u/. You should actually not be able to see this page below ungleich.ch. If you do, please let us know. --- +slider: + +title: + +description: + +button_text: + +button_link: + +background_image: + +video_mp4: diff --git a/content/u/blog/deutschsprachiger-coronavirus-chat/contents.lr b/content/u/blog/deutschsprachiger-coronavirus-chat/contents.lr index b27e6b1..a4b7d3e 100644 --- a/content/u/blog/deutschsprachiger-coronavirus-chat/contents.lr +++ b/content/u/blog/deutschsprachiger-coronavirus-chat/contents.lr @@ -15,6 +15,7 @@ Wo man sich über den Virus austauschen kann --- body: + ## Wie es funktioniert in Kürze * Gehe auf https://account.ungleich.ch und erzeuge einen neuen Account diff --git a/content/u/products/bgp-peering/contents.lr b/content/u/products/bgp-peering/contents.lr index 62cb45c..622ad43 100644 --- a/content/u/products/bgp-peering/contents.lr +++ b/content/u/products/bgp-peering/contents.lr @@ -1,4 +1,4 @@ -_discoverable: no +_discoverable: yes --- _hidden: no --- @@ -6,3 +6,48 @@ title: BGP Peering --- subtitle: Manage your own address space --- +--- +headline1: BGP Peering +--- +headline2: Your own IP Space +--- +headline3: At Data Center Light +--- +header_background_color: #6298CB +--- +header_text_color: text-light +--- +content1_text: + +## For whom is BGP peering? + +If you have your own ASN with IPv6 or IPv4 address space, you can +announce it in our data centers. + +## What is required for BGP peering + +To be able to peer with us, you will need to have IP addresses in our +data center. This is the case if you have one of these products: + +* [A Data Center Light VM](../virtual-machine-hosting/) +* [An IPv6 Only VM](../ipv6-only-hosting/) +* [Physical co-located hardware](../colocation/) + +## How to setup BGP peering + +Send a mail to support -at- ungleich.ch containing the following +information: + +* Your ASN and the list of networks you intend to announce +* Your local IP addresses + +Before we can peer, ensure that all objects in the RIPE database are +setup correctly. Specifically ensure that you have + +* route6 / route objects +* inet6num / inetnum objects +* ROA / RPKI configured + +## Pricing + +Setting up peering has a 42 CHF one time fee. diff --git a/content/u/products/ipv6-vpn/contents.lr b/content/u/products/ipv6-vpn/contents.lr index c9ae664..e5e4b0d 100644 --- a/content/u/products/ipv6-vpn/contents.lr +++ b/content/u/products/ipv6-vpn/contents.lr @@ -6,16 +6,18 @@ title: IPv6 VPN --- subtitle: Take your IPv6 with you. --- -image: /u/image/cards/ipv6-vpn.jpg +image: /u/image/cards/ipv6vpn.jpg --- -headline1: IPv6 +headline1: Get IPv6 +--- +headline2: Anywhere, anytime +--- +headline3: IPv6 VPN +--- +header_background_color: #1393B4 --- -headline2: VPN ----- -header_background_color: #7B95D4 ----- header_text_color: text-light ----- +--- nav_classes: navbar-dark --- feature1_title: Versatile @@ -35,7 +37,9 @@ feature3_text: The VPN works in situations where you have NAT, NAT64 or other network inspection modes in place. It just requires UDP traffic to pass. --- -description1: +content1_text: + +##IPv6 VPN At ungleich we believe that IPv6 should be available everywhere. To help you connecting to IPv6 only resources, we offer the IPv6-VPN. @@ -50,3 +54,16 @@ One VPN is free for all existing customers with resources on You can find more about the VPN and technical details, on [IPv6VPN.ch](https://ipv6vpn.ch). +--- +content1_image /u/image/ipv6-vpn-ungleich-swiss.jpg +--- +offer1_title: IPv6 VPN 120 CHF/Year +--- +offer1_text: +* IPv6 addresses registerd in Switzerland +* 80 bit of IPv6 space +* Encrypted +* with a /48 network + +--- +offer1_link: https://datacenterlight.ch/product/ipv6-vpn-48/ diff --git a/content/u/projects/this-week-via-ipv6/contents.lr b/content/u/projects/this-week-via-ipv6/contents.lr index 846b328..64ca9f5 100644 --- a/content/u/projects/this-week-via-ipv6/contents.lr +++ b/content/u/projects/this-week-via-ipv6/contents.lr @@ -2,6 +2,8 @@ title: This.week.via-IPv6.com --- subtitle: What happens in a week with IPv6? --- +_discoverable: no +--- content: To be able to track what is going on in the IPv6 world, we created a diff --git a/models/page-2020.ini b/models/page-2020.ini index 2a9b653..b526442 100644 --- a/models/page-2020.ini +++ b/models/page-2020.ini @@ -17,3 +17,7 @@ type = markdown [fields.image] label = Image type = url + +[fields.slider] +type = flow +flow_blocks = slider diff --git a/templates/blocks/slider.html b/templates/blocks/slider.html new file mode 100644 index 0000000..1397967 --- /dev/null +++ b/templates/blocks/slider.html @@ -0,0 +1,3 @@ +
+ {{ this.text }} +
diff --git a/templates/layout-2020.html b/templates/layout-2020.html index f257403..83686b1 100644 --- a/templates/layout-2020.html +++ b/templates/layout-2020.html @@ -99,6 +99,12 @@ + {# Priority: + If slider given, take slider. + If headline1/2/3 given, take the headline. + Else default to boxed title + subtitle + #} + {% if this.headline1 or this.headline2 or this.headline3 %}
diff --git a/templates/summary-page.html b/templates/summary-page.html index aed0ef0..a7a45e3 100644 --- a/templates/summary-page.html +++ b/templates/summary-page.html @@ -6,6 +6,22 @@
{% for childpage in this.children %} + + {# Setup default settings for the overview #} + + {% if childpage.header_background_color %} + {% set div_style = 'background-color:' + childpage.header_background_color + ';' %} + {% else %} + {% set div_style = 'background-color: #6FB0E5;' %} + {% endif %} + + {% if childpage.header_text_color %} + {% set div_classes = childpage.header_text_color %} + {% else %} + {% set div_classes = 'text-light' %} + {% endif %} + + {% if loop.first %}
{% endif %} @@ -16,8 +32,13 @@ {{ childpage.title }} {% else %} - {{ childpage.title }} +
+  
+ {{ childpage.title }}
+  
+
{% endif %}