From 7d60822c017d22503c549c4e18d90894057cbde0 Mon Sep 17 00:00:00 2001 From: Tomodachi94 Date: Sat, 22 Jun 2024 16:41:37 -0700 Subject: [PATCH 1/3] README.md: remove role members list This list can quickly fall out-of-sync and is an extra thing to maintain. I replaced this with short descriptions of the roles, combined with links to the canonical list of members and group permissions. --- README.md | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 073b1db..6926420 100644 --- a/README.md +++ b/README.md @@ -47,20 +47,8 @@ https://matrix.to/#/#wiki:nixos.org ## Roles -Currently, the users having priviledged roles on the wiki are: - -### Administrators -- [Mic92](https://github.com/Mic92/) -- [JulienMalka](https://github.com/JulienMalka) -- [Lassulus](https://github.com/lassulus/) -- [samueldr](https://github.com/samueldr/) - -### Moderators -- [Hexa](https://github.com/mweinelt) -- [Ryantm](https://github.com/ryantm/) - -### Trusted users (can delete pages) -- [0x4A6F](https://github.com/0x4A6F) -- [jopejoe1](https://github.com/jopejoe1) -- [Artturin](https://github.com/Artturin) -- [Klinger](https://discourse.nixos.org/u/klinger) +Various roles are present on the wiki: +* Bureaucrats can assign roles to others. ([members](https://wiki.nixos.org/w/index.php?title=Special:ListUsers&group=bureaucrat), [permissions](https://wiki.nixos.org/wiki/Special:ListGroupRights#bureaucrat)) +* Administrators can perform almost all restricted actions. ([members](https://wiki.nixos.org/w/index.php?title=Special:ListUsers&group=sysop), [permissions](https://wiki.nixos.org/wiki/Special:ListGroupRights#sysop)) +* Moderators can perform a limited subset of restricted actions. ([members](https://wiki.nixos.org/w/index.php?title=Special:ListUsers&group=moderator), [permissions](https://wiki.nixos.org/wiki/Special:ListGroupRights#moderator)) +* Trusted users can perform page deletions. ([members](https://wiki.nixos.org/w/index.php?title=Special:ListUsers&group=trusted), [permissions](https://wiki.nixos.org/wiki/Special:ListGroupRights#trusted)) From e5a845c6ae6d63d99feda51e57ab4938413462db Mon Sep 17 00:00:00 2001 From: Tomodachi94 Date: Sat, 22 Jun 2024 16:54:53 -0700 Subject: [PATCH 2/3] README.md: fix minor spelling/grammar/etc. --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 6926420..6b30d55 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Checkout [./targets/nixos-wiki.nixos.org]() for an example terraform deployment ## Downloading a dump of the wiki This is useful if you want to run your own instance. -Every day an xml dump is updated here: +Every day an XML dump is updated here: https://wiki.nixos.org/wikidump.xml.zst @@ -31,13 +31,13 @@ $ umount /tmp/restore/ ## FAQ: -### When logging in with "Github auth", the app shows "Act on your behalf" as a permission. +### When logging in with "GitHub auth", the app shows "Act on your behalf" as a permission. We created the Oauth app with read-only access and minimal permissions: ![](./oauth-permissions.png) -Unfortunally GitHub mis-represents this information. +Unfortunately, GitHub misrepresents this information. Read more about this issue here: https://github.com/orgs/community/discussions/37117 ## Join our Matrix From de7e248732be4829161538dfccb323173bfcad01 Mon Sep 17 00:00:00 2001 From: Tomodachi94 Date: Sat, 22 Jun 2024 17:01:12 -0700 Subject: [PATCH 3/3] README.md: expand introduction --- README.md | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 6b30d55..3030ea7 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ # nixos-wiki-infra -This project contains the setup of https://wiki.nixos.org +This project contains the setup of [the official NixOS Wiki (wiki.nixos.org)](https://wiki.nixos.org). + +Additionally, [this project's GitHub Issues](https://github.com/NixOS/nixos-wiki-infra/issues) host a space for coordination and discussion of wiki activities, in tandem with [the Matrix channel `#wiki:nixos.org`](https://matrix.to/#/#wiki:nixos.org). ## Examples @@ -40,11 +42,6 @@ We created the Oauth app with read-only access and minimal permissions: Unfortunately, GitHub misrepresents this information. Read more about this issue here: https://github.com/orgs/community/discussions/37117 -## Join our Matrix - -https://matrix.to/#/#wiki:nixos.org - - ## Roles Various roles are present on the wiki: