From 4cdf0208d3730e055f126eff3e5d15d0487828f1 Mon Sep 17 00:00:00 2001 From: Leo Gavilieau Date: Thu, 1 Jun 2023 16:45:43 +0200 Subject: [PATCH] feat: update staff list ~vitorg and ~xmoo are now admins. so we also have to add our PGP keys (mine was already added but vitor's wasn't) --- content/en/staff.md | 41 ++++++++++++++++++--------------- static/media/vitorg.asc | 51 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+), 19 deletions(-) create mode 100644 static/media/vitorg.asc diff --git a/content/en/staff.md b/content/en/staff.md index 3ba18ac..e6da387 100644 --- a/content/en/staff.md +++ b/content/en/staff.md @@ -20,9 +20,9 @@ And also, just because a user has access to a restricted service it doesn't mean ### List of administrators -*Note: This list of admins is scraped from the main website over at [https://vern.cc/admins](https://vern.cc/admins), This list is confirmed to be up-to-date as of May 21st, 2023.* +*Note: This list of admins is scraped from the main website over at [https://vern.cc/admins](https://vern.cc/en/admins), This list is confirmed to be up-to-date as of June 1st, 2023.* -Here is a list of ~vern admins, their contact methods and their websites (if they have any) in no particular order: +Here is a list of ~vern admins, their contact methods and their websites (if they have any), the list is not in any particular order: *For Email and XMPP: replace \[at\] with `@` and (dot) with `.`* @@ -32,20 +32,23 @@ Here is a list of ~vern admins, their contact methods and their websites (if the | ~user | Email | Matrix | XMPP | PGP key | site | |-------|-------|--------|------|---------|------| -| ~cobra | cobra \[at\] vern (dot) cc | @cobra:vern.cc | cobra \[at\] vern (dot) cc | [here](../media/cobra.asc) | [link](https://cobra.vern.cc) | -| ~pjals | pjals \[at\] vern (dot) cc | @pjals:vern.cc | pjals \[at\] vern (dot) cc | [here](../media/pjals.asc) | [pjals.vern.cc](https://pjals.vern.cc) | -| Neopenk| neo \[at\] vern (dot) cc | @neo:vern.cc | neo \[at\] vern (dot) cc | [here](../media/neo.asc) | <none> | - +| ~cobra | cobra [at] vern (dot) cc | @cobra:vern.cc | cobra [at] vern (dot) cc | [here](../media/cobra.asc) | [cobra.vern.cc](https://cobra.vern.cc) | +| ~pjals | pjals [at] vern (dot) cc | @pjals:vern.cc | pjals [at] vern (dot) cc | [here](../media/pjals.asc) | [pjals.vern.cc](https://pjals.vern.cc) | +| Neopenk| neo [at] vern (dot) cc | @neo:vern.cc | neo [at] vern (dot) cc | [here](../media/neo.asc) | <?> | +| ~xmoo | xmoo [at] vern (dot) cc | @xmoo:vern.cc | xmoo [at] vern (dot) cc | [here](../media/xmoo.asc)| [xmoo.vern.cc](https://xmoo.vern.cc) | +|~vitorg| vitorg [at] vern (dot) cc | @vitorg:vern.cc | vitorg [at] vern (dot) cc | [here](../media/vitorg.asc) | [vitorg.vern.cc](https://vitorg.vern.cc) | 2. Backup contact methods If the above contact methods do not work then the admins can be reached at: -| ~user | spare Email | spare Matrix | -|-------|-------------|--------------| -| ~cobra| thecobra \[at\] riseup (dot) net | @pjals:envs.net | -| ~pjals| pjals \[at\] envs (dot) net | @neopenk:matrix.org | -|Neopenk| nanopenk \[at\] riseup (dot) net | @cobra:inetd.xyz | +| ~user | spare Email | spare Matrix | +|-------|-------------|---------------| +| ~cobra| thecobra [at] riseup (dot) net | @pjals:envs.net | +| ~pjals| pjals [at] envs (dot) net | @neopenk:matrix.org | +|Neopenk| nanopenk [at] riseup (dot) net | @cobra:inetd.xyz | +| ~xmoo | xmoo [at] privacyrequired (dot) com | @xorgmoo:matrix.org | +|~vitorg| vitorg [at] tilde (dot) team | @vitorg:kde.org | ## ~vern's Legalese experts{#legal} @@ -60,13 +63,13 @@ These are **NOT** real lawyers, but they are the closest we have to the real dea *Please also include at least one ~vern administrator in the discussion as well. The contact info for ~vern administrators can be found above* -*For email: replace \[at\] with `@` and (dot) with `.`* +*For email: replace [at] with `@` and (dot) with `.`* *Note: The PGP key is used for sensitive emails, [here](https://emailselfdefense.fsf.org/) is quick guide by the Free Software Foundation on how to use it* -| ~user | email | spare email | matrix | PGP key | site | -|-------|-------|-------------|--------|---------|------| -| ~xmoo | xmoo \[at\] vern (dot) cc | xmoo \[at\] privacyrequired (dot) com | @xmoo:vern.cc | [here](../media/xmoo.asc) | [xmoo.vern.cc](https://xmoo.vern.cc) | +| ~user | email | spare email | matrix | spare matrix | PGP key | site | +|-------|-------|-------------|--------|--------------|---------|------| +| ~xmoo | xmoo [at] vern (dot) cc | xmoo [at] privacyrequired (dot) com | @xmoo:vern.cc | @xorgmoo:matrix.org | [here](../media/xmoo.asc) | [xmoo.vern.cc](https://xmoo.vern.cc) | ## ~vern community moderators{#mod} @@ -79,9 +82,9 @@ Community moderators are individuals who are tasked with keeping the community c *Note: The PGP key is used for sensitive emails, [here](https://emailselfdefense.fsf.org/) is quick guide by the Free Software Foundation on how to use it* -| ~user | email | spare email | matrix | PGP key | site | -|-------|-------|-------------|--------|---------|------| -| ~xmoo | xmoo \[at\] vern (dot) cc | xmoo \[at\] privacyrequired (dot) com | @xmoo:vern.cc | [here](../media/xmoo.asc) | [xmoo.vern.cc](https://xmoo.vern.cc) | +| ~user | email | spare email | matrix | spare matrix | PGP key | site | +|-------|-------|-------------|--------|--------------|---------|------| +| ~xmoo | xmoo [at] vern (dot) cc | xmoo [at] privacyrequired (dot) com | @xmoo:vern.cc | @xorgmoo:matrix.org | [here](../media/xmoo.asc) | [xmoo.vern.cc](https://xmoo.vern.cc) | ## ~vern wiki maintainers{#wiki} @@ -98,4 +101,4 @@ Wiki maintainers are tasked with keeping the wiki up-to-date and correcting anyt | ~user | translation(s)| email | spare email | matrix | PGP key | site | |-------|---------------|-------|-------------|--------|---------|------| | ~xmoo |English, Danish|xmoo \[at\] vern (dot) cc | xmoo \[at\] privacyrequired (dot) com | @xmoo:vern.cc | [here](../media/xmoo.asc) | [xmoo.vern.cc](https://xmoo.vern.cc) | -|~vitorg|English, Portuguese (Brazilian)| vitorg \[at\] vern (dot) cc | <?> | @vitorg:vern.cc | <?> | [vitorg.vern.cc](https://vitorg.vern.cc) | +|~vitorg|English, Portuguese (Brazilian)| vitorg \[at\] vern (dot) cc | vitorg [at] tilde (dot) team | @vitorg:vern.cc | <?> | [vitorg.vern.cc](https://vitorg.vern.cc) | diff --git a/static/media/vitorg.asc b/static/media/vitorg.asc new file mode 100644 index 0000000..bdce78c --- /dev/null +++ b/static/media/vitorg.asc @@ -0,0 +1,51 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +=AK6J +-----END PGP PUBLIC KEY BLOCK-----