{%- for post in collections.all %}
{% if post.data.series == series %}
@@ -34,7 +34,7 @@ layout: base.njk
{% set service = services | getServiceById(service) %}
{% if service %}
-
Zugehöriger Dienst
+
{{ strings.article.relatedService[locale] }}
{% if service.beta == true %}
@@ -48,7 +48,7 @@ layout: base.njk
{% if service.status %}
@@ -59,27 +59,15 @@ layout: base.njk
{% endif %}
-
Du hast eine Frage dazu?
-
+
{{ strings.article.questions[locale] }}
+
{{ strings.article.questionsContent[locale] | safe }}
-
Über mich
-
-
- Mein Name ist Samuel Philipp und ich bin ein Software Engineer aus Magdeburg. In meiner Freizeit
- hoste ich verschiedene freie Dienste. Hier schreibe ich Artikel rund um
- Sicherheit und Datenschutz.
-
-
Mehr erfahren
-
+
{{ strings.article.aboutMe[locale] }}
+
{{ strings.article.aboutMeContent[locale] | safe }}
-
Schreib mir deine Meinung
+
{{ strings.article.yourOpinion[locale] }}
diff --git a/src/_includes/layouts/service.njk b/src/_includes/layouts/service.njk
index 30bc6e9..c21c57d 100644
--- a/src/_includes/layouts/service.njk
+++ b/src/_includes/layouts/service.njk
@@ -4,8 +4,8 @@ layout: base.njk
{% set service = services | getServiceById(key) %}
{% if service %}
-
Zurück zur Übersicht
-
{{title}} ![{{strings.state[locale]}}](https://status.sp-codes.de/api/badge/1/status?label=Status&upLabel=Online&downLabel=Ausfall&maintenanceLabel=Wartung)
+
{{ strings.service.overview[locale] }}
+
{{title}} ![{{strings.state.title[locale]}}](https://status.sp-codes.de/api/badge/{{service.status}}/status?label={{strings.state.title[locale]}}&upLabel={{strings.state.operational[locale]}}&downLabel={{strings.state.outage[locale]}}&maintenanceLabel={{strings.state.maintenance[locale]}})
diff --git a/src/_includes/layouts/services.njk b/src/_includes/layouts/services.njk
deleted file mode 100644
index 4b1c887..0000000
--- a/src/_includes/layouts/services.njk
+++ /dev/null
@@ -1,10 +0,0 @@
----
-layout: base.njk
----
-
Status
-
-{{ content | safe }}
-
-
- {% include "services-extended.html" %}
-
diff --git a/src/_includes/services-extended.html b/src/_includes/services-extended.html
index eee08df..b721ee2 100644
--- a/src/_includes/services-extended.html
+++ b/src/_includes/services-extended.html
@@ -12,7 +12,7 @@
{% if service.status %}
{% endif %}
diff --git a/src/_includes/services-simple.html b/src/_includes/services-simple.html
deleted file mode 100644
index 16015d1..0000000
--- a/src/_includes/services-simple.html
+++ /dev/null
@@ -1,15 +0,0 @@
-{%- for service in services %}
-
-
-
-
- {% if service.beta == true %}
-
TEST-PHASE
- {% endif %}
-
-
{{service.name}}{% if service.url %} {% endif %}
-
-
-
-{%- endfor %}
diff --git a/src/de/donate.html b/src/de/donate.html
index ecb947d..9e5d8d9 100644
--- a/src/de/donate.html
+++ b/src/de/donate.html
@@ -28,8 +28,8 @@ eleventyNavigation:
Ich schicke dir dann schnellstmöglich meine Bankverbindung zu. Ganz besonders freue ich mich auch über
einen Dauerauftrag.
-
![Banküberweisung {{ strings.supporters[locale] }}](https://shields.sp-codes.de/badge/{{ strings.supporters[locale] }}-{{ donations | banktransfers }}-active)
+
![Banküberweisung {{ strings.donations.supporters[locale] }}](https://shields.sp-codes.de/badge/{{ strings.donations.supporters[locale] }}-{{ donations | banktransfers }}-active)
@@ -38,8 +38,8 @@ eleventyNavigation:
Wer mir etwas Bargeld zukommen lassen möchte, darf das gerne an die Adresse aus dem
Impressum senden.
-
![Bargeld {{ strings.supporters[locale] }}](https://shields.sp-codes.de/badge/{{ strings.supporters[locale] }}-{{ donations | cash }}-inactive)
+
![Bargeld {{ strings.donations.supporters[locale] }}](https://shields.sp-codes.de/badge/{{ strings.donations.supporters[locale] }}-{{ donations | cash }}-inactive)
diff --git a/src/de/services.html b/src/de/services.html
index a370e2e..cfa2ace 100644
--- a/src/de/services.html
+++ b/src/de/services.html
@@ -1,5 +1,5 @@
---
-layout: services.njk
+layout: base.njk
key: services
title: Dienste
eleventyNavigation:
@@ -8,6 +8,7 @@ eleventyNavigation:
icon: i-server
order: 2
---
+
Status
Dienste
In meiner Freizeit stelle ich eine Vielzahl von Open-Source-Diensten zur Verfügung, die kostenlos und werbe-frei
genutzt werden können. Hier findest du einen Überblick über die verschiedenen Services sowie entsprechende
@@ -24,3 +25,7 @@ eleventyNavigation:
+
+
+ {% include "services-extended.html" %}
+
diff --git a/src/de/services/connectivitycheck.md b/src/de/services/connectivitycheck.md
index 2e7f948..8eae47f 100644
--- a/src/de/services/connectivitycheck.md
+++ b/src/de/services/connectivitycheck.md
@@ -10,6 +10,3 @@ Ein Captive Portal ist eine Anmeldeseite in öffentlichen WLAN-Netzwerken, um de
* [Captive Portal Wikipedia](https://de.wikipedia.org/wiki/Captive_Portal)
* [Quellcode](https://git.sp-codes.de/samuel-p/connectivity-check)
* [Docker Image](https://hub.docker.com/r/samuelph/connectivity-check)
-* [Setup on Android](https://android.stackexchange.com/a/186995/288049)
-* [Setup on Ubuntu](https://askubuntu.com/q/1167177/920103)
-* [Captive Portal Kuketz Blog](https://www.kuketz-blog.de/android-captive-portal-check-204-http-antwort-von-captiveportal-kuketz-de/)
diff --git a/src/de/services/connectivitycheck/setup.md b/src/de/services/connectivitycheck/setup.md
index d58c08a..6bdcc38 100644
--- a/src/de/services/connectivitycheck/setup.md
+++ b/src/de/services/connectivitycheck/setup.md
@@ -68,3 +68,9 @@ sudo service NetworkManager restart
## Firefox
Tippe [about:config](about:config) in die Adresszeile von Firefox und suche anschließend nach `captivedetect.canonicalURL` und `network.connectivity-service`. Setze die URL-Werte auf `https://connectivitycheck.sp-codes.de/generate204`, die Domain-Werte auf `connectivitycheck.sp-codes.de`. Das war es schon.
+
+## Quellen
+
+* [Setup on Android](https://android.stackexchange.com/a/186995/288049)
+* [Setup on Ubuntu](https://askubuntu.com/q/1167177/920103)
+* [Captive Portal Kuketz Blog](https://www.kuketz-blog.de/android-captive-portal-check-204-http-antwort-von-captiveportal-kuketz-de/)
diff --git a/src/de/services/mastodon.md b/src/de/services/mastodon.md
index 4888a55..3480153 100644
--- a/src/de/services/mastodon.md
+++ b/src/de/services/mastodon.md
@@ -7,7 +7,7 @@ Mastodon ist ein verteilter Mikroblogging-Dienst, ähnlich wie Twitter. Allerdin
Da Mastodon auf offenen Web-Protokollen und freier, quelloffener Software basiert, kann auch mit anderen Diensten, wie Pleroma, PeerTube, Pixelfed, Friendica oder Hubzilla kommuniziert werden. Nutzende können Text-, Bild-, Videonachrichten oder Umfragen also dienst- und serverübergreifend teilen.
-Melde dich gerne auf meinem Server an oder suche dir einen aus den unten verlinkten Listen heraus. Ich freue mich auf deine Nachricht an [@samuel_p@matrix.sp-codes.de](https://social.sp-codes.de/@samuel_p).
+Melde dich gerne auf meinem Server an oder suche dir einen aus den unten verlinkten Listen heraus. Ich freue mich auf deine Nachricht an [@samuel_p@social.sp-codes.de](https://social.sp-codes.de/@samuel_p).
## Server-Details
diff --git a/src/de/services/matrix.md b/src/de/services/matrix.md
index dd2789a..f92cb3d 100644
--- a/src/de/services/matrix.md
+++ b/src/de/services/matrix.md
@@ -3,16 +3,9 @@ layout: service.njk
key: matrix
title: Matrix
---
+[Matrix](https://matrix.org) ist eine moderne, quelloffene Software für dezentrale Kommunikation (wie E-Mail). Matrix bietet von Haus aus Sprach- und Videoanrufe, inklusive Ende-zu-Ende-Verschlüsselung und vieles mehr. Das Entscheidende ist, dass es nicht den einen Matrix-Server gibt, den alle Nutzende verwenden müssen, wie das beispielsweise bei WhatsApp, Telegram und vielen anderen verbreiteten Messengern der Fall ist.
-[Matrix](https://matrix.org) ist eine moderne, quelloffene Software für dezentrale Kommunikation (wie E-Mail). Matrix
-bietet von Haus aus Sprach- und Videoanrufe, inklusive Ende-zu-Ende-Verschlüsselung und vieles mehr. Das Entscheidende
-ist, dass es nicht den einen Matrix-Server gibt, den alle Nutzende verwenden müssen, wie das beispielsweise bei
-WhatsApp, Telegram und vielen anderen verbreiteten Messengern der Fall ist.
-
-Da Matrix dezentral funktioniert, können sich alle einen öffentlichen Server aussuchen oder ihren eigenen
-erstellen und trotzdem mit allen Personen kommunizieren, nicht nur mit denen, die den eigenen Server nutzen. Die
-verschickten Nachrichten werden so nur auf den beteiligten Servern gespeichert. Auch die Anrufe laufen nur über die
-beteiligten Server.
+Da Matrix dezentral funktioniert, können sich alle einen öffentlichen Server aussuchen oder ihren eigenen erstellen und trotzdem mit allen Personen kommunizieren, nicht nur mit denen, die den eigenen Server nutzen. Die verschickten Nachrichten werden so nur auf den beteiligten Servern gespeichert. Auch die Anrufe laufen nur über die beteiligten Server.
Melde dich gerne auf meinem Server an oder suche dir einen aus den unten verlinkten Listen heraus. Ich freue mich auf deine Nachricht an
@samuel-p:matrix.sp-codes.de.
diff --git a/src/en/donate.html b/src/en/donate.html
index 903cd97..7f33544 100644
--- a/src/en/donate.html
+++ b/src/en/donate.html
@@ -26,8 +26,8 @@ eleventyNavigation:
If you want to transfer some money to me, just write me a short
message. I
will then send you my bank details as soon as possible. I am especially happy about a standing order.
-
+
@@ -36,8 +36,8 @@ eleventyNavigation:
If you want to send me some cash, feel free to send it to the address provided in the
imprint.
-
+
diff --git a/src/en/services.html b/src/en/services.html
index f8d2fe9..265ea08 100644
--- a/src/en/services.html
+++ b/src/en/services.html
@@ -1,5 +1,5 @@
---
-layout: services.njk
+layout: base.njk
key: services
title: Services
eleventyNavigation:
@@ -8,6 +8,7 @@ eleventyNavigation:
icon: i-server
order: 2
---
+
Status
Services
In my spare time, I provide various open source services that can be used for free and without advertising. Here you
will find an overview of the different services as well as descriptions and instructions on how to use them. All
@@ -23,3 +24,7 @@ eleventyNavigation:
+
+
+ {% include "services-extended.html" %}
+
diff --git a/src/en/services/connectivitycheck.md b/src/en/services/connectivitycheck.md
index 288a3a8..ae1daf5 100644
--- a/src/en/services/connectivitycheck.md
+++ b/src/en/services/connectivitycheck.md
@@ -1,75 +1,12 @@
---
-layout: base.njk
+layout: service.njk
key: connectivitycheck
title: Captive Portal Check
---
-#
Captive Portal Check
-
A captive portal is a login page in public WLAN networks to restrict Internet access to the approval of certain terms of use. When you see a login page on a public network, your device uses a captive portal check. This allows the device to find out whether you have direct Internet access or not. In Android, for example, your device sends a request to a Google server.
-Since mid 2019 I provide a free Captive Portal Check: [https://connectivitycheck.sp-codes.de/generate204](https://connectivitycheck.sp-codes.de/generate204) You are welcome to use it.
-
-## Setup in Android
-
-To change the Captive Portal Check in Android, you need a terminal app or a connection via ADB to a computer.
-
-To use `http` you can run the following commands with the respective method:
-
-```
-# settings put global captive_portal_use_https 0
-# settings put global captive_portal_http_url "http://connectivitycheck.sp-codes.de/generate204"
-```
-
-To use `https` you can use the following two commands:
-
-```
-# settings put global captive_portal_use_https 1
-# settings put global captive_portal_https_url "https://connectivitycheck.sp-codes.de/generate204"
-```
-
-Maybe you have to reboot your phone after updating the settings.
-
-If you are using AFWall+ you need to give access to _[1000] Android-System_ and in some cases _[10040] CaptivePortalLogin_ to make it work.
-
-## Setup in Ubuntu
-
-In Ubuntu, the file `/etc/NetworkManager/NetworkManager.conf` must be changed. Add or change the following lines:
-
-```
-[connectivity]
-uri=https://connectivitycheck.sp-codes.de/generate204
-```
-
-Restart the network-manager:
-
-```
-sudo service network-manager restart
-```
-
-## Setup in Fedora
-
-In Fedora, the file `/etc/NetworkManager/NetworkManager.conf` must be changed. Add or change the following lines:
-
-```
-[connectivity]
-uri=https://connectivitycheck.sp-codes.de/generate204
-```
-
-Restart the _NetworkManager_:
-
-```
-sudo service NetworkManager restart
-```
-
-## Setup in Firefox
-
-Type [about:config](about:config) in the Firefox address bar and search for `captivedetect.canonicalURL` and `network.connectivity-service`. Set the URL values to `https://connectivitycheck.sp-codes.de/generate204`, the domain values to `connectivitycheck.sp-codes.de`. That's it.
-
## More useful links
* [Captive Portal Wikipedia](https://en.wikipedia.org/wiki/Captive_portal)
* [Source code](https://git.sp-codes.de/samuel-p/connectivity-check)
* [Docker Image](https://hub.docker.com/r/samuelph/connectivity-check)
-* [Setup on Android](https://android.stackexchange.com/a/186995/288049)
-* [Setup on Ubuntu](https://askubuntu.com/q/1167177/920103)
-* [Captive Portal Kuketz Blog](https://www.kuketz-blog.de/android-captive-portal-check-204-http-antwort-von-captiveportal-kuketz-de/)
diff --git a/src/en/services/connectivitycheck/setup.md b/src/en/services/connectivitycheck/setup.md
new file mode 100644
index 0000000..a2ecec9
--- /dev/null
+++ b/src/en/services/connectivitycheck/setup.md
@@ -0,0 +1,74 @@
+---
+layout: article.njk
+title: Setup Captive Portal Check
+service: connectivitycheck
+tags:
+ - Tutorial
+ - Captive Portal Check
+---
+
+# Setup Captive Portal Check
+
+In this article, you will learn how to set up your own captive portal check on different devices.
+
+## Android
+
+To change the Captive Portal Check in Android, you need a terminal app or a connection via ADB to a computer.
+
+To use `http` you can run the following commands with the respective method:
+
+```
+# settings put global captive_portal_use_https 0
+# settings put global captive_portal_http_url "http://connectivitycheck.sp-codes.de/generate204"
+```
+
+To use `https` you can use the following two commands:
+
+```
+# settings put global captive_portal_use_https 1
+# settings put global captive_portal_https_url "https://connectivitycheck.sp-codes.de/generate204"
+```
+
+Maybe you have to reboot your phone after updating the settings.
+
+If you are using AFWall+ you need to give access to _[1000] Android-System_ and in some cases _[10040] CaptivePortalLogin_ to make it work.
+
+## Ubuntu
+
+In Ubuntu, the file `/etc/NetworkManager/NetworkManager.conf` must be changed. Add or change the following lines:
+
+```
+[connectivity]
+uri=https://connectivitycheck.sp-codes.de/generate204
+```
+
+Restart the network-manager:
+
+```
+sudo service network-manager restart
+```
+
+## Fedora
+
+In Fedora, the file `/etc/NetworkManager/NetworkManager.conf` must be changed. Add or change the following lines:
+
+```
+[connectivity]
+uri=https://connectivitycheck.sp-codes.de/generate204
+```
+
+Restart the _NetworkManager_:
+
+```
+sudo service NetworkManager restart
+```
+
+## Firefox
+
+Type [about:config](about:config) in the Firefox address bar and search for `captivedetect.canonicalURL` and `network.connectivity-service`. Set the URL values to `https://connectivitycheck.sp-codes.de/generate204`, the domain values to `connectivitycheck.sp-codes.de`. That's it.
+
+## Sources
+
+* [Setup on Android](https://android.stackexchange.com/a/186995/288049)
+* [Setup on Ubuntu](https://askubuntu.com/q/1167177/920103)
+* [Captive Portal Kuketz Blog](https://www.kuketz-blog.de/android-captive-portal-check-204-http-antwort-von-captiveportal-kuketz-de/)
diff --git a/src/en/services/etherpad.md b/src/en/services/etherpad.md
index 214694c..c7feda5 100644
--- a/src/en/services/etherpad.md
+++ b/src/en/services/etherpad.md
@@ -1,17 +1,13 @@
---
-layout: base.njk
+layout: service.njk
key: etherpad
title: Etherpad
---
-#
Etherpad
-
Etherpad is a web-based collaboration platform that allows users to edit text documents together in real time. Multiple users can simultaneously access the same Etherpad document, make changes, and see what others are writing. Etherpad provides a simple and effective way for teamwork, brainstorming, collaborative writing, and more, without version conflicts.
Etherpad is also embedded in Jitsi Meet. This allows for shared notes to be captured during a meeting.
-__I've been running Etherpad since the end of 2020: [https://pad.sp-codes.de](https://pad.sp-codes.de)__ Feel free to use Etherpad for your notes as well.
-
## More useful links
-* [Etherpad Webseite](https://etherpad.org)
-* [Quellcode von Etherpad](https://github.com/ether/etherpad-lite)
+* [Etherpad Website](https://etherpad.org)
+* [Quell code of Etherpad](https://github.com/ether/etherpad-lite)
diff --git a/src/en/services/forgejo.md b/src/en/services/forgejo.md
index 0d466cf..32aa677 100644
--- a/src/en/services/forgejo.md
+++ b/src/en/services/forgejo.md
@@ -1,19 +1,15 @@
---
-layout: base.njk
+layout: service.njk
key: forgejo
title: Forgejo
---
-#
Forgejo
-
-Forgejo is a simple code hosting platform like GitHub or GitLab. It is open source and under continuous development. __Since the end of 2019 I have my own Forgejo instance, to manage my projects.__ For example this website. Feel free to have a look at the source code and leave some feedback.
-
-In addition to Forgejo, I also run Woodpecker, a platform that extends Forgejo with many continuous integration features, such as automated builds and deploys.
+Forgejo is a simple code hosting platform like GitHub or GitLab. It is open source and under continuous development. I like to use Forgejo myself to manage my own projects. For example, this website. Take a look at the source code and leave me some feedback: [git.sp-codes.de/samuel-p/sp-codes.de](https://git.sp-codes.de/samuel-p/sp-codes.de)
Feel free to visit and sign up if you're interested in developing a project. The registration is open since March 2020.
-__To get to Forgejo click here: [git.sp-codes.de](https://git.sp-codes.de)__
+## Server details
-__If you want to check out Woodpecker, click here: [ci.sp-codes.de](https://ci.sp-codes.de)__
+In addition to Forgejo, I also run Forgejo Actions, an add-on that extends the platform with numerous continuous integration functions. This makes it possible to create and deploy builds automatically. Forgejo Actions also enables automated tests. This allows changes to be continuously monitored in real time and errors to be detected at an early stage.
## More useful links
diff --git a/src/en/services/jitsi.md b/src/en/services/jitsi.md
index 4adbdcd..e3f2510 100644
--- a/src/en/services/jitsi.md
+++ b/src/en/services/jitsi.md
@@ -1,26 +1,21 @@
---
-layout: base.njk
+layout: service.njk
key: jitsi
title: Jitsi Meet
---
-#
Jitsi Meet
-
Jitsi-Meet is a platform for video conferences. You can start fully encrypted video chats without registration. Additionally, Jitsi-Meet offers the possibility to share the screen with other participants, invite new users with a simple link and send messages in the integrated chat.
-__Since July 2020 I run my own Jitsi-Meet instance. You can find it at [jitsi.sp-codes.de](https://jitsi.sp-codes.de/).__
+Enjoy using the instance with other people. If things don't run smoothly here, try the Jitsi Random Redirect. This will redirect you to a random Jitsi instance: [jitsi.random-redirect.de](https://jitsi.random-redirect.de)
-You are welcome to use the instance with other people.
+## Server details
-If you want to have your own Jitsi server for you, your family or your company, I would be happy to support you with my company
Ossrox. Please have a look at our services on our website or send me a message.
+Jitsi does not only offer the usual functions of other video conferencing tools such as changing the camera background, noise suppression and reactions, but also some additional features.
-
-
- 
-
-
+With the Jitsi-Meet instance provided, meetings can be streamed live directly on platforms such as YouTube or PeerTube. It is also possible to record web meetings locally. External videos can also be viewed together during a conference. Thanks to the direct integration of Etherpad, shared notes can be created during meetings.
## More useful links
* [Jitsi Website](https://jitsi.org/)
* [Source code of Jitsi](https://github.com/jitsi/jitsi-meet)
* [List of public Instances](https://github.com/jitsi/jitsi-meet/wiki/Jitsi-Meet-Instances)
+* [Jitsi Random Redirect](https://jitsi.random-redirect.de/)
diff --git a/src/en/services/mastodon.md b/src/en/services/mastodon.md
index 4962330..e56763f 100644
--- a/src/en/services/mastodon.md
+++ b/src/en/services/mastodon.md
@@ -1,29 +1,17 @@
---
-layout: base.njk
+layout: service.njk
key: mastodon
title: Mastodon
---
-#
Mastodon
-
Mastodon is a federated microblogging service, similar to Twitter. However, the service is not based on a central platform, but consists of many, decentralized instances that are run independently by private individuals, associations or other organizations. This means that users are not locked into a single provider, but are free to decide with whom they share what information.
Since Mastodon is based on open web protocols and free, open source software, it is also possible to communicate with other services such as Pleroma, PeerTube, Pixelfed, Friendica or Hubzilla. Users can share text, image, video messages or polls across services and servers.
-__Since May 2021 I run a public Mastodon instance: [social.sp-codes.de](https://social.sp-codes.de/)__
+Feel free to register on my server or pick one from the lists linked below. I'm looking forward to your message to [@samuel_p@social.sp-codes.de](https://social.sp-codes.de/@samuel_p).
-Feel free to read the server rules and more information [here](https://social.sp-codes.de/about/more) (German). Feel free to register on my server or pick one from the lists linked below. I'm looking forward to your message to [@samuel_p@matrix.sp-codes.de](https://social.sp-codes.de/@samuel_p).
+## Server details
-
-
-If you want to have your own mastodon server for you, your family or your company, I would be happy to support you with my company
Ossrox. Please have a look at our services on our website or send me a message.
-
-
-
-
-
-
+Feel free to read the server rules and more information [here](https://social.sp-codes.de/about/more) (German). There you will also find an overview of all muted and blocked servers.
## Interesting Accounts
diff --git a/src/en/services/matrix.md b/src/en/services/matrix.md
index aac0d5c..a409c69 100644
--- a/src/en/services/matrix.md
+++ b/src/en/services/matrix.md
@@ -1,43 +1,23 @@
---
-layout: base.njk
+layout: service.njk
key: matrix
title: Matrix
---
-
[Matrix](https://matrix.org) is a modern, open source software for decentralized communication (like e-mail). Matrix offers end-to-end encryption, voice and video calls and much more. However, the most important thing is that there is not one Matrix server that all users have to use, like WhatsApp, Telegram and many other popular messengers.
Users can choose a public server or create their own and still communicate with all Matrix users, not just those on their own server. The messages are only stored on the participating servers. Calls also go only through the participating servers.
-__Since the beginning of 2020 I run a public Matrix server: [matrix.sp-codes.de](https://matrix.sp-codes.de/) And a public Element-Web instance: [chat.sp-codes.de](https://chat.sp-codes.de/)__
+Feel free to register on my server or choose one from the lists linked below. I look forward to your message to [@samuel-p:matrix.sp-codes.de](https://matrix.to/#/@samuel-p:matrix.sp-codes.de?via=matrix.sp-codes.de).
-You can read the server rules [here](https://matrix.sp-codes.de/_matrix/consent) (German). Feel free to create an account on my server or choose one from the lists linked below. I look forward to hear from you [@samuel-p:matrix.sp-codes.de](https://matrix.to/#/@samuel-p:matrix.sp-codes.de?via=matrix.sp-codes.de).
+## Server details
-
+You can read the server rules [here](https://matrix.sp-codes.de/_matrix/consent) (German).
-If you want to have your own matrix server for you, your family or your company, I would be happy to support you with my company
Ossrox. Please have a look at our services on our website or send me a message.
+**The limit for file uploads is 100 MB.** For larger files, please use a file sharing service.
-
-
-
-
-
+Old messages and files are automatically deleted in order to maintain the performance of the server and save disk space. **Messages are deleted after one year by default.** Depending on the app, you can also set a shorter period in the room settings. **Uploaded files are deleted from the server one year after the last access.**
-Here you will find an article series (German) for an easy start to Matrix:
-
-
+The Matrix server supports sliding sync, a beta feature of Matrix that significantly improves synchronization between client and server. Clients such as Element X already use this function.
## Why Matrix?
diff --git a/src/en/services/ntfy.md b/src/en/services/ntfy.md
index 4bb0362..d0fc007 100644
--- a/src/en/services/ntfy.md
+++ b/src/en/services/ntfy.md
@@ -1,17 +1,13 @@
---
-layout: base.njk
+layout: service.njk
key: ntfy
title: ntfy
---
-#
ntfy
-
ntfy is a versatile tool for notification about various events. It also supports UnifiedPush, an open protocol for real-time notifications.
To use ntfy as a central app for notifications, the app must first be installed on the phone. Then, apps that support UnifiedPush, such as Element, Fluffychat or Tusky can use ntfy as a push provider. This way, not all apps need to keep a connection open to the server and are more energy efficient as a result. In order for you to use my server, you must first set it up in the settings.
-__Since May 2023 I provide ntfy for free: [https://ntfy.sp-codes.de](https://ntfy.sp-codes.de)__ You are welcome to use ntfy as push provider for your apps if you like.
-
## More useful links
* [ntfy Website](https://ntfy.sh)
-* [Sourcecode of ntfy](https://github.com/binwiederhier/ntfy)
+* [Source code of ntfy](https://github.com/binwiederhier/ntfy)
diff --git a/src/en/services/peertube.md b/src/en/services/peertube.md
index 5467e8c..f816e34 100644
--- a/src/en/services/peertube.md
+++ b/src/en/services/peertube.md
@@ -1,21 +1,19 @@
---
-layout: base.njk
-key: mastodon
-title: Mastodon
+layout: service.njk
+key: peertube
+title: PeerTube
---
-#
PeerTube
-
PeerTube is a network of several federated, interoperable video hosting providers, comparable to YouTube. However, the service is not based on a central platform, but consists of many, decentralized instances that are run independently by private individuals, associations or other organizations. This means that users are not locked into a single provider, but are free to decide with whom they share what information.
Since PeerTube is based on open web protocols and free, open source software, it is also possible to communicate with other services such as Mastodon, Pleroma, Pixelfed, Friendica or Hubzilla. Users can share text, image, video messages or polls across services and servers.
-__Since August 2021 I run a public PeerTube instance: [tube.sp-codes.de](https://tube.sp-codes.de/)__
+Feel free to register on my server or pick one from the lists linked below.
-Feel free to read the server rules and more information [here](https://tube.sp-codes.de/about/instance) (German). Feel free to register on my server or pick one from the lists linked below.
+## Server details
-
+You can read the server rules and more information [here](https://tube.sp-codes.de/about/instance) (German).
+
+The PeerTube instance provided can also be used for live streams. Each account receives 20 GB of storage space and is limited to a daily upload limit of 2 GB. The first uploaded videos are activated manually to ensure compliance with the server rules.
## Interesting Channels
diff --git a/src/en/services/shields.md b/src/en/services/shields.md
index 090bcd0..35d36b3 100644
--- a/src/en/services/shields.md
+++ b/src/en/services/shields.md
@@ -1,15 +1,11 @@
---
-layout: base.njk
+layout: service.njk
key: shields
title: Shields
---
-#
Shields
-
Shields is a service for concise, consistent and legible badges in SVG and raster format. Via a URL they can be easily embedded in readmes or any other website. In addition, integrations to various services or networks are provided.
-__Since August 2020 I run a public Shields instance.__ Feel free to visit it and use the bagdes in your own projects. It is possible that not all integrations are activated.
-
-__Here is the link to Shields: [shields.sp-codes.de](https://shields.sp-codes.de)__
+Take a look and use the bagdes in your own projects. It is possible that not all integrations are activated. If you have any problems, feel free to contact me.
## More useful links