From 646ac8bcaf58b2287dcca23ce844faf0ca207a77 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Thu, 23 Apr 2020 16:52:26 +0200 Subject: [PATCH 01/10] update title --- content/u/blog/emacs-server-the-smart-way/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/u/blog/emacs-server-the-smart-way/contents.lr b/content/u/blog/emacs-server-the-smart-way/contents.lr index e6afd69..fbb404c 100644 --- a/content/u/blog/emacs-server-the-smart-way/contents.lr +++ b/content/u/blog/emacs-server-the-smart-way/contents.lr @@ -1,4 +1,4 @@ -title: Emacs, be my server +title: Emacs server the fun way --- pub_date: 2020-04-23 --- From 2f4ed50f29d6324644737c90ca971829c5a76bb4 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Thu, 23 Apr 2020 17:25:29 +0200 Subject: [PATCH 02/10] ++update for emacslient -a "" --- .../emacs-server-the-smart-way/contents.lr | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/content/u/blog/emacs-server-the-smart-way/contents.lr b/content/u/blog/emacs-server-the-smart-way/contents.lr index fbb404c..9083cf8 100644 --- a/content/u/blog/emacs-server-the-smart-way/contents.lr +++ b/content/u/blog/emacs-server-the-smart-way/contents.lr @@ -118,3 +118,26 @@ window is the X11 window, the lower window is a terminal window (they happen to be configured to have the same nice background colour). ![](emacs.png) + + +## Updates + +### 2020-04-23, 17:23 + +[MutoShack](https://www.reddit.com/user/MutoShack/) pointed +out on +[reddit](https://www.reddit.com/r/emacs/comments/g6nqwv/emacs_server_the_fun_way/foazghz/) +that using + +``` +emacsclient -a "" -c +``` + +is actually smarter than just using + +``` +emacsclient -c +```, + +because it will start the daemon if it is not already running. No day +that you don't learn something! From d9a07fddf10b260f1752fd6496acb76fe234eacc Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Thu, 23 Apr 2020 18:58:53 +0200 Subject: [PATCH 03/10] +product: bgp peering --- content/u/products/bgp-peering/contents.lr | 43 +++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) diff --git a/content/u/products/bgp-peering/contents.lr b/content/u/products/bgp-peering/contents.lr index 62cb45c..b268e9b 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,44 @@ title: BGP Peering --- subtitle: Manage your own address space --- +--- +headline1: BGP Peering +--- +headline2: Your own IP Space +--- +headline3: At Data Center 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. From 067571fc3536262e0d9fb71a9c5795137e315d3f Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Thu, 23 Apr 2020 19:50:59 +0200 Subject: [PATCH 04/10] Overview page: fallback to title + text instead of filler image --- content/u/products/bgp-peering/contents.lr | 4 ++++ templates/summary-page.html | 25 ++++++++++++++++++++-- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/content/u/products/bgp-peering/contents.lr b/content/u/products/bgp-peering/contents.lr index b268e9b..622ad43 100644 --- a/content/u/products/bgp-peering/contents.lr +++ b/content/u/products/bgp-peering/contents.lr @@ -13,6 +13,10 @@ 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? 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 %}
From 0ab616d172b40ee82a94087343bc36cab6959457 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Thu, 23 Apr 2020 19:52:00 +0200 Subject: [PATCH 05/10] Remove this week in ipv6 until it's fresh --- content/u/projects/this-week-via-ipv6/contents.lr | 2 ++ 1 file changed, 2 insertions(+) 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 From 4a6b9c8446bf096016ab4d6a0be18ef49ff564b8 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Thu, 23 Apr 2020 20:41:43 +0200 Subject: [PATCH 06/10] Begin to introduce slider --- content/contents.lr | 13 +++++++++++++ models/page-2020.ini | 4 ++++ templates/blocks/slider.html | 3 +++ templates/layout-2020.html | 6 ++++++ 4 files changed, 26 insertions(+) create mode 100644 templates/blocks/slider.html 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/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 %}
From b19647e3e76da59819fef6a58a87853668f44494 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Fri, 24 Apr 2020 09:46:27 +0200 Subject: [PATCH 07/10] fix two typos in emacs article --- content/u/blog/emacs-server-the-smart-way/contents.lr | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/u/blog/emacs-server-the-smart-way/contents.lr b/content/u/blog/emacs-server-the-smart-way/contents.lr index 9083cf8..80bb967 100644 --- a/content/u/blog/emacs-server-the-smart-way/contents.lr +++ b/content/u/blog/emacs-server-the-smart-way/contents.lr @@ -57,13 +57,13 @@ much faster is the obvious advantage. However, there is a much bigger one: With the emacs server, you can connect to it from the terminal **and** X -Windows. Because the emacs server also manages the buffers ("open +Window. Because the emacs server also manages the buffers ("open files" for non-emacs users), you can view the same open file from the terminal or an x window. ## Turning the notebook into a server -As you might now, we at ungleich are pretty much into IPv6. So all of +As you might know, we at ungleich are pretty much into IPv6. So all of our devices are generally speaking world-wide reachable. Our work notebooks are no exception from that. In fact, most notebooks even have their own [/48 IPv6 network assigned via From 1ad03e2f783cb6b747bdb57dc31efaa500753534 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Sat, 25 Apr 2020 21:21:04 +0200 Subject: [PATCH 08/10] [project] add ubookmark --- content/u/projects/ubookmark/contents.lr | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 content/u/projects/ubookmark/contents.lr diff --git a/content/u/projects/ubookmark/contents.lr b/content/u/projects/ubookmark/contents.lr new file mode 100644 index 0000000..a4f0796 --- /dev/null +++ b/content/u/projects/ubookmark/contents.lr @@ -0,0 +1,13 @@ +title: ubookmark +--- +subtitle: +ubookmark is a simple link collecting website. +--- +content: + +ubookmark uses LDAP authentication. It was written and designed for +running [IPv6.blog](https://IPv6.blog), but should be re-usable in +other situations. + +ubookmark is FOSS and its source code can be found on +[code.ungleich.ch](https://code.ungleich.ch/ungleich-public/ubookmark/). From 0feaaf5a014cef5ce60c1a39da3bfd056df84201 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Sat, 25 Apr 2020 21:25:00 +0200 Subject: [PATCH 09/10] ++ubookmark infos --- content/u/projects/ubookmark/contents.lr | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/content/u/projects/ubookmark/contents.lr b/content/u/projects/ubookmark/contents.lr index a4f0796..b04cdfa 100644 --- a/content/u/projects/ubookmark/contents.lr +++ b/content/u/projects/ubookmark/contents.lr @@ -5,9 +5,25 @@ ubookmark is a simple link collecting website. --- content: -ubookmark uses LDAP authentication. It was written and designed for +## Introduction + +ubookmark is based on Django, Bootstrap 4 +and uses LDAP authentication. It was written and designed for running [IPv6.blog](https://IPv6.blog), but should be re-usable in other situations. ubookmark is FOSS and its source code can be found on [code.ungleich.ch](https://code.ungleich.ch/ungleich-public/ubookmark/). + +## How to install + +* git clone above repository +* Setup a local postgresql database named "ubookmark" +* Copy ubookmark/sample_settings.py to ubookmark/local_settings.py +* Modify settings as needed +* Install requirements using `pip install -r requirements.txt` + +## How to run + +It is a standard Django app, so you can use uwsgi +or the included server for testing: `python manage.py runserver`. From 489b2f0be93bb8637c890d033947a7a83e9387f1 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Sun, 26 Apr 2020 20:02:43 +0200 Subject: [PATCH 10/10] Fix link ipv6.chat -> open chat --- content/u/projects/ipv6-chat/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/u/projects/ipv6-chat/contents.lr b/content/u/projects/ipv6-chat/contents.lr index 268cdee..c5eeb5b 100644 --- a/content/u/projects/ipv6-chat/contents.lr +++ b/content/u/projects/ipv6-chat/contents.lr @@ -22,7 +22,7 @@ If you already have a matrix account, you can join If you don't have a matrix account, you find the instructions on [how to create a matrix account on our Open Chat -page](../open-chat). +page](/u/projects/open-chat/). ## Other chat rooms