diff --git a/.drone.yml b/.drone.yml index 679b129..ef41d24 100644 --- a/.drone.yml +++ b/.drone.yml @@ -8,7 +8,7 @@ steps: event: - push - pull_request - image: denoland/deno:alpine-1.39.1 + image: denoland/deno:alpine-1.41.3 commands: - deno task build diff --git a/Dockerfile b/Dockerfile index 22f606c..99712a2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM denoland/deno:alpine-1.39.1 +FROM denoland/deno:alpine-1.41.3 WORKDIR /site COPY . . diff --git a/README.md b/README.md index b6e6039..6c2d9cd 100644 --- a/README.md +++ b/README.md @@ -41,6 +41,13 @@ As "documentation" `flake.nix` shows the internals, and `_includes/styles/typography.css` has a comment at the top that shows which command was used to generate it. +### Deployment + +Our [Drone CI](https://ci.pub.solar/pub-solar/pub.solar) is configured to +deploy the `main` branch to the production website. To integrate any changes, +first create a pull request, which will be reviewed. After merging it, the new +version will get deployed automatically. + ### Troubleshooting When running `deno task serve`, if you see an error message like: diff --git a/_config.ts b/_config.ts index f522af6..e51ac90 100644 --- a/_config.ts +++ b/_config.ts @@ -7,25 +7,56 @@ import postcss from "lume/plugins/postcss.ts"; const site = lume(); +const languages = [ + { + name: 'deutsch', + slug: 'de', + urlPrefix: 'de', + }, + { + name: 'english', + slug: 'en', + urlPrefix: '', + }, +]; +site.data('languages', languages); + +site.preprocess([ '.yml' ], (pages) => { + for (const page of pages) { + const urlParts = (page.data.url || '').replace(/^\/|\/$/g, '').split('/'); + const langPrefix = urlParts[0]; + const currentLang = (() => { + if (langPrefix.length === 2) { + return languages.find(lang => lang.urlPrefix === langPrefix); + } + + return languages.find(lang => lang.urlPrefix.length === 0); + })() || languages[0]; + + page.data.language = currentLang; + page.data.otherLang = languages.find(l => l.slug !== currentLang.slug); + page.data.baseURL = page.data.url.replace(new RegExp(`^\\/${currentLang.slug}`), ''); + } +}); + site.use(sass()); site.use(date()); site.use(jsx()); site.use(terser()); site.use(postcss()); -site.loadAssets([ - ".png", - ".jpg", - ".svg", - ".pdf", - ".woff2", - ".woff", - ".ttf", - ".otf", - ".js", - ".txt", -]); +site.loadAssets([ ".js" ]); -site.ignore("README.md", "CHANGELOG.md", "LICENSE.md", "docker-compose.yml"); +site.copy("assets"); +site.copy("fonts"); + +site.ignore( + ".direnv", + "README.md", + "CHANGELOG.md", + "LICENSE.md", + "docker-compose.yml", +); export default site; + diff --git a/_data/hakken.yml b/_data/hakken.yml index 08a967c..f12f4de 100644 --- a/_data/hakken.yml +++ b/_data/hakken.yml @@ -1,16 +1,6 @@ dates: - - name: Winter 2024 - theme: org-mode - location: - en: Berlin - de: Berlin - description: - en: | - This hakken will include our yearly general assembly. This is the perfect opportunity to get to know the internals of the organization, and to get involved! - de: | - Auf diesem hakken wird die Mitgliederversammlung stattfinden. Dies ist die perfekte Gelegenheit pub.solar n.e.V. als Organisation kennenzulernen und mitzumachen! - - name: Spring 2024 + id: spring-2024 theme: Push for privacy location: en: Cologne @ [MiOM space](https://miom.space) @@ -30,10 +20,11 @@ dates: Projekt-Ideen: * Löschen von alten Accounts automatisieren * eine Analyse unserer Datenspeicherung erstellen; was speichern wir und wo? Können wir das reduzieren? - * unsere Datenschutzerklärung auffrischen + * unser20e Datenschutzerklärung auffrischen * schauen ob wir eigene Hardware kriegen könnten - name: Summer 2024 + id: summer-2024 theme: Hot CPU Summer location: en: Cologne @ [MiOM space](https://miom.space) @@ -53,6 +44,7 @@ dates: * Einen open source Fahrradcomputer bauen - name: Autumn 2024 + id: autumn-2024 theme: Awesome hardware autumn location: en: Cologne @ [MiOM space](https://miom.space) @@ -79,8 +71,8 @@ strings: en: 'Where' de: 'Wo' comingDates: - en: 'The following dates are scheduled:' - de: 'Folgende Termine stehen an:' + en: 'Upcoming dates' + de: 'Kommende Termine' friday: en: 'friday' de: 'Freitag' diff --git a/_data/services.yml b/_data/services.yml new file mode 100644 index 0000000..c79eaaa --- /dev/null +++ b/_data/services.yml @@ -0,0 +1,366 @@ +services: + - name: Nextcloud + id: nextcloud + description: + en: Store your files, calendar, contacts and many other things in the pub.solar cloud. Access from all your devices. An alternative to Google Cloud, Apple's iCloud or Microsoft Office. + de: Sichere deine Dateien, Kalender, Kontakte und vieles mehr in der pub.solar Cloud. Mit Zugriff von all deinen Geräten. Eine Alternative zur Google Cloud, Apples iCloud oder Microsoft Office. + link: https://cloud.pub.solar + wiki: https://wiki.pub.solar/index.php/Nextcloud + support: + status: yes # yes partial no + backups: + status: untested # fully-automated untested not-applicable no + anonymousUsage: + status: no # yes partial no + zeroKnowledge: # yes partial no + status: no + comment: + en: | + By default, no data in Nextcloud is encrypted and everything is readable and changeable by pub.solar administrators. + + However, we have installed the [End-to-End Encryption app](https://apps.nextcloud.com/apps/end_to_end_encryption) which gives you the option to encrypt files before they are sent to the pub.solar cloud. + + This application has horrible reviews, with lots of people saying they suffered dataloss. Though we offer this option, **there will be no support or help** if you use this app and lose data. + de: | + Standardmäßig sind keine Daten in Nextcloud verschlüsselt und alles ist für pub.solar-Administratoren lesbar und veränderbar. + + Wir haben jedoch die [Ende-zu-Ende Verschlüsselungs-App] (https://apps.nextcloud.com/apps/end_to_end_encryption) installiert, die dir die Möglichkeit gibt Dateien zu verschlüsseln, bevor sie an die pub.solar-Cloud gesendet werden. + + Diese Anwendung hat schreckliche Rezensionen, in denen viele Personen angeben Daten verloren zu haben. Obwohl wir diese Option anbieten, **wird es keine Unterstützung oder Hilfe unsererseits geben**, falls du diese App verwendest und Daten verloren gehen. + storageEncrypted: # yes no + status: yes + loggingMinimized: # yes partial no + status: no + decentralized: # yes partial no + status: yes + + - name: Mastodon + id: mastodon + description: + en: Social networking and microblogging. A decentralized alternative to X (Twitter). + de: Soziales Netzwerken und Microblogging. Eine dezentrale Alternative zu X (Twitter). + link: https://mastodon.pub.solar + support: + status: yes # yes partial no + backups: + status: untested # fully-automated untested not-applicable no + anonymousUsage: + status: partial # yes partial no + comment: + en: You can use our [web interface](https://mastodon.pub.solar) to read posts, but if you want to post stuff yourself you will need a pub.solar ID. + de: Du kannst unser [Web Interface](https://mastodon.pub.solar) benutzen, um Beiträge zu lesen, aber wenn du selber einen Beitrag verfassen möchtest, benötigst du eine pub.solar ID. + zeroKnowledge: # yes partial no + status: no + storageEncrypted: # yes no + status: yes + loggingMinimized: # yes partial no + status: no + decentralized: # yes partial no + status: yes + + - name: Matrix + id: matrix + description: + en: Matrix is a decentralized, encrypted chat service. It can be used as an alternative to tools like Discord, Slack, or IRC. In fact, Matrix can bridge into these other chat tools, allowing you to chat with everyone from one place. + de: Matrix ist ein dezentraler, verschlüsselter Chat Service. Es kann als Alternative zu Programmen wie Discord, Slack oder IRC benutzt werden. Matrix kann auch als Brücke zu diesen anderen Chat Programmen verwendet werden, was es dir erlaubt mit allen von einem Ort aus zu chatten. + link: https://chat.pub.solar + support: + status: yes # yes partial no + backups: + status: untested # fully-automated untested not-applicable no + anonymousUsage: + status: no # yes partial no + zeroKnowledge: # yes partial no + status: partial + comment: + en: | + By default pub.solar admins cannot read your messages, but there is metadata that is accessible: + + * Who you are talking to + * When you are talking to them + * When you are online or offline + + Also, some larger public rooms are unencrypted, and you have the option to turn off encryption on rooms you control. + de: | + Generell können pub.solar Administratoren eure Nachrichten nicht lesen, aber folgende Metadaten sind einsehbar: + + * Mit wem du sprichst + * Wann du mit ihnen sprichst + * Wann du online oder offline bist + + Manche größere öffentliche Räume sind unverschlüsselt und du hast die Option die Verschlüsselung für Räume auszuschalten, die du kontrollierst. + storageEncrypted: # yes no + status: yes + loggingMinimized: # yes partial no + status: no + decentralized: # yes partial no + status: yes + + - name: Forgejo / git + id: forgejo + description: + en: git server + de: Git Server + link: https://git.pub.solar + support: + status: yes # yes partial no + backups: + status: untested # fully-automated untested nnot-applicable no + anonymousUsage: + status: no # yes partial no + zeroKnowledge: # yes partial no + status: no + storageEncrypted: # yes no + status: yes + loggingMinimized: # yes partial no + status: no + decentralized: # yes partial no + status: no + + - name: Wiki + id: wiki + description: + en: Our wiki + de: Unser Wiki + link: https://wiki.pub.solar + support: + status: partial # yes partial no + backups: + status: untested # fully-automated untested not-applicable no + comment: + en: The database is backed up regularly, but not assets like images. + de: Für die Datenbank gibt es ein regelmäßiges Back-up, aber nicht für Bestandteile wie Bilder. + anonymousUsage: + status: partial # yes partial no + zeroKnowledge: # yes partial no + status: no + storageEncrypted: # yes no + status: yes + loggingMinimized: # yes partial no + status: no + decentralized: # yes partial no + status: no + + - name: Mailman + id: mailman + description: + en: Mailing lists + de: Mailinglisten + link: https://list.pub.solar + support: + status: partial # yes partial no + backups: + status: untested # fully-automated untested not-applicable no + anonymousUsage: + status: no # yes partial no + zeroKnowledge: # yes partial no + status: no + storageEncrypted: # yes no + status: yes + loggingMinimized: # yes partial no + status: no + decentralized: # yes partial no + status: no + + - name: OpenBikeSensor portal + id: obs-portal + description: + en: Portal for the OpenBikeSensor project. This portal currently only hosts the Cologne/Bonn region. + de: Portal für das OpenBikeSensor Projekt. Dieses Portal deckt zurzeit nur die Region Köln/Bonn ab. + link: https://obs-portal.pub.solar + support: + status: partial # yes partial no + backups: + status: untested # fully-automated untested not-applicable no + anonymousUsage: + status: no # yes partial no + zeroKnowledge: # yes partial no + status: no + storageEncrypted: # yes no + status: yes + loggingMinimized: # yes partial no + status: no + decentralized: # yes partial no + status: no + + - name: Searx + id: searx + description: + en: Search engine + de: Suchmaschine + link: https://search.pub.solar + support: + status: no # yes partial no + backups: + status: not-applicable # fully-automated untested not-applicable no + anonymousUsage: + status: yes # yes partial no + zeroKnowledge: # yes partial no + status: yes + storageEncrypted: # yes no + status: yes + loggingMinimized: # yes partial no + status: no + decentralized: # yes partial no + status: not-applicable + +strings: + visit_service: + en: 'Visit service' + de: 'Zum Dienst' + wiki_help_page: + en: Wiki help page + de: Wikiseite + states: + yes: + en: Yes + de: Ja + partial: + en: Partial + de: Teilweise + no: + en: No + de: Nein + not-applicable: + en: Not applicable + de: Nicht zutreffend + fully-automated: + en: Fully automated + de: Komplett automatisiert + untested: + en: Yes, untested + de: Ja, nicht getestet + support: + name: + en: Support + de: Hilfe + description: + en: This badge describes how much love and support this service gets from the pub.solar community. Services with a higher level of support are less likely to suffer from outages or dataloss. + de: Dieses Schild beschreibt, wie viel Liebe und Unterstützung dieser Service von der pub.solar Gemeinschaft erhält. Services mit einem höheren Maß an Unterstützung sind weniger anfällig für Ausfälle oder Verlust von Daten. + states: + yes: + en: We consider this service to be part of our core. It is among our highest priority services to keep it online, up-to-date, and backed-up. This service will not be shut down without at least 3 months of prior notice. + de: Wir betrachten diesen Service als wesentlichen Teil unserer Infrastruktur. Er gehört zu den Services mit der höchsten Priorität, die wir online, aktuell und gesichert halten. Dieser Service wird nicht ohne eine Vorankündigung von mindestens 3 Monaten abgeschaltet. + partial: + en: We have been running this service for a while, and it is probably going to be around to stay. However, it is not our highest priority. We could shut this service down with only a couple of days of prior notice. + de: Wir betreiben diesen Service schon seit einiger Zeit und er wird wahrscheinlich auch in Zukunft bestehen bleiben. Er hat jedoch nicht unsere höchste Priorität. Wir könnten diesen Service mit einer Vorankündigung von nur wenigen Tagen abschalten. + no: + en: This service started because someone thought it was fun to try out, as a test, or is very new. Expect changes, downtime, or even shutdown to happen at any time. + de: Dieser Service läuft weil jemand Spaß daran hatte, ihn auszuprobieren, als Test, oder er ist sehr neu. Rechne damit, dass es jederzeit zu Änderungen, Ausfallzeiten oder sogar zur Abschaltung kommen kann. + backups: + name: + en: Backups + de: Backups + description: + en: This badge shows whether the data in the service is automatically backed up every day. + de: Dieses Schild zeigt an, ob die Daten des Services täglich automatisch gesichert werden. + states: + yes: + en: Daily, encrypted backups are made automatically and are tested so we can also automatically restore the service. + de: Tägliche, verschlüsselte Backups werden automatisch erstellt und getestet, so dass wir den Service auch automatisch wiederherstellen können. + untested: + en: We run daily encrypted backups to an offsite location, but we do not have automated tests to see if recovery works. In a catastrophic event, recovery might take a long time. + de: Wir führen täglich verschlüsselte Sicherungen zu einem externen Standort durch, aber wir haben keine automatischen Tests, um festzustellen, ob die Wiederherstellung funktioniert. Im Katastrophenfall kann die Wiederherstellung sehr lange dauern. + not-applicable: + en: This service does not store any data to be backed up. + de: Bei diesem Service werden keine Daten gespeichert die gesichert werden müssen. + no: + en: Data from this service is not backed up. Expect dataloss any time. + de: Die Daten dieses Services werden nicht gesichert. Rechne jederzeit mit Datenverlusten. + anonymousUsage: + name: + en: Anonymous usage + de: Anonyme Benutzung + description: + en: This badge shows whether you can use the service without registering a pub.solar ID. + de: Dieses Schild zeigt an ob du den Service nutzen kannst ohne eine pub.solar ID zu registrieren. + states: + yes: + en: You can use all features of this service without logging in with a pub.solar ID. + de: Du kannst alle Funktionen dieses Services nutzen, ohne dich mit einer pub.solar ID anzumelden. + partial: + en: Some features of this service require you to log in with a pub.solar ID. + de: Für einige Funktionen dieses Services musst du dich mit einer pub.solar ID anmelden. + no: + en: You have to log in with a pub.solar ID to use this service. + de: Um diesen Service zu nutzen, musst du dich mit einer pub.solar ID anmelden. + zeroKnowledge: + name: + en: Zero knowledge + de: Zero knowledge + description: + en: This badge tells you how much access the pub.solar administrators have to your data in that service. + de: Dieses Schild zeigt dir, wie viel Zugriff die pub.solar Administratoren auf deine Daten in diesem Service haben. + states: + yes: + en: pub.solar administrators have no access to your data in this service. + de: Die Administratoren von pub.solar haben keinen Zugriff auf deine Daten in diesem Service. + partial: + en: Some of the data of this service is unreadable to pub.solar administrators, but not all. + de: Einige der Daten dieses Services sind für pub.solar Administratoren nicht einsehbar, aber nicht alle. + no: + en: All your data in this service is readable by pub.solar administrators. + de: Alle deine Daten in diesem Service sind für die Administratoren von pub.solar lesbar. + storageEncrypted: + name: + en: Storage encrypted + de: Verschlüsselter Speicher + description: + en: | + This badge tells you whether the service data is stored on encrypted drives. This protects against unwanted physical access to the servers, since only the pub.solar administrators can unlock the hard drive encryption. + + ***Caveat***: Man-in-the-middle attacks that intercept the password in-transit when pub.solar administrators remotely unlock the disk can circumvent this. Do not rely on storage encryption to keep your data safe from highly-capable attackers like nation-states. Focus on the zero-knowledge badge if this is your threat-model. + de: | + Dieses Schild zeigt an, ob die Daten des Services auf verschlüsselten Laufwerken gespeichert sind. Dies schützt vor unerwünschtem physischen Zugriff auf die Server, da nur die pub.solar Administratoren die Festplatten entschlüsseln können. + + ***Vorbehalt***: Man-in-the-middle Angriffe, die das Passwort beim Entsperren der Festplatte durch einen pub.solar Administrator aus der Ferne abfangen, könnten dies umgehen. Verlasse dich nicht auf die Speicherverschlüsselung, um Daten vor sehr gut ausgestatteten Angreifern wie Staaten zu schützen. Beachte bitte das Zero Knowledge Schild, wenn das dein Bedrohungsmodell ist. + states: + yes: + en: This service runs on a server with encrypted hard drives. + de: Dieser Service läuft auf einem Server mit verschlüsselten Festplatten. + no: + en: This service **does not** run on a server with encrypted hard drives. + de: Dieser Service läuft **nicht** auf einem Server mit verschlüsselten Festplatten. + loggingMinimized: + name: + en: Logging minimized + de: Minimiertes Logging + description: + en: This badge tells you whether we have configured the service and any related software so it logs as little data as possible. + de: Dieses Schild zeigt dir, ob wir den Service und die zugehörige Software so konfiguriert haben, dass so wenig Log-Dateien wie möglich aufgezeichnet werden. + states: + yes: + en: No logs are written at all. + de: Es werden keinerlei Logs erstellt. + partial: + en: We have reduced the amount of logging, but there is still some amount of activity logging going on. + de: Wir haben den Umfang des Logging reduziert, aber es wird immer noch ein gewisses Maß an Aktivitäten protokolliert. + no: + en: This service runs in its default logging configuration. + de: Dieser Service wird in seiner Standardkonfiguration für das Logging ausgeführt. + decentralized: + name: + en: Decentralized + de: Dezentralisiert + description: + en: | + This badge shows whether this service can interact and federate with services of similar types hosted by other people or organizations. + + For example, you can send an email from your own provider to someone who has their address with some other provider. With facebook messages you cannot do this; all facebook messages have to go to other facebook users. + de: | + Dieses Schild zeigt an ob dieser Service mit Services ähnlicher Art, die von anderen Personen oder Organisationen betrieben werden, interagieren und föderieren kann. + + Du kannst zum Beispiel eine E-Mail von deinem eigenen Anbieter an jemanden senden der seine E-Mail Adresse bei einem anderen Anbieter hat. Bei Facebook-Nachrichten ist dies nicht möglich; alle Facebook-Nachrichten können nur an andere Facebook-Nutzer gesendet werden. + states: + yes: + en: All relevant communication features of this service can interact and federate with other instances of similar services. + de: Alle relevanten Funktionen dieses Services können mit anderen Instanzen interagieren und föderieren. + partial: + en: Some features of this service can interact with other instances. + de: Einige Funktionen dieses Services können mit anderen Instanzen interagieren und föderieren. + not-applicable: + en: This service has no features that could be decentralized. + de: Dieser Service hat keine Funktionen, die dezentralisiert werden können. + no: + en: This service is centralized. + de: Dieser Service ist zentralisiert. diff --git a/_includes/HakkenDates.tsx b/_includes/HakkenDates.tsx index 8d6c85a..fb38d2a 100644 --- a/_includes/HakkenDates.tsx +++ b/_includes/HakkenDates.tsx @@ -43,16 +43,16 @@ const getStartAndEnd = (date) => { } }; -export default ({ data, lang, className }) => { +export default ({ data, language, className = '', }) => { const strings = data.strings; const dates = data.dates; - const t = (o) => o?.[lang] || ''; + const t = (o) => o?.[language.slug] || ''; - return
-

{t(strings.comingDates)}

+

{t(strings.comingDates)}

-
; + ; }; diff --git a/_includes/Head.tsx b/_includes/Head.tsx index eda82d2..0ba2b88 100644 --- a/_includes/Head.tsx +++ b/_includes/Head.tsx @@ -3,11 +3,14 @@ import { title as titleFilter } from '../filters.ts'; export default ({ title, theme, + baseURL, + otherLang, extraStylesheets, extraScripts, cacheBust, }) => + { titleFilter(title) } @@ -17,6 +20,8 @@ export default ({ + + <> diff --git a/_includes/Langlink.tsx b/_includes/Langlink.tsx new file mode 100644 index 0000000..0918808 --- /dev/null +++ b/_includes/Langlink.tsx @@ -0,0 +1,4 @@ +export default ({ otherLang, baseURL }) => {otherLang.slug} diff --git a/_includes/Services.tsx b/_includes/Services.tsx new file mode 100644 index 0000000..cd4d766 --- /dev/null +++ b/_includes/Services.tsx @@ -0,0 +1,54 @@ +import { md, mdi } from '../filters.ts'; + +const badges = [ + "support", + "backups", + "anonymousUsage", + "zeroKnowledge",, + "loggingMinimized", + "decentralized", + "storageEncrypted", +] as string[]; + +export default ({ data, language, className = '', }) => { + const { services, strings } = data; + return <> + {services.map((service, i) => { + return
+
+

{service.name}

+ +
+ { strings.visit_service[language.slug] } + {service.wiki ? { strings.wiki_help_page[language.slug] } : null} +
+
+ +
+ +
+ {badges.map((badge, i) => { + const { status, comment } = service[badge]; + + return
+ +
{strings[badge].name[language.slug]}
+
{strings.states[status][language.slug]}
+ + +

+ +

+ + {comment ?

: null } +
; + })} +
+ +
; + })} + ; +}; diff --git a/_includes/layouts/default.tsx b/_includes/layouts/default.tsx index f4b8132..bf79fc9 100644 --- a/_includes/layouts/default.tsx +++ b/_includes/layouts/default.tsx @@ -2,12 +2,17 @@ import { md } from '../../filters.ts'; import Head from '../Head.tsx'; import Background from '../Background.tsx'; import Homelink from '../Homelink.tsx'; +import Langlink from '../Langlink.tsx'; import HakkenDates from '../HakkenDates.tsx'; +import Services from '../Services.tsx'; export default ({ title, content, + language, + otherLang, + baseURL, theme, extraStylesheets, extraScripts, @@ -15,11 +20,16 @@ export default ({ showHakkenDates, hakken, + + showServices, + services, }) => <> - + + +
-
- - Deutsche übersetzung unten - ▼ - +
+
+ {showServices ? : null} + {showHakkenDates ? : null} +
-
- - {showHakkenDates ? : null} -
- -
- - English translation above - ▲ - - -
- - {showHakkenDates ? : null} -
diff --git a/_includes/layouts/error.tsx b/_includes/layouts/error.tsx index f97df30..85fffed 100644 --- a/_includes/layouts/error.tsx +++ b/_includes/layouts/error.tsx @@ -7,15 +7,20 @@ export default ({ content, code, + language, + otherLang, + baseURL, theme, extraStylesheets, extraScripts, cacheBust, }) => <> - + <> - + + + +
- {links.map(({ href, title, openInNewTab }) => - {title} - )} +
+ +
+ {links.map(({ href, title, openInNewTab }) => + {title} + )} +
diff --git a/_includes/layouts/services.tsx b/_includes/layouts/services.tsx new file mode 100644 index 0000000..2ca9b6c --- /dev/null +++ b/_includes/layouts/services.tsx @@ -0,0 +1,48 @@ +import { md } from '../../filters.ts'; +import Head from '../Head.tsx'; +import Background from '../Background.tsx'; +import Homelink from '../Homelink.tsx'; +import HakkenDates from '../HakkenDates.tsx'; + +export default ({ + title, + content, + + language, + otherLang, + baseURL, + theme, + extraStylesheets, + extraScripts, + cacheBust, + + showHakkenDates, + hakken, +}) => <> + + + + + + + + +
+
+ + {showHakkenDates ? : null} +
+ + +; diff --git a/_includes/styles/hakken-dates.scss b/_includes/styles/hakken-dates.scss index faf91be..a37db8a 100644 --- a/_includes/styles/hakken-dates.scss +++ b/_includes/styles/hakken-dates.scss @@ -1,14 +1,25 @@ .ps-hakken-dates { - margin: 5vw; - margin-top: 0; - &--list { list-style: none; padding: 0; } + &--title { + display: flex; + align-items: center; + justify-content: space-between; + + &:target { + border-bottom: 4px solid var(--foreground); + } + } + + &--permalink { + min-height: 2rem; + } + &--item { - border-left: 3px solid var(--accent); + border-left: 0.25rem solid var(--accent); padding-left: 1rem; } diff --git a/_includes/styles/homelink.scss b/_includes/styles/homelink.scss index cd6a1c9..71b6635 100644 --- a/_includes/styles/homelink.scss +++ b/_includes/styles/homelink.scss @@ -10,21 +10,29 @@ text-decoration: none; text-align: center; font-weight: 900; - font-size: 24px; - padding: 8px; + font-size: 1.5rem; + padding: 0.5rem; line-height: 1em; - text-shadow: 0.15vw 0px 0px white; + text-shadow: 0.1em 0px 0px white; transition: text-shadow 0.1s ease; - border: 12px solid black; + border: 1rem solid black; border-top: 0; border-left: 0; &:hover { - text-shadow: 0.3vw 0px 0px var(--accent); + text-shadow: 0.1em 0px 0px var(--accent); } @media screen and (min-width: 1200px) { - font-size: 32px; - padding: 12px; + font-size: 2rem; + padding: 1rem; + } + + &_lang { + left: unset; + right: 0; + border: 1rem solid black; + border-top: 0; + border-right: 0; } } diff --git a/_includes/styles/main.scss b/_includes/styles/main.scss index e0f1ba2..7199ba0 100644 --- a/_includes/styles/main.scss +++ b/_includes/styles/main.scss @@ -6,8 +6,6 @@ height: 100vh; width: 100vw; margin: 0; - padding-top: 10vw; - padding-bottom: 2vw; overflow: auto; position: relative; diff --git a/_includes/styles/page.scss b/_includes/styles/page.scss index 453ec18..5716da6 100644 --- a/_includes/styles/page.scss +++ b/_includes/styles/page.scss @@ -2,30 +2,37 @@ display: flex; width: 100vw; flex-direction: column; - align-items: center; + align-items: flex-start; justify-content: flex-start; - padding: 0; + padding: 1rem; pointer-events: none; @media screen and (min-width: 1200px) { - padding: 1vw; - flex-direction: row; - align-items: flex-start; - } - - &_home { + padding: 2rem; flex-direction: row; flex-wrap: wrap; } - &--section { + @media screen and (min-width: 1600px) { + padding: 4rem; + } + + &_home { + flex-direction: column; + flex-wrap: nowrap; + } + + &_home &--contents { + font-size: 1.25rem; + } + + &--contents { border: 12px solid black; - margin-top: 10vh; - margin-bottom: 10vh; + margin-top: 20rem; + margin-bottom: 20rem; width: 100%; - max-width: 700px; + max-width: 800px; flex-basis: 100%; - font-size: 16px; flex-shrink: 1; pointer-events: all; color: var(--foreground); @@ -33,13 +40,13 @@ word-break: break-word; display: flex; flex-direction: column; + margin: 0; + font-weight: 500; + line-height: 1.75; + padding: 1.5rem; @media screen and (min-width: 1200px) { - margin: 1vw; - } - - &_home { - padding: 5vw; + padding: 3rem; } a { @@ -57,38 +64,6 @@ width: 230px; margin-top: 1rem; } - } - - &--section-link { - position: sticky; - top: 0; - background-color: var(--background); - padding: 1rem; - display: flex; - justify-content: flex-end; - align-items: center; - text-align: right; - padding-left: 132px; - - @media screen and (min-width: 1200px) { - display: none; - border-bottom: 0; - } - - &-icon { - margin-left: 8px; - } - } - - &--section-contents { - margin: 5vw; - margin-bottom: 0; - font-weight: 500; - line-height: 1.4; - - &:last-child { - margin-bottom: 5vw; - } pre, code { @@ -108,15 +83,30 @@ > * { margin-bottom: 0; - margin-top: 8px; + margin-top: 1.5rem; } - > h1, h2 { - margin-top: 32px; + > h1, + > h2 { line-height: 1.5; } } + &--links { + margin-top: 1rem; + display: flex; + flex-direction: row; + flex-wrap: wrap; + + @media screen and (min-width: 700px) { + margin-top: 1.5rem; + } + + @media screen and (min-width: 1000px) { + margin-top: 2rem; + } + } + &--link { pointer-events: all; color: var(--foreground); @@ -124,24 +114,30 @@ text-decoration: none; text-align: center; font-weight: 900; - font-size: 12rem; + font-size: 2rem; line-height: 1em; - padding: 0.2vw; - margin: 2vw; - text-shadow: 0.15vw 0px 0px white; + padding: 0.4rem; + margin: 0; + margin-right: 1rem; + margin-bottom: 1rem; + text-shadow: 0.01em 0px 0px white; transition: text-shadow 0.1s ease; - border: 12px solid black; + border: 0.75rem solid black; &:hover { - text-shadow: 0.3vw 0px 0px var(--accent); + text-shadow: 0.1em 0px 0px var(--accent); } @media screen and (min-width: 700px) { - font-size: 8rem; + font-size: 3rem; + margin-right: 1.5rem; + margin-bottom: 1.5rem; } @media screen and (min-width: 1000px) { font-size: 4rem; + margin-right: 2rem; + margin-bottom: 2rem; } } } diff --git a/_includes/styles/service.scss b/_includes/styles/service.scss new file mode 100644 index 0000000..928ae8c --- /dev/null +++ b/_includes/styles/service.scss @@ -0,0 +1,116 @@ +.ps-service { + margin-top: 2rem; + margin-right: 1rem; + + &--header { + margin: 0; + display: flex; + justify-content: space-between; + align-items: center; + border-bottom: 0.25rem solid black; + }; + + &--title { + margin: 0; + } + + &--links { + display: flex; + justify-content: flex-end; + flex-wrap: wrap; + flex-basis: 8rem; + flex-grow: 1; + max-width: 16rem; + + > * { + margin-left: 2rem; + } + } + + &--description { + margin: 0; + + > * { + margin: 0; + margin-top: 1rem; + } + } + + &--badges { + display: flex; + flex-direction: column; + align-items: flex-start; + margin-top: 1rem; + + @media screen and (min-width: 700px) { + display: grid; + grid-template-columns: 1fr 1fr; + grid-gap: 0.5rem 1rem; + } + } + + &--badge { + display: flex; + justify-content: space-between; + border-left: 0.25rem solid var(--accent); + padding-left: 1rem; + + @media screen and (min-width: 700px) { + flex-basis: 50%; + } + + &_yes, + &_fully-automated { + border-left-color: #009d11; + } + + &_partial, + &_untested { + border-left-color: #ff8f00; + } + + &_not-applicable { + border-left-color: #555; + } + + &_no { + border-left-color: var(--accent); + } + } + + &--badge-header { + display: flex; + justify-content: space-between; + cursor: pointer; + } + + &--badge-title { + font-weight: bold; + } + + &--badge-status { + display: inline-flex; + } + + $b: &; + + &--badge { + &_yes #{$b}--badge-status, + &_fully-automated #{$b}--badge-status { + color: #007d0e; + } + + &_partial #{$b}--badge-status, + &_untested #{$b}--badge-status { + color: #ac6100; + } + + &_not-applicable #{$b}--badge-status { + color: #555; + } + + &_no #{$b}--badge-status { + color: var(--accent); + } + } +} diff --git a/_includes/styles/style.scss b/_includes/styles/style.scss index 10627db..b2c423a 100644 --- a/_includes/styles/style.scss +++ b/_includes/styles/style.scss @@ -1,5 +1,10 @@ * { box-sizing: border-box; + scroll-margin-top: 4rem; + + @media screen and (min-width: 1200px) { + scroll-margin-top: 6rem; + } } html { @@ -20,7 +25,22 @@ html { width: 100vw; height: 100vh; margin: 0; - font-size: 1vw; +} + +h1 { + font-size: 2.25rem; +} + +h2 { + font-size: 1.5rem; +} + +h3 { + font-size: 1.25rem; +} + +h4 { + font-size: 1rem; } @import './main'; @@ -31,4 +51,5 @@ html { @import './homelink'; @import './copy-code-button.scss'; @import './hakken-dates.scss'; +@import './service.scss'; diff --git a/about.yml b/about.yml index 1a90a79..7db55a2 100644 --- a/about.yml +++ b/about.yml @@ -2,176 +2,91 @@ layout: layouts/default.tsx title: About & Imprint -content: - en: | - # Hi! We're pub.solar +content: | + # Hi! We're pub.solar - We are a non-registered association seated in Cologne, Germany. Our goal is to enable more people to use free software, have secure digital communications, and to take control over their private data. + We are a non-registered association seated in Cologne, Germany. Our goal is to enable more people to use free software, have secure digital communications, and to take control over their private data. - We host free software for you and all the people you love. We do this transparently and democratically. + We host free software for you and all the people you love. We do this transparently and democratically. - We currently offer these services: + We currently offer these services: - * [Matrix](https://chat.pub.solar): a decentralized, end-to-end encrypted chat, similar to Slack or Discord, - * [Mastodon](https://mastodon.pub.solar): a decentralized microblogging platform, similar to Twitter, - * [Nextcloud](https://cloud.pub.solar): a cloud with office capabilities, similar to the Google Suite and Microsoft Office 365, - * [Forgejo](https://git.pub.solar/): a git server, comparable to GitHub or Gitlab, + * [Matrix](https://chat.pub.solar): a decentralized, end-to-end encrypted chat, similar to Slack or Discord, + * [Mastodon](https://mastodon.pub.solar): a decentralized microblogging platform, similar to Twitter, + * [Nextcloud](https://cloud.pub.solar): a cloud with office capabilities, similar to the Google Suite and Microsoft Office 365, + * [Forgejo](https://git.pub.solar/): a git server, comparable to GitHub or Gitlab, - Additionally, the following services which might change or dissappear any time. + Additionally, the following services which might change or dissappear any time. - * [Searx](https://search.pub.solar/): a metasearch engine, similar to Google or Bing, - * [Mailman](https://lists.pub.solar/): a software for mailing lists, - * [OBS Portal](https://obs-portal.pub.solar/): a server for saving [OpenBikeSensor](https://www.openbikesensor.org/) data which is currently limited to the Cologne/Bonn region, + * [Searx](https://search.pub.solar/): a metasearch engine, similar to Google or Bing, + * [Mailman](https://lists.pub.solar/): a software for mailing lists, + * [OBS Portal](https://obs-portal.pub.solar/): a server for saving [OpenBikeSensor](https://www.openbikesensor.org/) data which is currently limited to the Cologne/Bonn region, - For some of these Services, you'll need to register an account, which we call a [pub.solar ID](https://auth.pub.solar). All services are publicly open for registration. Nextcloud accounts are severely limited in their storage amount. If you want more storage, please contact the crew. + For some of these Services, you'll need to register an account, which we call a [pub.solar ID](https://auth.pub.solar). All services are publicly open for registration. Nextcloud accounts are severely limited in their storage amount. If you want more storage, please contact the crew. - ## Contact and getting help + ## Contact and getting help - You can reach us via [#General in Matrix](https://matrix.to/#/#general:pub.solar?via=chat.pub.solar) and [@crew on Mastodon](https://mastodon.pub.solar/@crew), or send a mail to [crew@pub.solar](mailto:crew@pub.solar). + You can reach us via [#General in Matrix](https://matrix.to/#/#general:pub.solar?via=chat.pub.solar) and [@crew on Mastodon](https://mastodon.pub.solar/@crew), or send a mail to [crew@pub.solar](mailto:crew@pub.solar). - You can find our PGP key [here](https://keys.openpgp.org/vks/v1/by-fingerprint/8A8987ADE3736C8CA2EB315A9B809EBBDD62BAE3). It has the following fingerprint: + You can find our PGP key [here](https://keys.openpgp.org/vks/v1/by-fingerprint/8A8987ADE3736C8CA2EB315A9B809EBBDD62BAE3). It has the following fingerprint: - ``` - 8A89 87AD E373 6C8C A2EB 315A 9B80 9EBB DD62 BAE3 - ``` + ``` + 8A89 87AD E373 6C8C A2EB 315A 9B80 9EBB DD62 BAE3 + ``` - Check out our [wiki](https://wiki.pub.solar) or contact us via one of the methods above. In the Matrix [#General room](https://matrix.to/#/#general:pub.solar?via=chat.pub.solar) there's always someone around for answering your questions. + Check out our [wiki](https://wiki.pub.solar) or contact us via one of the methods above. In the Matrix [#General room](https://matrix.to/#/#general:pub.solar?via=chat.pub.solar) there's always someone around for answering your questions. - ## Being a member or helping hand + ## Being a member or helping hand - Are you interested in becoming a member of the pub.solar organisation? Do you want to support the organisation with labour, money, or just your name? + Are you interested in becoming a member of the pub.solar organisation? Do you want to support the organisation with labour, money, or just your name? - We are currently a non-registered association (n.e.V.), which means that from a legal perspective we are a group of individuals, _not_ members of a registered association. Our goal is to become a registered association (e.V.) and expand our work where we can. + We are currently a non-registered association (n.e.V.), which means that from a legal perspective we are a group of individuals, _not_ members of a registered association. Our goal is to become a registered association (e.V.) and expand our work where we can. - We are always looking for help and support. Being a member is currently not tied to any costs or privileges, but is rather an indicator of support. We encourage you to become a member even if (or, especially if) you are not very technically versed. Our goal is for pub.solar to be an organisation that helps _everyone_, especially people that would by themselves not be able to administrate IT infrastructure. We want you to have a voice in the decisions surrounding your services. We want the community to decide together what an IT infrastructure built with solidarity, freedom, privacy, and mutual support in mind would look like. + We are always looking for help and support. Being a member is currently not tied to any costs or privileges, but is rather an indicator of support. We encourage you to become a member even if (or, especially if) you are not very technically versed. Our goal is for pub.solar to be an organisation that helps _everyone_, especially people that would by themselves not be able to administrate IT infrastructure. We want you to have a voice in the decisions surrounding your services. We want the community to decide together what an IT infrastructure built with solidarity, freedom, privacy, and mutual support in mind would look like. - Feel like joining in? Know what to do? Don't know what to do? Just send the crew a message. We're looking forward to hearing from you! + Feel like joining in? Know what to do? Don't know what to do? Just send the crew a message. We're looking forward to hearing from you! - ## Financing + ## Financing - We currently pay for the infrastructure out of our own pockets (like the server and domain name). + We currently pay for the infrastructure out of our own pockets (like the server and domain name). - This situation is not long-term sustainable, and we're currently working on founding an e.V. and having solid financing. We'd of course welcome anyone wanting to help and participate! + This situation is not long-term sustainable, and we're currently working on founding an e.V. and having solid financing. We'd of course welcome anyone wanting to help and participate! - ### Donate via IBAN + ### Donate via IBAN - Jhonas Wernery - DE70430609674093197701 - GLS Bank + Jhonas Wernery + DE70430609674093197701 + GLS Bank - ## Imprint + ![QR GiroCode](/assets/donation-qr.png) - pub.solar n.e.V. - - c/o MiOM Kreativraum e.V., - Wilhelm-Mauser-Straße 47 Halle 5, - D-50827 Köln, - [crew@pub.solar](mailto:crew@pub.solar) + ## Imprint - ## Our Statutes + pub.solar n.e.V. + + c/o MiOM Kreativraum e.V., + Wilhelm-Mauser-Straße 47 Halle 5, + D-50827 Köln, + [crew@pub.solar](mailto:crew@pub.solar) - Are over [here](https://pub.solar/satzung). + ## Our Statutes - ## Our Privacy Policy + Are over [here](https://pub.solar/satzung). They are only available in German for now. - Is over [here](/privacy). + ## Our Privacy Policy - ## Our hosting + Is over [here](/privacy). - We use a dedicated server from Hetzner GmbH hosted in Germany. + ## Our hosting - The code for the infrastructure can be found [in this git repository](https://git.pub.solar/pub-solar/infra). + We use a dedicated server from Hetzner GmbH hosted in Germany. - de: | - # Hi! Wir sind pub.solar - - Wir sind ein nicht eingetragener Verein mit Sitz in Köln. Unser Ziel ist es mehr Menschen zu ermöglichen, Freie Software zu benutzen, sicher digital zu kommunizieren, und datensparsamer zu leben. - - Wir stellen für Dich und alle Menschen die Du lieb hast auf transparente und demokratische Weise freie Software zur Verfügung. - - Momentan bieten wir diese Services an: - - * [Matrix](https://chat.pub.solar): dezentraler, Ende-zu-Ende verschlüsselter Chat, ähnlich wie Slack oder Discord, - * [Mastodon](https://mastodon.pub.solar): dezentrale Mikrobloggingplattform, ähnlich wie Twitter, - * [Nextcloud](https://cloud.pub.solar): Cloud mit Office Möglichkeiten, ähnlich wie Teile der Google Suite und Microsoft Office 365, - * [Forgejo](https://git.pub.solar/): ein git Server, ähnlich wie GitHub oder Gitlab. - - Ausserdem bieten wir folgende Services an, die jederzeit geändert werden oder verschwinden könnten: - - * [Searx](https://search.pub.solar/): eine Meta-Suchmachine, ähnlich wie Google oder Bing, - * [Mailman](https://lists.pub.solar/): eine Software für Mailing-Listen, - * [OBS Portal](https://obs-portal.pub.solar/): ein Server um [OpenBikeSensor](https://www.openbikesensor.org/)-Daten zu speichern, begrenzt auf die Region Köln/Bonn. - - Für manche dieser Services musst du einen Account registrieren, bei uns heißt der [pub.solar ID](https://auth.pub.solar). Die Registrierung ist für alle offen. Bei der Nextcloud ist der Speicherplatz allerdings stark begrenzt. Falls du Speicherplatz in der Nextcloud haben willst, kontaktiere die Crew. - - ## Kontakt und Hilfe - - Du kannst uns via [#General in Matrix](https://matrix.to/#/#general:pub.solar?via=chat.pub.solar) und [@crew auf Mastodon](https://mastodon.pub.solar/@crew) erreichen, oder eine Mail an [crew@pub.solar](mailto:crew@pub.solar) schicken. - - Unseren PGP Schlüssel findest du [hier](https://keys.openpgp.org/vks/v1/by-fingerprint/8A8987ADE3736C8CA2EB315A9B809EBBDD62BAE3). Er hat folgenden Fingerabdruck: - - ``` - 8A89 87AD E373 6C8C A2EB 315A 9B80 9EBB DD62 BAE3 - ``` - - Schau dir bei Fragen gerne unser [wiki](https://wiki.pub.solar) an oder kontaktiere uns über einen der oben genannten Kanäle. Im Matrix [#General Raum](https://matrix.to/#/#general:pub.solar?via=chat.pub.solar) gibt es immer Menschen, die gerne deine Fragen beantworten. - - ## Mitglied oder Helfer*in werden - - Bist du daran interessiert ein Mitglied von pub.solar n.e.V. zu werden? Du würdest die Organisation gerne mit Arbeit, Geld, oder einfach nur deinen Namen unterstützen? - - Momentan sind wir ein nicht eingetragener Verein. Das bedeutet das wir juristisch eine Gruppe einzelner Personen sind (wie eine GbR) und der Verein nicht haften oder als juristische Person existiert. Unser Ziel ist es einen eingetragener Verein (e.V.) zu gründen. - - Wir suchen immer nach Hilfe und Unterstützung. Eine Mitgliedschaft ist momentan weder mit Kosten noch Vorteile verbunden, und sollte eher ein Zeichen der Unterstützung sein. Wir ermutigen jede*n ein Mitglied zu werden, sogar (oder, vor allem) wenn du nicht sehr technisch bewandert bist. Unser Ziel ist es pub.solar zu einer Organisation zu machen die _allen_ hilft, vor allem Menschen die selbständig nicht in der Lage wären IT-Infrastruktur zu verwalten. Wir wollen dir eine Stimme in den Entscheidungen bezüglich deiner IT-Services geben. Wir wollen, dass die Community gemeinsam entscheidet wie IT die mit Solidarität, Freiheit, Privacy, und gegenseite Unterstützung gebaut wird aussieht. - - Klingt nach deinem Ding? Schon ne Ahnung was du machen willst? Keine Ahnung was du machen willst? Schick die Crew ne Nachricht, wir freuen uns von dir zu hören! - - ## Finanzierung - - Die laufenden Kosten zahlen wir momentan aus eigener Tasche (wie der Server + die Domain). - - Diese Situation ist nicht nachhaltig, also arbeiten wir aktuell daran einen e.V. zu gründen und die Finanzierung zu sichern. Wir freuen uns über alle, die sich einbringen oder helfen möchten. - - ### Per IBAN spenden - - Jhonas Wernery - DE70430609674093197701 - GLS Bank - - ## Impressum - - pub.solar n.e.V. - - c/o MiOM Kreativraum e.V., - Wilhelm-Mauser-Straße 47 Halle 5, - D-50827 Köln, - [crew@pub.solar](mailto:crew@pub.solar) - - ### Unsere Satzung - - Findest Du [hier](https://pub.solar/satzung). - - ## Unsere Datenschutzerklärung - Findest Du [hier](/privacy). - - ## Unser Hosting - - Wir benutzen einen dedicated Server der Hetzner GmbH, der in einem deutschen Rechenzentrum steht. - - Den Quellcode der Infrastruktur kannst du [in diesem git Repo](https://git.pub.solar/pub-solar/infra) einsehen. + The code for the infrastructure can be found [in this git repository](https://git.pub.solar/pub-solar/infra). diff --git a/assets/donation-qr.png b/assets/donation-qr.png new file mode 100644 index 0000000..cff7e90 Binary files /dev/null and b/assets/donation-qr.png differ diff --git a/assets/greenbaum-cloud-logo.svg b/assets/greenbaum-cloud-logo.svg deleted file mode 100644 index b99f187..0000000 --- a/assets/greenbaum-cloud-logo.svg +++ /dev/null @@ -1,34 +0,0 @@ - - - gbv-logo - - - - \ No newline at end of file diff --git a/de/about.yml b/de/about.yml new file mode 100644 index 0000000..70d34e5 --- /dev/null +++ b/de/about.yml @@ -0,0 +1,91 @@ +layout: layouts/default.tsx + +title: Über uns & Impressum + +content: | + # Hi! Wir sind pub.solar + + Wir sind ein nicht eingetragener Verein mit Sitz in Köln. Unser Ziel ist es mehr Menschen zu ermöglichen, Freie Software zu benutzen, sicher digital zu kommunizieren, und datensparsamer zu leben. + + Wir stellen für Dich und alle Menschen die Du lieb hast auf transparente und demokratische Weise freie Software zur Verfügung. + + Momentan bieten wir diese Services an: + + * [Matrix](https://chat.pub.solar): dezentraler, Ende-zu-Ende verschlüsselter Chat, ähnlich wie Slack oder Discord, + * [Mastodon](https://mastodon.pub.solar): dezentrale Mikrobloggingplattform, ähnlich wie Twitter, + * [Nextcloud](https://cloud.pub.solar): Cloud mit Office Möglichkeiten, ähnlich wie Teile der Google Suite und Microsoft Office 365, + * [Forgejo](https://git.pub.solar/): ein git Server, ähnlich wie GitHub oder Gitlab. + + Ausserdem bieten wir folgende Services an, die jederzeit geändert werden oder verschwinden könnten: + + * [Searx](https://search.pub.solar/): eine Meta-Suchmachine, ähnlich wie Google oder Bing, + * [Mailman](https://lists.pub.solar/): eine Software für Mailing-Listen, + * [OBS Portal](https://obs-portal.pub.solar/): ein Server um [OpenBikeSensor](https://www.openbikesensor.org/)-Daten zu speichern, begrenzt auf die Region Köln/Bonn. + + Für manche dieser Services musst du einen Account registrieren, bei uns heißt der [pub.solar ID](https://auth.pub.solar). Die Registrierung ist für alle offen. Bei der Nextcloud ist der Speicherplatz allerdings stark begrenzt. Falls du Speicherplatz in der Nextcloud haben willst, kontaktiere die Crew. + + ## Kontakt und Hilfe + + Du kannst uns via [#General in Matrix](https://matrix.to/#/#general:pub.solar?via=chat.pub.solar) und [@crew auf Mastodon](https://mastodon.pub.solar/@crew) erreichen, oder eine Mail an [crew@pub.solar](mailto:crew@pub.solar) schicken. + + Unseren PGP Schlüssel findest du [hier](https://keys.openpgp.org/vks/v1/by-fingerprint/8A8987ADE3736C8CA2EB315A9B809EBBDD62BAE3). Er hat folgenden Fingerabdruck: + + ``` + 8A89 87AD E373 6C8C A2EB 315A 9B80 9EBB DD62 BAE3 + ``` + + Schau dir bei Fragen gerne unser [wiki](https://wiki.pub.solar) an oder kontaktiere uns über einen der oben genannten Kanäle. Im Matrix [#General Raum](https://matrix.to/#/#general:pub.solar?via=chat.pub.solar) gibt es immer Menschen, die gerne deine Fragen beantworten. + + ## Mitglied oder Helfer*in werden + + Bist du daran interessiert ein Mitglied von pub.solar n.e.V. zu werden? Du würdest die Organisation gerne mit Arbeit, Geld, oder einfach nur deinen Namen unterstützen? + + Momentan sind wir ein nicht eingetragener Verein. Das bedeutet das wir juristisch eine Gruppe einzelner Personen sind (wie eine GbR) und der Verein nicht haften oder als juristische Person existiert. Unser Ziel ist es einen eingetragener Verein (e.V.) zu gründen. + + Wir suchen immer nach Hilfe und Unterstützung. Eine Mitgliedschaft ist momentan weder mit Kosten noch Vorteile verbunden, und sollte eher ein Zeichen der Unterstützung sein. Wir ermutigen jede*n ein Mitglied zu werden, sogar (oder, vor allem) wenn du nicht sehr technisch bewandert bist. Unser Ziel ist es pub.solar zu einer Organisation zu machen die _allen_ hilft, vor allem Menschen die selbständig nicht in der Lage wären IT-Infrastruktur zu verwalten. Wir wollen dir eine Stimme in den Entscheidungen bezüglich deiner IT-Services geben. Wir wollen, dass die Community gemeinsam entscheidet wie IT die mit Solidarität, Freiheit, Privacy, und gegenseite Unterstützung gebaut wird aussieht. + + Klingt nach deinem Ding? Schon ne Ahnung was du machen willst? Keine Ahnung was du machen willst? Schick die Crew ne Nachricht, wir freuen uns von dir zu hören! + + ## Finanzierung + + Die laufenden Kosten zahlen wir momentan aus eigener Tasche (wie der Server + die Domain). + + Diese Situation ist nicht nachhaltig, also arbeiten wir aktuell daran einen e.V. zu gründen und die Finanzierung zu sichern. Wir freuen uns über alle, die sich einbringen oder helfen möchten. + + ### Per IBAN spenden + + Jhonas Wernery + DE70430609674093197701 + GLS Bank + + ![QR GiroCode](/assets/donation-qr.png) + + ## Impressum + + pub.solar n.e.V. + + c/o MiOM Kreativraum e.V., + Wilhelm-Mauser-Straße 47 Halle 5, + D-50827 Köln, + [crew@pub.solar](mailto:crew@pub.solar) + + ### Unsere Satzung + + Findest Du [hier](https://pub.solar/satzung). + + ## Unsere Datenschutzerklärung + Findest Du [hier](/privacy). + + ## Unser Hosting + + Wir benutzen einen dedicated Server der Hetzner GmbH, der in einem deutschen Rechenzentrum steht. + + Den Quellcode der Infrastruktur kannst du [in diesem git Repo](https://git.pub.solar/pub-solar/infra) einsehen. diff --git a/de/hakken.yml b/de/hakken.yml new file mode 100644 index 0000000..d47db3f --- /dev/null +++ b/de/hakken.yml @@ -0,0 +1,49 @@ +layout: layouts/default.tsx + +title: hakken.irl +showHakkenDates: true + +content: | + # hakken.irl + + Du bist eingeladen! + + Wir treffen uns (fast) alle drei Monate zum hakken.irl, ein kleiner 3-Tägiger (Freitag bis Sonntag) Hackathon bei dem es nur darum geht Spaß zu haben und abzunerden. + + ## Was machen wir denn so? + + Es gibt nur einen festen Programmpunkt: bei der Critical Mass mitradeln. Tendenziell hakken wir danach an pub.solar Sachen, wie [unserer Infrastruktur](https://git.pub.solar/pub-solar/infra "pub.solar infra repo"). + + Ein paar Beispiele: + + * [die Infrastruktur auf NixOS 23.11 aktualisieren](https://git.pub.solar/pub-solar/infra/pulls/74), + * [unsere Website auf einen neuen Server migrieren](https://git.pub.solar/pub-solar/infra/pulls/20), + * [die Standardinhalte des Nextcloud Verzeichnis für neue User definieren](https://git.pub.solar/pub-solar/infra/pulls/73), + * [Matrix vhosts in nginx konfigurieren](https://git.pub.solar/pub-solar/infra/pulls/33), + * digitale Animationen kreieren, + * Fotos bearbeiten und Musik machen, + * Wizard, Karten, und Brettspiele zocken, + * kochen, bestellen, und gemeinsam essen, + * und über die FDP herziehen. + + ## Ist das also nur für über-nerds? + + Es geht schon ziemlich nerdy zu, und du solltest auf jeden Fall deinen Laptop dabei haben. Allerdings ist es uns eigentlich egal, wie du deine Zeit verbringst. Im besten Falle kannst du dich auch allein mit einem eigenen Projekt beschäftigen. Wir benutzen den Raum zum gemeinsamen Arbeiten und Austauschen, aber wenn der Vibe passt, kannst du dich auch gerne dazu setzen und nur Spiele zocken. + + ## Was kostet das? + + Die Teilnahme kostet nichts, aber wenn wir mal Essen bestellen oder beim Kiosk was holen wärs cool wenn du etwas dazu gibst. Eine kleine Spende an den Verein ist auch immer gerne gesehen. + + ## Wo schlafe ich? + + Falls du keine (bezahlbare, coole, sichere) Übernachtungsmöglichkeit finden kannst, dann rede mit uns. Wir kriegen garantiert einen Schlafplatz organisiert. + + ## Wo melde ich mich an? + + Schreib uns kurz eine Nachricht. Du kannst uns via [Matrix](https://matrix.to/#/#general:pub.solar?via=chat.pub.solar) und [Mastodon](https://mastodon.pub.solar/@crew) erreichen, oder schick uns eine Mail an [crew@pub.solar](mailto:crew@pub.solar). + + ## Und wann findet das statt? + + hakken.irl startet am letzten Freitag im Monat um 13:12 und geht bis Sonntag 16:20. + + Wir treffen uns alle drei Monate, üblicherweise im Januar, April, Juli und Oktober. diff --git a/de/index.yml b/de/index.yml new file mode 100644 index 0000000..96e8e11 --- /dev/null +++ b/de/index.yml @@ -0,0 +1,24 @@ +layout: layouts/homepage.tsx + +content: | + # Willkommen bei pub.solar + + Wir sind eine freundliche Gemeinschaft, die an einem digitalen Pub an der Ecke werkelt. + + Unser Ziel ist es mehr Menschen zu ermöglichen, Freie Software zu benutzen, sicher digital zu kommunizieren, und datensparsamer zu leben. + + Wir stellen freie Software für Dich und alle Menschen, die Du lieb hast, auf transparente und demokratische Weise zur Verfügung. + + ***Fucking free*** + +links: + - href: ./services + title: Unsere Services + - href: https://auth.pub.solar/realms/pub.solar/account + title: Deine pub.solar ID + - href: ./hakken + title: hakken.irl + - href: ./about + title: Über uns + - href: ./privacy + title: Datenschutz diff --git a/de/maintenance.yml b/de/maintenance.yml new file mode 100644 index 0000000..0d35b8e --- /dev/null +++ b/de/maintenance.yml @@ -0,0 +1,16 @@ +layout: layouts/error.tsx + +title: Scheduled maintenance + +content: | + # Scheduled maintenance + + This service is currently undergoing scheduled maintenance. + + Sorry for the inconvenience :) + + Check our [status page](https://stats.uptimerobot.com/G28ByiBg8j) for more information. + + Love, + + the pub.solar crew diff --git a/de/privacy.yml b/de/privacy.yml new file mode 100644 index 0000000..5293596 --- /dev/null +++ b/de/privacy.yml @@ -0,0 +1,8 @@ +layout: layouts/default.tsx + +title: Privacy Policy + +content: | + **Es gibt momentan leider keine Deutsche Version unserer Datenschutzerklärung.** + + Falls Du unbedingt eine sehen willst, dann kontaktiere die Crew damit wir das Thema höher priorisieren können. diff --git a/de/services.yml b/de/services.yml new file mode 100644 index 0000000..bc5abec --- /dev/null +++ b/de/services.yml @@ -0,0 +1,17 @@ +layout: layouts/default.tsx + +title: Unsere Dienste +showServices: true + +content: | + # Unsere Dienste + + Diese Seite gibt einen Überblick über die Dienste, die wir hosten. Wir geben einige Informationen über den Support-Status und den Datenschutz für jeden Dienst. + + * [Nextcloud](#nextcloud) + * [Mastodon](#mastodon) + * [Matrix](#matrix) + * [Forgejo / git](#forgejo) + * [Mailman](#mailman) + * [Wiki](#wiki) + * [Searx](#searx) diff --git a/flake.lock b/flake.lock index b917483..1d8eccc 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1701473968, - "narHash": "sha256-YcVE5emp1qQ8ieHUnxt1wCZCC3ZfAS+SRRWZ2TMda7E=", + "lastModified": 1712014858, + "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5", + "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", "type": "github" }, "original": { @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1703438236, - "narHash": "sha256-aqVBq1u09yFhL7bj1/xyUeJjzr92fXVvQSSEx6AdB1M=", + "lastModified": 1712608508, + "narHash": "sha256-vMZ5603yU0wxgyQeHJryOI+O61yrX2AHwY6LOFyV1gM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5f64a12a728902226210bf01d25ec6cbb9d9265b", + "rev": "4cba8b53da471aea2ab2b0c1f30a81e7c451f4b6", "type": "github" }, "original": { @@ -37,11 +37,11 @@ "nixpkgs-lib": { "locked": { "dir": "lib", - "lastModified": 1701253981, - "narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=", + "lastModified": 1711703276, + "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e92039b55bcd58469325ded85d4f58dd5a4eaf58", + "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 93306af..7794440 100644 --- a/flake.nix +++ b/flake.nix @@ -1,5 +1,5 @@ { - description = "devs & ops environment for nix'ing with triton"; + description = "pub.solar website"; inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; diff --git a/hakken.yml b/hakken.yml index 0a3deff..4e93cb3 100644 --- a/hakken.yml +++ b/hakken.yml @@ -3,93 +3,45 @@ layout: layouts/default.tsx title: hakken.irl showHakkenDates: true -content: - en: | - # hakken.irl +content: | + # You're invited! - You're invited! + We meet (almost) every three months for hakken.irl, a small three-day (Friday to Sunday) hackathon that's just about having fun and nerding around. - We meet (almost) every three months for hakken.irl, a small three-day (Friday to Sunday) hackathon that's just about having fun and nerding around. + ## What will we be doing? - ## What will we be doing? + There is only one set agenda point: riding with Critical Mass. In general, we'll be hakking on pub.solar related stuff like [our Infrastructure](https://git.pub.solar/pub-solar/infra "pub.solar infra repo"). - There is only one set agenda point: riding with Critical Mass. In general, we'll be hakking on pub.solar related stuff like [our Infrastructure](https://git.pub.solar/pub-solar/infra "pub.solar infra repo"). + Examples include: - Examples include: + * [updating the pub.solar infrastructure servers to NixOS 23.11](https://git.pub.solar/pub-solar/infra/pulls/74), + * [migrating our website to a new server](https://git.pub.solar/pub-solar/infra/pulls/20), + * [defining the default directory contents for new Nextcloud users](https://git.pub.solar/pub-solar/infra/pulls/73), + * [configuring nginx to serve Matrix vhosts](https://git.pub.solar/pub-solar/infra/pulls/33), + * creating digital animations, + * touching up photographs and making music, + * playing Wizard, cards and board games, + * cooking, ordering, and eating together, + * and making fun of neoliberals. - * [updating the pub.solar infrastructure servers to NixOS 23.11](https://git.pub.solar/pub-solar/infra/pulls/74), - * [migrating our website to a new server](https://git.pub.solar/pub-solar/infra/pulls/20), - * [defining the default directory contents for new Nextcloud users](https://git.pub.solar/pub-solar/infra/pulls/73), - * [configuring nginx to serve Matrix vhosts](https://git.pub.solar/pub-solar/infra/pulls/33), - * creating digital animations, - * touching up photographs and making music, - * playing Wizard, cards and board games, - * cooking, ordering, and eating together, - * and making fun of neoliberals. + ## So is it just for über-nerds? - ## So is it just for über-nerds? + It's pretty nerdy over all, and you should definitely bring your laptop. However we don't really care what you do while you're with us. It's good if you can also entertain yourself with a project. We use the space to work together and connect, but if we vibe you can also just sit with us and play games all day. - It's pretty nerdy over all, and you should definitely bring your laptop. However we don't really care what you do while you're with us. It's good if you can also entertain yourself with a project. We use the space to work together and connect, but if we vibe you can also just sit with us and play games all day. + ## What do I have to pay? - ## What do I have to pay? + It's free, but if we order food or get some stuff at a kiosk it'd be cool if you chip in. A small donation to the association is also always welcome. - It's free, but if we order food or get some stuff at a kiosk it'd be cool if you chip in. A small donation to the association is also always welcome. + ## Where do I sleep? - ## Where do I sleep? + If you cannot find an (affordable, cool, safe) place to stay, then talk to us. We'll surely be able to set you up with a place to stay somewhere. - If you cannot find an (affordable, cool, safe) place to stay, then talk to us. We'll surely be able to set you up with a place to stay somewhere. + ## Where do I sign up? - ## Where do I sign up? + Write us a short message. You can reach us via [Matrix](https://matrix.to/#/#general:pub.solar?via=chat.pub.solar) and [Mastodon](https://mastodon.pub.solar/@crew), or send a mail to [crew@pub.solar](mailto:crew@pub.solar). - Write us a short message. You can reach us via [Matrix](https://matrix.to/#/#general:pub.solar?via=chat.pub.solar) and [Mastodon](https://mastodon.pub.solar/@crew), or send a mail to [crew@pub.solar](mailto:crew@pub.solar). + ## When will this happen? - ## When will this happen? + hakken.irl starts on the last Friday of the month at 13:12 and ends on Sunday 16:20. - hakken.irl starts on the last Friday of the month at 13:12 and ends on Sunday 16:20. - - We're meeting up every three months, typically in January, April, July and October. - - de: | - # hakken.irl - - Du bist eingeladen! - - Wir treffen uns (fast) alle drei Monate zum hakken.irl, ein kleiner 3-Tägiger (Freitag bis Sonntag) Hackathon bei dem es nur darum geht Spaß zu haben und abzunerden. - - ## Was machen wir denn so? - - Es gibt nur einen festen Programmpunkt: bei der Critical Mass mitradeln. Tendenziell hakken wir danach an pub.solar Sachen, wie [unserer Infrastruktur](https://git.pub.solar/pub-solar/infra "pub.solar infra repo"). - - Ein paar Beispiele: - - * [die Infrastruktur auf NixOS 23.11 aktualisieren](https://git.pub.solar/pub-solar/infra/pulls/74), - * [unsere Website auf einen neuen Server migrieren](https://git.pub.solar/pub-solar/infra/pulls/20), - * [die Standardinhalte des Nextcloud Verzeichnis für neue User definieren](https://git.pub.solar/pub-solar/infra/pulls/73), - * [Matrix vhosts in nginx konfigurieren](https://git.pub.solar/pub-solar/infra/pulls/33), - * digitale Animationen kreieren, - * Fotos bearbeiten und Musik machen, - * Wizard, Karten, und Brettspiele zocken, - * kochen, bestellen, und gemeinsam essen, - * und über die FDP herziehen. - - ## Ist das also nur für über-nerds? - - Es geht schon ziemlich nerdy zu, und du solltest auf jeden Fall deinen Laptop dabei haben. Allerdings ist es uns eigentlich egal, wie du deine Zeit verbringst. Im besten Falle kannst du dich auch allein mit einem eigenen Projekt beschäftigen. Wir benutzen den Raum zum gemeinsamen Arbeiten und Austauschen, aber wenn der Vibe passt, kannst du dich auch gerne dazu setzen und nur Spiele zocken. - - ## Was kostet das? - - Die Teilnahme kostet nichts, aber wenn wir mal Essen bestellen oder beim Kiosk was holen wärs cool wenn du etwas dazu gibst. Eine kleine Spende an den Verein ist auch immer gerne gesehen. - - ## Wo schlafe ich? - - Falls du keine (bezahlbare, coole, sichere) Übernachtungsmöglichkeit finden kannst, dann rede mit uns. Wir kriegen garantiert einen Schlafplatz organisiert. - - ## Wo melde ich mich an? - - Schreib uns kurz eine Nachricht. Du kannst uns via [Matrix](https://matrix.to/#/#general:pub.solar?via=chat.pub.solar) und [Mastodon](https://mastodon.pub.solar/@crew) erreichen, oder schick uns eine Mail an [crew@pub.solar](mailto:crew@pub.solar). - - ## Und wann findet das statt? - - hakken.irl startet am letzten Freitag im Monat um 13:12 und geht bis Sonntag 16:20. - - Wir treffen uns alle drei Monate, üblicherweise im Januar, April, Juli und Oktober. + We're meeting up every three months, typically in January, April, July and October. diff --git a/index.yml b/index.yml index d0bcbba..898ca2b 100644 --- a/index.yml +++ b/index.yml @@ -1,26 +1,24 @@ layout: layouts/homepage.tsx +content: | + # Welcome to pub.solar + + We're a friendly community creating a digital corner pub. + + Our goal is to enable more people to use free software, have secure digital communications, and to take control over their private data. + + We host online services for you and all the people you love. We do this transparently and democratically. + + ***Fucking free*** + links: - - href: https://en.wikipedia.org/wiki/Free_software - title: Fucking Free - openInNewTab: true - - href: ./about - title: About us + - href: ./services + title: Our services - href: https://auth.pub.solar/realms/pub.solar/account title: Your pub.solar ID - - href: https://cloud.pub.solar/ - title: Nextcloud - openInNewTab: true - - href: https://chat.pub.solar/ - title: Matrix - openInNewTab: true - - href: https://mastodon.pub.solar/ - title: Mastodon - openInNewTab: true - - href: https://git.pub.solar/ - title: Git - openInNewTab: true - href: ./hakken title: hakken.irl + - href: ./about + title: About us - href: ./privacy title: Privacy policy diff --git a/privacy.yml b/privacy.yml index 915204c..f950c71 100644 --- a/privacy.yml +++ b/privacy.yml @@ -2,135 +2,125 @@ layout: layouts/default.tsx title: Privacy Policy -content: - en: | - # Privacy Policy - - Information on data privacy and protection for the services operated by pub.solar n.e.V. as required by article 13 DSGVO. - - ## Services - - We run multiple public services: - - * our Matrix service, consisting of the "Homeserver"; `https://matrix.pub.solar`, as well as the web-based Element-Messenger ([chat.pub.solar](https://chat.pub.solar/)), - * our Nextcloud service at `https://cloud.pub.solar`, - * our Mastodon service at `https://mastodon.pub.solar`. - * our Gitea service at `https://git.pub.solar`. - * our Keycloak authentication service at `https://auth.pub.solar`. - - ## Responsible for operating the service - - **pub.solar n.e.V.** - Benjamin Bädorf, Jhonas Wernery, Hendrik Sokolowki - c/o MiOM 202 - Wilhelm-Mauser-Straße 47 Halle 5, - D-50827 Köln - [crew@pub.solar](mailto:crew@pub.solar) - - ## Contact for data protection issues - - If you have any questions regarding data protection, please contact us at [crew@pub.solar](mailto:crew@pub.solar) or at the postal address given above. - - ## What is the purpose of the data processing? - - "Matrix" is an open, decentralized communication service for real-time communication. It enables members of pub.solar n.e.V., as well as other interested parties, to communicate with other users of this server as well as other Matrix users of federated Matrix servers via chat and audio/video telephony by means of a Matrix account. - - ## What personal data is processed? - - If a user chooses to use any of the services provided by us, the following data will be required and therefore collected by pub.solar in the authentication service: - - A valid email address: required for account creation. This email address is deleted from our database after the account has been approved/denied, unless the user chooses during the registration process, to keep it for password reset process. - - An username and a password: required to identify the account holder and provide the services offered by pub.solar. - - Necessary information related to the operation and functioning of the services which may include, for example, IP address, User Agent, etc. More detailed information about this and how we handle it can be found in the Privacy notices per service. - - When a user makes an online donation to pub.solar, we collect personal data such as, but not limited to, username (if any), country (in case of extra storage request for tax purposes), transaction IDs or bank account/reference. The purpose for which we use this data is merely administrative (verification of regular donations, accounting management) and is maintained under the same security measures described in the "How do we store your data?" section. Since all the data we collect is previously processed by a third-party payment processor such as PayPal, Patreon or Liberapay, by using these or similar services, their use of your information is based on their terms of service and policies, not ours, so we encourage you to review those policies carefully. - - Any additional information that the user chooses to supply while using the services provided by us (whether it is chats, posts, emails, etc.). This additional information is optional and with the user's consent. - - ## How long will the personal data be stored? - - The personal data will be deleted from our server after 15 months of inactivity. The deletion requests are forwarded to the federated servers. However, we have no influence on their execution. - - ## Where is the personal data stored? - - We run our all of our services on servers of the company [Greenbaum Cloud](https://greenbaum.cloud/). - - ## Data subject rights - - When we process personal data about you, you have the following rights: - - * right of access to the data processed and right to obtain a copy of it, - * right of rectification if we process incorrect data about you, - * right to deletion, unless exceptions apply as to why we are still storing the data, for example, retention obligations or limitation periods - * right to restriction of processing, - * right to withdraw consent to data processing at any time, - * right to object to processing in the public or legitimate interest, - * right to data portability, - * right to lodge a complaint with a data protection supervisory authority if you believe that we are not processing your data properly. The State Commissioner for Data Protection and Freedom of Information in Nordrhein-Westfalen is responsible in our case. However, if you are in another federal state or not in Germany, you can also contact the data protection authority there. - - ## What we do not do with your data - - We do not collect any other data than what is needed to provide you the service. - - We do not, in any way, process, analyze your behavior or personal characteristics to create profiles about you or your usage of the services. We have no advertisements or business relationships with advertisers. - - We do not sell your data to any third party. - - We do not share your data to any third party unless in case of federated services which requires certain data to be shared in order to operate (e.g. other email service provider needs to know your email address to be able to deliver emails). - - We do not require any additional information that is not crucial for the operation of the service (we do not ask for phone numbers, private personal data, home address). - - We do not read/look nor process your personal data, emails, files, etc., stored on our servers unless needed for providing the service, troubleshooting purposes or under suspicion of breaking our Terms Of Services in which case we ask for prior permission from you or inform you afterwards of all actions taken against the account in the transparency report addressed to account holder. - - ## Privacy Policy per service - - ### Cloud - - Our cloud runs Nextcloud. - - This service requires login with pub.solar credentials. - - Everything (files, calendars, contacts, news, tasks, bookmarks, etc.) is stored unencrypted in a database, unless an application provides external encryption (none so far). This is a limitation of the software we are utilizing for this service (Nextcloud). - - We do not currently encrypt files when you upload them because we've had some bad experiences with dataloss incurred through end-to-end encryption. - - Server logs, which store information such as, but not limited to, your IP address, your username, an app currently used, error messages and User Agent, are stored for a period of 24 hours after which they are deleted from the server. No backup of log files is created. Logs are kept to prevent brute-force attacks on accounts and to provide quick insight when debugging issues. - - ### Git - - This service requires login with pub.solar credentials. - - Server logs, which store information such as, but not limited to, your IP address, your username, error messages and User Agent, are stored for a period of 24 hours after which they are deleted from the server. No backup of log files is created. Logs are kept to prevent brute-force attacks on accounts and to provide quick insight when debugging issues. - - All git data such as, but not limited to, usernames, email addresses, messages, code, files, versions, pull requests, etc., are stored on the server in the database as is (plain-text). - - ### Matrix +content: | + # Privacy Policy - This service requires login with pub.solar credentials. + Information on data privacy and protection for the services operated by pub.solar n.e.V. as required by article 13 DSGVO. - Server logs, which store information such as, but not limited to, your IP address, your username, error messages and User Agent, are stored for a period of 24 hours after which they are deleted from the server. No backup of log files is created. Logs are kept to prevent brute-force attacks on accounts and to provide quick insight when debugging issues. + ## Services + + We run multiple public services: - All git data such as, but not limited to, usernames, email addresses, messages, code, files, versions, pull requests, etc., are stored on the server in the database as is (plain-text). + * our Matrix service, consisting of the "Homeserver"; `https://matrix.pub.solar`, as well as the web-based Element-Messenger ([chat.pub.solar](https://chat.pub.solar/)), + * our Nextcloud service at `https://cloud.pub.solar`, + * our Mastodon service at `https://mastodon.pub.solar`. + * our Gitea service at `https://git.pub.solar`. + * our Keycloak authentication service at `https://auth.pub.solar`. - ### Mastodon + ## Responsible for operating the service - This service requires login with pub.solar credentials. - - Basic account information: If you register on this server, you may be asked to enter a username, an e-mail address and a password. You may also enter additional profile information such as a display name and biography, and upload a profile picture and header image. The username, display name, biography, profile picture and header image are always listed publicly. + **pub.solar n.e.V.** + Benjamin Bädorf, Jhonas Wernery, Hendrik Sokolowki + c/o MiOM 202 + Wilhelm-Mauser-Straße 47 Halle 5, + D-50827 Köln + [crew@pub.solar](mailto:crew@pub.solar) - Posts, following and other public information: The list of people you follow is listed publicly, the same is true for your followers. When you submit a message, the date and time is stored as well as the application you submitted the message from. Messages may contain media attachments, such as pictures and videos. Public and unlisted posts are available publicly. When you feature a post on your profile, that is also publicly available information. Your posts are delivered to your followers, in some cases it means they are delivered to different servers and copies are stored there. When you delete posts, this is likewise delivered to your followers. The action of reblogging or favouriting another post is always public. + ## Contact for data protection issues + + If you have any questions regarding data protection, please contact us at [crew@pub.solar](mailto:crew@pub.solar) or at the postal address given above. - Direct and followers-only posts: All posts are stored and processed on the server. Followers-only posts are delivered to your followers and users who are mentioned in them, and direct posts are delivered only to users mentioned in them. In some cases it means they are delivered to different servers and copies are stored there. We make a good faith effort to limit the access to those posts only to authorized persons, but other servers may fail to do so. Therefore it's important to review servers your followers belong to. You may toggle an option to approve and reject new followers manually in the settings. Please keep in mind that the operators of the server and any receiving server may view such messages, and that recipients may screenshot, copy or otherwise re-share them. Do not share any sensitive information over Mastodon. + ## What personal data is processed? + + If a user chooses to use any of the services provided by us, the following data will be required and therefore collected by pub.solar in the authentication service: - IPs and other metadata: When you log in, we record the IP address you log in from, as well as the name of your browser application. All the logged in sessions are available for your review and revocation in the settings. The latest IP address used is stored for up to 12 months. We also may retain server logs which include the IP address of every request to our server. + A valid email address: required for account creation. This email address is deleted from our database after the account has been approved/denied, unless the user chooses during the registration process, to keep it for password reset process. - ## References/License - - We have created the basic structure of this data protection information with the help of [DS-GVO.clever-Tools](https://www.baden-wuerttemberg.datenschutz.de/ds-gvo.clever/) and adapted it to our needs. We have also used parts of [Datenschutzerklärung der TU-Dresden](https://doc.matrix.tu-dresden.de/privacy/) and adjusted them accordingly. Text is licensed [CC BY-SA 4.0](https://creativecommons.org/licenses/by-sa/4.0/deed.de). + An username and a password: required to identify the account holder and provide the services offered by pub.solar. - de: | - **Es gibt momentan leider keine Deutsche Version unserer Datenschutzerklärung.** + Necessary information related to the operation and functioning of the services which may include, for example, IP address, User Agent, etc. More detailed information about this and how we handle it can be found in the Privacy notices per service. - Falls Du unbedingt eine sehen willst, dann kontaktiere die Crew damit wir das Thema höher priorisieren können. + When a user makes an online donation to pub.solar, we collect personal data such as, but not limited to, username (if any), country (in case of extra storage request for tax purposes), transaction IDs or bank account/reference. The purpose for which we use this data is merely administrative (verification of regular donations, accounting management) and is maintained under the same security measures described in the "How do we store your data?" section. Since all the data we collect is previously processed by a third-party payment processor such as PayPal, Patreon or Liberapay, by using these or similar services, their use of your information is based on their terms of service and policies, not ours, so we encourage you to review those policies carefully. + + Any additional information that the user chooses to supply while using the services provided by us (whether it is chats, posts, emails, etc.). This additional information is optional and with the user's consent. + + ## How long will the personal data be stored? + + The personal data will be deleted from our server after 15 months of inactivity. The deletion requests are forwarded to the federated servers. However, we have no influence on their execution. + + ## Where is the personal data stored? + + We run our all of our services on servers of the company [Hetzner Online GmbH](https://hetzner.com/). + + ## Data subject rights + + When we process personal data about you, you have the following rights: + + * right of access to the data processed and right to obtain a copy of it, + * right of rectification if we process incorrect data about you, + * right to deletion, unless exceptions apply as to why we are still storing the data, for example, retention obligations or limitation periods + * right to restriction of processing, + * right to withdraw consent to data processing at any time, + * right to object to processing in the public or legitimate interest, + * right to data portability, + * right to lodge a complaint with a data protection supervisory authority if you believe that we are not processing your data properly. The State Commissioner for Data Protection and Freedom of Information in Nordrhein-Westfalen is responsible in our case. However, if you are in another federal state or not in Germany, you can also contact the data protection authority there. + + ## What we do not do with your data + + We do not collect any other data than what is needed to provide you the service. + + We do not, in any way, process, analyze your behavior or personal characteristics to create profiles about you or your usage of the services. We have no advertisements or business relationships with advertisers. + + We do not sell your data to any third party. + + We do not share your data to any third party unless in case of federated services which requires certain data to be shared in order to operate (e.g. other email service provider needs to know your email address to be able to deliver emails). + + We do not require any additional information that is not crucial for the operation of the service (we do not ask for phone numbers, private personal data, home address). + + We do not read/look nor process your personal data, emails, files, etc., stored on our servers unless needed for providing the service, troubleshooting purposes or under suspicion of breaking our Terms Of Services in which case we ask for prior permission from you or inform you afterwards of all actions taken against the account in the transparency report addressed to account holder. + + ## Privacy Policy per service + + ### Cloud + + Our cloud runs Nextcloud. + + This service requires login with pub.solar credentials. + + Everything (files, calendars, contacts, news, tasks, bookmarks, etc.) is stored unencrypted in a database, unless an application provides external encryption (none so far). This is a limitation of the software we are utilizing for this service (Nextcloud). + + We do not currently encrypt files when you upload them because we've had some bad experiences with dataloss incurred through end-to-end encryption. + + Server logs, which store information such as, but not limited to, your IP address, your username, an app currently used, error messages and User Agent, are stored for a period of 24 hours after which they are deleted from the server. No backup of log files is created. Logs are kept to prevent brute-force attacks on accounts and to provide quick insight when debugging issues. + + ### Git + + This service requires login with pub.solar credentials. + + Server logs, which store information such as, but not limited to, your IP address, your username, error messages and User Agent, are stored for a period of 24 hours after which they are deleted from the server. No backup of log files is created. Logs are kept to prevent brute-force attacks on accounts and to provide quick insight when debugging issues. + + All git data such as, but not limited to, usernames, email addresses, messages, code, files, versions, pull requests, etc., are stored on the server in the database as is (plain-text). + + ### Matrix + + This service requires login with pub.solar credentials. + + Server logs, which store information such as, but not limited to, your IP address, your username, error messages and User Agent, are stored for a period of 24 hours after which they are deleted from the server. No backup of log files is created. Logs are kept to prevent brute-force attacks on accounts and to provide quick insight when debugging issues. + + "Matrix" is an open, decentralized communication service for real-time communication. It enables members of pub.solar n.e.V., as well as other interested parties, to communicate with other users of this server as well as other Matrix users of federated Matrix servers via chat and audio/video telephony by means of a Matrix account. + + ### Mastodon + + This service requires login with pub.solar credentials. + + Basic account information: If you register on this server, you may be asked to enter a username, an e-mail address and a password. You may also enter additional profile information such as a display name and biography, and upload a profile picture and header image. The username, display name, biography, profile picture and header image are always listed publicly. + + Posts, following and other public information: The list of people you follow is listed publicly, the same is true for your followers. When you submit a message, the date and time is stored as well as the application you submitted the message from. Messages may contain media attachments, such as pictures and videos. Public and unlisted posts are available publicly. When you feature a post on your profile, that is also publicly available information. Your posts are delivered to your followers, in some cases it means they are delivered to different servers and copies are stored there. When you delete posts, this is likewise delivered to your followers. The action of reblogging or favouriting another post is always public. + + Direct and followers-only posts: All posts are stored and processed on the server. Followers-only posts are delivered to your followers and users who are mentioned in them, and direct posts are delivered only to users mentioned in them. In some cases it means they are delivered to different servers and copies are stored there. We make a good faith effort to limit the access to those posts only to authorized persons, but other servers may fail to do so. Therefore it's important to review servers your followers belong to. You may toggle an option to approve and reject new followers manually in the settings. Please keep in mind that the operators of the server and any receiving server may view such messages, and that recipients may screenshot, copy or otherwise re-share them. Do not share any sensitive information over Mastodon. + + IPs and other metadata: When you log in, we record the IP address you log in from, as well as the name of your browser application. All the logged in sessions are available for your review and revocation in the settings. The latest IP address used is stored for up to 12 months. We also may retain server logs which include the IP address of every request to our server. + + ## References/License + + We have created the basic structure of this data protection information with the help of [DS-GVO.clever-Tools](https://www.baden-wuerttemberg.datenschutz.de/ds-gvo.clever/) and adapted it to our needs. We have also used parts of [Datenschutzerklärung der TU-Dresden](https://doc.matrix.tu-dresden.de/privacy/) and adjusted them accordingly. Text is licensed [CC BY-SA 4.0](https://creativecommons.org/licenses/by-sa/4.0/deed.de). diff --git a/services.yml b/services.yml new file mode 100644 index 0000000..6547b95 --- /dev/null +++ b/services.yml @@ -0,0 +1,17 @@ +layout: layouts/default.tsx + +title: Our services +showServices: true + +content: | + # Our services + + This page gives an overview of the services we host. We give some information regarding the support status and privacy of each service. + + * [Nextcloud](#nextcloud) + * [Mastodon](#mastodon) + * [Matrix](#matrix) + * [Forgejo / git](#forgejo) + * [Mailman](#mailman) + * [Wiki](#wiki) + * [Searx](#searx)