From 7c25af76d6e45854f259ff57f6bfc299a97b4946 Mon Sep 17 00:00:00 2001 From: WrenIX Date: Sun, 20 Aug 2023 04:08:09 +0200 Subject: [PATCH] fix: move away to terminale --- .gitmodules | 7 +- config.toml | 83 +++++++++++++-------- content/2023-05-gpg.md | 11 ++- content/2023-05-pass.md | 9 ++- content/2023-06-logging.md | 15 +++- content/_index.en.md | 5 -- content/_index.md | 4 +- content/about/_index.en.md | 5 -- content/archive/_index.en.md | 5 -- content/archive/_index.md | 5 -- content/pages/_index.md | 3 + content/pages/about.en.md | 6 ++ content/{about/_index.md => pages/about.md} | 12 ++- content/pages/archive.en.md | 6 ++ content/pages/archive.md | 6 ++ public | 2 +- templates | 1 + themes/anatole-zola | 1 - themes/terminimal | 1 + 19 files changed, 116 insertions(+), 71 deletions(-) delete mode 100644 content/_index.en.md delete mode 100644 content/about/_index.en.md delete mode 100644 content/archive/_index.en.md delete mode 100644 content/archive/_index.md create mode 100644 content/pages/_index.md create mode 100644 content/pages/about.en.md rename content/{about/_index.md => pages/about.md} (73%) create mode 100644 content/pages/archive.en.md create mode 100644 content/pages/archive.md create mode 120000 templates delete mode 160000 themes/anatole-zola create mode 160000 themes/terminimal diff --git a/.gitmodules b/.gitmodules index b316c7a..51f8c45 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,6 @@ -[submodule "themes/anatole-zola"] - path = themes/anatole-zola - url = https://github.com/longfangsong/anatole-zola.git - [submodule "public"] path = public url = git@codeberg.org:wrenix/pages.git +[submodule "themes/terminimal"] + path = themes/terminimal + url = https://github.com/pawroman/zola-theme-terminimal.git diff --git a/config.toml b/config.toml index 10b49ef..344bf9e 100644 --- a/config.toml +++ b/config.toml @@ -3,48 +3,67 @@ title = "WrenIX" description = "Der Zaunkönig im Netzwerk" generate_feed = true -compile_sass = false -build_search_index = true -default_language = "de" +compile_sass = true +build_search_index = false -theme = "anatole-zola" +# theme = "anatole-zola" # theme = "tabi" +theme = "terminimal" + +taxonomies = [ + {name = "tags"} +] + +feed_filename = "rss.xml" + +default_language = "de" +[languages.en] [markdown] external_links_target_blank = true # Whether to do syntax highlighting # Theme can be customised by setting the `highlight_theme` variable to a theme supported by Zola highlight_code = true -highlight_theme = "base16-ocean-light" +# highlight_theme = "base16-ocean-light" -[languages.de.translations] -language_name = "Deutsch" -about = "About Me" -home = "Home" -archive = "Archiv" -date_format = "%d.%m.%Y" -next_page = "Nächste Seite" -last_page = "Vorherige Seite" - - -#[languages.en] -#title = "WrenIX" -#description = "The wren in the network" - -#[languages.en.translations] -#language_name = "English" -#home = "Home" -#about = "About Me" -#archive = "Archive" -#date_format = "%Y-%m-%d" -#next_page = "Next Page" -#last_page = "Last Page" [extra] +accent_color = "blue" +background_color = "blue" -[extra.social] -mastodon = "https://chaos.social/@wrenix" +logo_text="WrenIX" +author="WrenIX" +copyright_html="© WrenIX" -[extra.social.git] -url = "https://codeberg.org/wrenix" -name = "Codeberg" +use_full_hack_font = true +page_titles = "main_only" + +favicon = "/images/avatar.png" +favicon_mimetype = "image/png" + +[[extra.menu_items]] +name="home" +url="$BASE_URL" + +[[extra.menu_items]] +name="archive" +url="$BASE_URL/archive" + +[[extra.menu_items]] +name="about me" +url="$BASE_URL/about" + +[[extra.menu_items]] +name="rss" +url="$BASE_URL/rss.xml" +newtab=true + +[[extra.menu_items]] +name="mastodon" +url="https://chaos.social/wrenix" +newtab=true + +[[extra.menu_items]] +name="git" +url="https://codeberg.org/wrenix" +newtab=true diff --git a/content/2023-05-gpg.md b/content/2023-05-gpg.md index 08a44a9..ae71928 100644 --- a/content/2023-05-gpg.md +++ b/content/2023-05-gpg.md @@ -1,7 +1,12 @@ +++ title = "eToken und GPG-Key" -template = "page.html" -date = 2023-05-17T13:37:00Z +date = "2023-05-17" + +[taxonomies] +tags = [ + "gpg", + "desktop" +] +++ Ich nutze den GPG-Key für folgende Funktionen: @@ -13,6 +18,8 @@ Dieser Artikel soll allerdings nicht den Einsatz beschreiben, sondern die Einric Für die Einrichtung nutze ich ein yubiKey, doch dies sollte einfach für ein NitroKey funktionieren, was ich villt. nachhole. + + ## 1. Generierung von Schlüsseln ### Wo wird / Sollte der Schlüssel generiert werden Mit dem Spruch "kein Backup kein Mitleid", muss zunächst die Schlüssel auf ein Rechner generiert werden (und im 3. Schritt auf den eToken übertragen). diff --git a/content/2023-05-pass.md b/content/2023-05-pass.md index 57ab4a5..25f238d 100644 --- a/content/2023-05-pass.md +++ b/content/2023-05-pass.md @@ -1,7 +1,12 @@ +++ title = "Passwordmanager mit GPG-Key" -template = "page.html" -date = 2023-05-18T13:37:00Z +date = "2023-05-18" + +[taxonomies] +tags = [ + "gpg", + "desktop" +] +++ ``` diff --git a/content/2023-06-logging.md b/content/2023-06-logging.md index 15ad516..c90fd75 100644 --- a/content/2023-06-logging.md +++ b/content/2023-06-logging.md @@ -1,13 +1,22 @@ +++ title = "Modernes Logging Konzept" -template = "page.html" -date = 2023-06-22T13:37:00Z +date= "2023-06-22" + +[taxonomies] +tags = [ + "k8s", + "kubernetes", + "server", + "logging" +] +++ - Logging Schema / Format -- Collector , Parsen und Transformieren/Filtern +- Collector, Parsen und Transformieren/Filtern - Logging Backend + + ## Logging Schema / Format Wenn man sich heutzutage mit Logging beschäftigt, möchte man oftmals gerne einheitliche Logs haben, um sich schnell zurecht zu finden und Korrelation, in Anwendungen die direkt oder indirekt zusammen arbeiten, zu finden. diff --git a/content/_index.en.md b/content/_index.en.md deleted file mode 100644 index a4b6785..0000000 --- a/content/_index.en.md +++ /dev/null @@ -1,5 +0,0 @@ -+++ -title = "Home" -# template = "section.html" -+++ -# WrenIX diff --git a/content/_index.md b/content/_index.md index ee36980..3ba04f3 100644 --- a/content/_index.md +++ b/content/_index.md @@ -1,7 +1,5 @@ +++ title = "Home" -template = "index.html" -transparent = true sort_by = "date" -paginate_by = 10 +paginate_by = 3 +++ diff --git a/content/about/_index.en.md b/content/about/_index.en.md deleted file mode 100644 index a4b6785..0000000 --- a/content/about/_index.en.md +++ /dev/null @@ -1,5 +0,0 @@ -+++ -title = "Home" -# template = "section.html" -+++ -# WrenIX diff --git a/content/archive/_index.en.md b/content/archive/_index.en.md deleted file mode 100644 index a4b6785..0000000 --- a/content/archive/_index.en.md +++ /dev/null @@ -1,5 +0,0 @@ -+++ -title = "Home" -# template = "section.html" -+++ -# WrenIX diff --git a/content/archive/_index.md b/content/archive/_index.md deleted file mode 100644 index a4b6785..0000000 --- a/content/archive/_index.md +++ /dev/null @@ -1,5 +0,0 @@ -+++ -title = "Home" -# template = "section.html" -+++ -# WrenIX diff --git a/content/pages/_index.md b/content/pages/_index.md new file mode 100644 index 0000000..800a244 --- /dev/null +++ b/content/pages/_index.md @@ -0,0 +1,3 @@ ++++ +render = false ++++ diff --git a/content/pages/about.en.md b/content/pages/about.en.md new file mode 100644 index 0000000..0066dd8 --- /dev/null +++ b/content/pages/about.en.md @@ -0,0 +1,6 @@ ++++ +title = "About Me" +path = "en/about" ++++ + +# WrenIX diff --git a/content/about/_index.md b/content/pages/about.md similarity index 73% rename from content/about/_index.md rename to content/pages/about.md index fb23ad6..c4f599c 100644 --- a/content/about/_index.md +++ b/content/pages/about.md @@ -1,11 +1,17 @@ +++ -title = "About ME" -template = "about.html" -paginate_by = 0 +title = "About Me" +path = "about" +++ +# WrenIX + Ich nenne mich WrenIX. +Als kleine Slogen nutze ich: +> Der Zaunkönig im Netzwerk. + +![blauer Vogel](/images/avatar.png) + ## Kontakt E-Mail: [contact@wrenix.eu](mailto:contact@wrenix.eu) diff --git a/content/pages/archive.en.md b/content/pages/archive.en.md new file mode 100644 index 0000000..6d117e1 --- /dev/null +++ b/content/pages/archive.en.md @@ -0,0 +1,6 @@ ++++ +title = "Archive" +template = "archive.html" +path = "en/archive" ++++ +# Archive diff --git a/content/pages/archive.md b/content/pages/archive.md new file mode 100644 index 0000000..03d4f6a --- /dev/null +++ b/content/pages/archive.md @@ -0,0 +1,6 @@ ++++ +title = "Archiv" +template = "archive.html" +path = "archive" ++++ +# Archiv diff --git a/public b/public index 86810a3..bb3b8c1 160000 --- a/public +++ b/public @@ -1 +1 @@ -Subproject commit 86810a32593a9f6f53a43bae9dd5b1f2b31a6dd6 +Subproject commit bb3b8c1199183fcc5e6a1430faebda1b4518b939 diff --git a/templates b/templates new file mode 120000 index 0000000..211debb --- /dev/null +++ b/templates @@ -0,0 +1 @@ +themes/terminimal/templates \ No newline at end of file diff --git a/themes/anatole-zola b/themes/anatole-zola deleted file mode 160000 index 3495f12..0000000 --- a/themes/anatole-zola +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 3495f12be84ae6a7d543ce2ccf96314a17ce0aa7 diff --git a/themes/terminimal b/themes/terminimal new file mode 160000 index 0000000..910e50b --- /dev/null +++ b/themes/terminimal @@ -0,0 +1 @@ +Subproject commit 910e50b824c898fc9641ab7910ce4a984e97040f