From b5e39c3d19f55092fb19a5670e161738104a200b Mon Sep 17 00:00:00 2001 From: Benjamin Bach Date: Mon, 24 Jul 2023 01:26:03 +0200 Subject: [PATCH 1/3] English translations of a lot of stuff, hopefully everything! --- content/_index.en.md | 47 ++++++++++-- content/about.en.md | 17 ++++- content/membership.da.md | 4 +- content/membership.en.md | 27 ++++++- content/rights.en.md | 11 +++ content/services/gitea.en.md | 18 +++++ content/services/hedgedoc.da.md | 2 +- content/services/hedgedoc.en.md | 22 ++++++ content/services/mastodon.en.md | 14 ++++ content/services/matrix.da.md | 2 +- content/services/matrix.en.md | 22 ++++++ content/services/nextcloud.en.md | 15 ++++ content/services/passit.en.md | 14 ++++ content/services/privatebin.en.md | 17 +++++ content/services/rallly.en.md | 15 ++++ data/badges/da/status.yaml | 4 + data/badges/en/badges.yaml | 75 +++++++++++++++++++ data/badges/en/status.yaml | 26 +++++++ .../datacoop2020/assets/static/css/style.scss | 2 +- .../datacoop2020/layouts/partials/status.html | 4 +- 20 files changed, 341 insertions(+), 17 deletions(-) create mode 100644 content/rights.en.md create mode 100644 content/services/gitea.en.md create mode 100644 content/services/hedgedoc.en.md create mode 100644 content/services/mastodon.en.md create mode 100644 content/services/matrix.en.md create mode 100644 content/services/nextcloud.en.md create mode 100644 content/services/passit.en.md create mode 100644 content/services/privatebin.en.md create mode 100644 content/services/rallly.en.md create mode 100644 data/badges/en/badges.yaml create mode 100644 data/badges/en/status.yaml diff --git a/content/_index.en.md b/content/_index.en.md index d5cb86d..c5d87b7 100644 --- a/content/_index.en.md +++ b/content/_index.en.md @@ -1,13 +1,44 @@ --- -title: Velcome to data.coop +title: Welcome to data.coop --- -We are an association whose purpose is to look after the members' data. Our core principles are +data.coop is a cooperative, which owns and operates a digital infrastructure for its members. Our fundamental vision is to protect our members' data. -- Privacy -- Encryption -- Decentralization -- Zero-knowledge +Our core principles are: + +
+
+ + Privacy +
+
+ We protect member data together. + We do not share them for profit. + Data is always encrypted in transit. +
+
+ + Encryption +
+
+ We provide secure services that are thoroughly declared. +
+
+ + Decentralization +
+
+ Our services exist together with other decentralized counterparts. +
+
+ + Zero-knowledge +
+
+ Whenever possible, we ensure that a system administrator does not have technical ability to access member data. +
+
+ +From these core principles, we will continue to develop services for members. +The idea is that we trust each other more than any Big Tech operators, such as Google, Microsoft or Facebook. -Based on the core principles, over time we will provide online services to members. The main idea is, -that we basically rely more on each other than on the "big ones" such as Google, Microsoft or Facebook. diff --git a/content/about.en.md b/content/about.en.md index fcdb41c..4ad8564 100644 --- a/content/about.en.md +++ b/content/about.en.md @@ -2,7 +2,20 @@ title: "About" --- -## This Theme +**data.coop** is an association and a cooperative. -Thanks for visiting this theme demo. If you're interested, checkout my other stuff over at +We - the members of the cooperative - own our own data. +In practice, this means that we: + + * Own our own hardware + * We only use Open Source Software + +The cooperative owns 2 rack services, of which one of them is currently in use. + +You can find us here: + + * Matrix: [#data.coop:data.coop](https://matrix.to/#/#data.coop:data.coop) + * IRC (Libera.chat): #data.coop + * Our [Gitea server](https://git.data.coop/data.coop/) + * In the Fediverse/Mastodon: @datacoop@data.coop diff --git a/content/membership.da.md b/content/membership.da.md index 5f45c2c..817c312 100644 --- a/content/membership.da.md +++ b/content/membership.da.md @@ -6,10 +6,10 @@ title: Bliv medlem over foreningens generelle drift og hvordan data skal forvaltes. Dette sker som i en helt klassisk forening i henhold til vores vedtægter på den årlige generalforsamling. -Du bør læse vores [vedtægter](/rights/) og især vores [Acceptable Usage Policy (AUP)](https://git.data.coop/data.coop/dokumenter/src/branch/master/Acceptable%20Usage%20Policy.md) inden du melder dig ind. Har du spørgsmål, kan du finde os på [Matrix og IRC](/about/) eller [sende en e-mail til bestyrelsen](mailto:board@data.coop). +Du bør læse vores [vedtægter](/rights/) og især vores [Acceptable Usage Policy (AUP)](https://git.data.coop/data.coop/dokumenter/src/branch/main/Acceptable%20Usage%20Policy.md) inden du melder dig ind. Har du spørgsmål, kan du finde os på [Matrix og IRC](/about/) eller [sende en e-mail til bestyrelsen](mailto:board@data.coop). Du bliver medlem ved at overføre penge til vores konto og sende en email til -vores kasserer, [reynir@data.coop](mailto:reynir@data.coop), med dit navn. +vores kasserer, [benjaoming@data.coop](mailto:benjaoming@data.coop), med dit navn. * Reg. 8401 (Merkur) * Kontonr. 1016866 diff --git a/content/membership.en.md b/content/membership.en.md index aefeb9a..5b0ea00 100644 --- a/content/membership.en.md +++ b/content/membership.en.md @@ -2,4 +2,29 @@ title: Become a member --- -:P +[data.coop](https://data.coop) is a cooperative build as a democratic association. +The members decide on the association's operations and how data should be governed. +This happens as in any classic association: Through legal statutes and formal assemblies. + +You need to read our [statues](/rights/) and our +[Acceptable Usage Policy (AUP)](https://git.data.coop/data.coop/dokumenter/src/branch/main/Acceptable%20Usage%20Policy.md) +before becoming a member. +If you have questions, you can find us on [Matrix og IRC](/about/) or [send an email to the board](mailto:board@data.coop). + +*English speakers:* We would love to have you as a member. +Many parts of this organization are already in English, +but our legal documents are not (yet). +Please write us if you have any questions. + +You become a member by transferring the annual membership fee to our account *and* sending an email +to our treasurer [benjaoming@data.coop](mailto:benjaoming@data.coop), containing your name. + +* Reg. 8401 (Merkur) +* Kontonr. 1016866 +* Text: First name + last name + +Annual membership: **DKK 300** (or more)\ +Reduced annual membership (students/unemployed): **DKK 50** + +The membership period counts from *association year* that you sign up in. +That means that a membership is valid until and including the next general assembly. diff --git a/content/rights.en.md b/content/rights.en.md new file mode 100644 index 0000000..180111e --- /dev/null +++ b/content/rights.en.md @@ -0,0 +1,11 @@ +--- +title: Legal statutes of data.coop +--- + +data.coop does not have a translation of its Danish statutes. + +The reason is that we cannot guarantee that the democratic process that established the Danish statutes would understand an English translation in the same way. + +While we work out this challenge, +we encourage that you use some auto-generated translation of the [Danish statutes](/rights/) +and ask us questions about anything that would seem unclear. diff --git a/content/services/gitea.en.md b/content/services/gitea.en.md new file mode 100644 index 0000000..fccafc3 --- /dev/null +++ b/content/services/gitea.en.md @@ -0,0 +1,18 @@ +--- +layout: page +title: Gitea +service_badges: + stability: positive + secure_connection: positive + anonymity: partial + encrypted_storage: negative + zero_knowledge: negative + backup: positive + logging: negative +--- + +If you write code or other types of texts that need revisioning, +you can use this fantastic Git platform + +The platform is open for all data.coop members, +and you can ask for accounts for non-members. diff --git a/content/services/hedgedoc.da.md b/content/services/hedgedoc.da.md index f2ccd58..b982091 100644 --- a/content/services/hedgedoc.da.md +++ b/content/services/hedgedoc.da.md @@ -11,7 +11,7 @@ service_badges: logging: negative --- -Tag tifælgdige noter eller skriv dokumenter i Markdown: HedgeDoc kan bruges til mange ting. +Tag tilfældige noter eller skriv dokumenter i Markdown: HedgeDoc kan bruges til mange ting. De fleste bruger HedgeDoc til hurtigt at tage noter eller starte dokumenter. Man kan skrive samtidig. diff --git a/content/services/hedgedoc.en.md b/content/services/hedgedoc.en.md new file mode 100644 index 0000000..b128359 --- /dev/null +++ b/content/services/hedgedoc.en.md @@ -0,0 +1,22 @@ +--- +layout: page +title: HedgeDoc +service_badges: + stability: positive + connection_security: positive + connection_anonymous: partial + storage_encrypted: negative + zero_knowledge: partial + storage_backup: positive + logging: negative +--- + +Take random notes or write full documents in Markdown: HedgeDoc can be used for many things. + +Most people use HedgeDoc for quickly making notes are bootstrapping documents. +You can collaborate in real-time with others. +And the results are pretty! + +There are also several extensions, for instance for Mermaid diagrams. + +Read more on the [HedgeDoc website](https://hedgedoc.org/). diff --git a/content/services/mastodon.en.md b/content/services/mastodon.en.md new file mode 100644 index 0000000..5900ae8 --- /dev/null +++ b/content/services/mastodon.en.md @@ -0,0 +1,14 @@ +--- +layout: page +title: Mastodon +service_badges: + stability: positive + connection_security: positive + connection_anonymous: negative + storage_encrypted: negative + zero_knowledge: partial + storage_backup: positive + logging: negative +--- + +Share cat photos and memes and see what other interesting people are doing. diff --git a/content/services/matrix.da.md b/content/services/matrix.da.md index 1f92dea..8767c75 100644 --- a/content/services/matrix.da.md +++ b/content/services/matrix.da.md @@ -11,7 +11,7 @@ service_badges: logging: negative --- -Matrix er en chat-server, som kan rigtig mange ting. Den kan bruges som alternativ til f.eks. Slack, Dscord, IRC og meget andet. +Matrix er en chat-server, som kan rigtig mange ting. Den kan bruges som alternativ til f.eks. Slack, Discord, IRC og meget andet. Vi har også vores egen hostede version af reference-klienten Element på [element.data.coop](https://element.data.coop/). Du kan bruge Matrix til at kommunikere med andre på hele Matrix-netværket, diff --git a/content/services/matrix.en.md b/content/services/matrix.en.md new file mode 100644 index 0000000..623914c --- /dev/null +++ b/content/services/matrix.en.md @@ -0,0 +1,22 @@ +--- +layout: page +title: Matrix +service_badges: + stability: positive + connection_security: positive + connection_anonymous: negative + storage_encrypted: positive + zero_knowledge: partial + storage_backup: positive + logging: negative +--- + +Matrix is a chat server that's capable of a lot of things. +It can be used as an alternative for Slack, Discord, IRC and lots more. +We have our own hosted version of its reference client Element available at [element.data.coop](https://element.data.coop/). + +You can use Matrix for communicating with the entire Matrix network, +not just data.coop members. + +Matrix is a gigantic platform which enables a wide range of communication types. +It supports channels, live videos and chat. diff --git a/content/services/nextcloud.en.md b/content/services/nextcloud.en.md new file mode 100644 index 0000000..64c166a --- /dev/null +++ b/content/services/nextcloud.en.md @@ -0,0 +1,15 @@ +--- +layout: page +title: Nextcloud +service_badges: + stability: positive + connection_security: positive + connection_anonymous: partial + storage_encrypted: negative + zero_knowledge: negative + storage_backup: positive + logging: negative +--- + +Store your files, calendar, contacts and many other things in the local cloud. +Access from all your devices. diff --git a/content/services/passit.en.md b/content/services/passit.en.md new file mode 100644 index 0000000..1f44f84 --- /dev/null +++ b/content/services/passit.en.md @@ -0,0 +1,14 @@ +--- +layout: page +title: Passit +service_badges: + stability: positive + connection_security: positive + connection_anonymous: positive + storage_encrypted: positive + zero_knowledge: partial + storage_backup: positive + logging: positive +--- + +Helps you remember your strong, unique passwords for websites and applications. diff --git a/content/services/privatebin.en.md b/content/services/privatebin.en.md new file mode 100644 index 0000000..dbbb345 --- /dev/null +++ b/content/services/privatebin.en.md @@ -0,0 +1,17 @@ +--- +layout: page +title: PrivateBin +service_badges: + stability: positive + connection_security: positive + connection_anonymous: partial + storage_encrypted: positive + zero_knowledge: positive + storage_backup: positive + logging: negative +--- + +Share a secret through a unique and secret link. +You can add a password and make the secret expire and delete itself. + +This service is open and does not require a login. diff --git a/content/services/rallly.en.md b/content/services/rallly.en.md new file mode 100644 index 0000000..fe2eb13 --- /dev/null +++ b/content/services/rallly.en.md @@ -0,0 +1,15 @@ +--- +layout: page +title: Rallly +service_badges: + stability: positive + connection_security: positive + connection_anonymous: partial + storage_encrypted: negative + zero_knowledge: negative + storage_backup: positive + logging: negative +--- + +Rally makes it easy to find a date for an event with your friends, family or any other group of people. +It's a lot like Doodle, but better! diff --git a/data/badges/da/status.yaml b/data/badges/da/status.yaml index b425a04..543b226 100644 --- a/data/badges/da/status.yaml +++ b/data/badges/da/status.yaml @@ -1,21 +1,25 @@ status: positive: + order: 1 name: positiv description: Tjenesten lever op til kravene til det badget dækker over. css_class: "positive" partial: + order: 2 name: delvis description: Tjenesten lever delvist op til det badget dækker over. Dog i en sådan grad at vi mener det er værd at fremhæve. css_class: "partial" negative: + order: 3 name: negativ description: Tjenesten lever ikke op til det badget dækker over. css_class: "negative" none: + order: 4 name: uoplyst description: Dette badge er udefineret for denne tjeneste. Dette skyldes sansynligvis, at vi mangler en klar redegørelse. css_class: "none" diff --git a/data/badges/en/badges.yaml b/data/badges/en/badges.yaml new file mode 100644 index 0000000..6c61932 --- /dev/null +++ b/data/badges/en/badges.yaml @@ -0,0 +1,75 @@ +# This determines which badges are active and the order to display them in +active_badges: + - stability + - secure_connection + - encrypted_storage + - zero_knowledge + - backup + - logging + - anonymity + +badges: + stability: + name: Stability + description: | + *Service is always available.* + + This badge describes how stable the service is. For instance if there is a big or small risk that the service may suffer from outages or loss of data. Immediately after launching a service, it might be considered less stable than after it has matured through long-time tests and usage. + + icon: stable.svg + + secure_connection: + name: Secure connection + description: | + *Data can only be seen by you and the service.* + + The traffic between you and the service is encrypted. For instance, the browser will display a padlock in the address bar when the connection is encrypted. This means that it's only you and the service that can see transferred data. + + icon: secure-connection.svg + + encrypted_storage: + name: Encrypted storage + description: | + The service stores data in an ecrypted way, for instance on an encrypted storage media. + This ensures that the data is protected in case of a physical breach of security, + since it's only the system administrator who has the encryption key that can decrypt storage media. + icon: encrypted-data-storage.svg + + zero_knowledge: + name: Zero-knowledge + description: | + *You have the only key.* + + In this case, data.coop's system administrator cannot access data. + There is no "main key". This provides more security, but it also means that data will be lost if you lose the key. + + icon: zero-knowledge.svg + + backup: + name: Backup + description: | + The service's data is backed up frequently in order to minimize damages from technical outages or cyber attacks. + Backups are stored in another physical location than the server. + icon: backup.svg + + # TODO: We should describe how we label logging that isn't fully documented as configured. + logging: + name: Logging + description: | + Technical logging is primarily about *meta data*, which can be understood as *data about data*. + Who does what and when? On one side, it's relevant for system administrators to see why a server is overloaded, but as with all data this can be abused. + For instance, it can be used to prove that what a user was doing at a specific time. + + Note that "positive" status for logging means that the service is performing an expected amount of *minimal* logging of meta data. + We strive to document this data for every service. A "negative" status means that unnecessary amounts of logging take place. + icon: logging.svg + + anonymity: + name: Anonymous access + description: | + Services with anonymous access can be used without registration and authentication. + This means that the service can be used anonymously without sharing personal information. + Some services may have limited access for un-registered users. + This may be relevant for instance for a service where a registered user can upload a file + and an unregistered user can download the file. + icon: anonymous-access.svg diff --git a/data/badges/en/status.yaml b/data/badges/en/status.yaml new file mode 100644 index 0000000..455f1e1 --- /dev/null +++ b/data/badges/en/status.yaml @@ -0,0 +1,26 @@ +status: + + positive: + order: 1 + name: positive + description: Service satisfies the requirements of the badge. + css_class: "positive" + + partial: + order: 2 + name: partial + description: Service partially satisfies the requirements of the badge. But to an extend that we find worth noting. + css_class: "partial" + + negative: + order: 3 + name: negative + description: Service does not live up to badge requirements. + css_class: "negative" + + none: + order: 4 + name: undefined + description: The requirements of the badge are currently undefined. This is likely due to a lack of analysis and full understanding. + css_class: "none" + diff --git a/themes/datacoop2020/assets/static/css/style.scss b/themes/datacoop2020/assets/static/css/style.scss index d90dd48..7d60727 100644 --- a/themes/datacoop2020/assets/static/css/style.scss +++ b/themes/datacoop2020/assets/static/css/style.scss @@ -239,7 +239,7 @@ aside > footer img:hover { grid-template-columns: 100%; } - align-items: start; + align-items: center; gap: 20px; dt { vertical-align: top; diff --git a/themes/datacoop2020/layouts/partials/status.html b/themes/datacoop2020/layouts/partials/status.html index d7f4072..207a45a 100644 --- a/themes/datacoop2020/layouts/partials/status.html +++ b/themes/datacoop2020/layouts/partials/status.html @@ -1,8 +1,10 @@

{{ i18n "status_headline" }}

-{{ range $.Site.Data.badges.da.status.status }} +{{- $translated_status := index $.Site.Data.badges .Lang }} + +{{ range sort $translated_status.status.status "order" "asc" }}
{{ title .name }}
-- 2.43.4 From 3884e8c8aeba6636fd0e4cb9e33da43f9385d29e Mon Sep 17 00:00:00 2001 From: Benjamin Bach Date: Mon, 24 Jul 2023 01:43:35 +0200 Subject: [PATCH 2/3] Updates and typo fixes --- content/_index.en.md | 2 +- content/about.en.md | 6 +++--- content/membership.en.md | 12 +++++++----- data/badges/en/badges.yaml | 4 ++-- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/content/_index.en.md b/content/_index.en.md index c5d87b7..910e5c8 100644 --- a/content/_index.en.md +++ b/content/_index.en.md @@ -32,7 +32,7 @@ Our core principles are:
- Zero-knowledge + Zero knowledge
Whenever possible, we ensure that a system administrator does not have technical ability to access member data. diff --git a/content/about.en.md b/content/about.en.md index 4ad8564..93f9042 100644 --- a/content/about.en.md +++ b/content/about.en.md @@ -8,10 +8,10 @@ We - the members of the cooperative - own our own data. In practice, this means that we: - * Own our own hardware - * We only use Open Source Software + * ...own our own hardware + * ...only use Open Source Software -The cooperative owns 2 rack services, of which one of them is currently in use. +The cooperative owns 2 rack servers, of which one is in use and one is spare. You can find us here: diff --git a/content/membership.en.md b/content/membership.en.md index 5b0ea00..596ce10 100644 --- a/content/membership.en.md +++ b/content/membership.en.md @@ -2,11 +2,11 @@ title: Become a member --- -[data.coop](https://data.coop) is a cooperative build as a democratic association. +[data.coop](https://data.coop) is a cooperative established as a democratic association. The members decide on the association's operations and how data should be governed. -This happens as in any classic association: Through legal statutes and formal assemblies. +Governance resembles any classic association: We have legal statutes and formal general assemblies. -You need to read our [statues](/rights/) and our +You need to read our [statutes](/rights/) and our [Acceptable Usage Policy (AUP)](https://git.data.coop/data.coop/dokumenter/src/branch/main/Acceptable%20Usage%20Policy.md) before becoming a member. If you have questions, you can find us on [Matrix og IRC](/about/) or [send an email to the board](mailto:board@data.coop). @@ -16,9 +16,11 @@ Many parts of this organization are already in English, but our legal documents are not (yet). Please write us if you have any questions. -You become a member by transferring the annual membership fee to our account *and* sending an email +You become a member by paying the annual membership fee to our account *and* sending an email to our treasurer [benjaoming@data.coop](mailto:benjaoming@data.coop), containing your name. +Currently, the only option is to wire a bank payment to our Danish bank account: + * Reg. 8401 (Merkur) * Kontonr. 1016866 * Text: First name + last name @@ -27,4 +29,4 @@ Annual membership: **DKK 300** (or more)\ Reduced annual membership (students/unemployed): **DKK 50** The membership period counts from *association year* that you sign up in. -That means that a membership is valid until and including the next general assembly. +That means that a membership is valid from when it's paid and until and including the next general assembly. diff --git a/data/badges/en/badges.yaml b/data/badges/en/badges.yaml index 6c61932..9d01e2d 100644 --- a/data/badges/en/badges.yaml +++ b/data/badges/en/badges.yaml @@ -36,7 +36,7 @@ badges: icon: encrypted-data-storage.svg zero_knowledge: - name: Zero-knowledge + name: Zero knowledge description: | *You have the only key.* @@ -69,7 +69,7 @@ badges: description: | Services with anonymous access can be used without registration and authentication. This means that the service can be used anonymously without sharing personal information. - Some services may have limited access for un-registered users. + Some services may have limited access for unregistered users. This may be relevant for instance for a service where a registered user can upload a file and an unregistered user can download the file. icon: anonymous-access.svg -- 2.43.4 From 4941f363e3512d5e50138c41cd09bae332b4b39b Mon Sep 17 00:00:00 2001 From: Benjamin Bach Date: Mon, 24 Jul 2023 20:37:08 +0200 Subject: [PATCH 3/3] Fixes #1 and fixes #2 --- content/about.en.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/content/about.en.md b/content/about.en.md index 93f9042..91bbc59 100644 --- a/content/about.en.md +++ b/content/about.en.md @@ -4,12 +4,12 @@ title: "About" **data.coop** is an association and a cooperative. -We - the members of the cooperative - own our own data. +We — the members of the cooperative — own our own data. -In practice, this means that we: +In practice, this means that: - * ...own our own hardware - * ...only use Open Source Software + * We own our own hardware. + * We only use Open Source Software. The cooperative owns 2 rack servers, of which one is in use and one is spare. -- 2.43.4