From 03b2aed72d25060ef163fac30e193ff096184e34 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <silvan.mosberger@tweag.io>
Date: Tue, 26 Nov 2024 00:09:23 +0100
Subject: [PATCH] Update org owners, define authority and responsibilities

---
 .github/CODEOWNERS       |  3 ++-
 README.md                |  1 +
 doc/github-org-owners.md | 44 ++++++++++++++++++++++++++++++++++++++++
 doc/github.md            | 13 +-----------
 4 files changed, 48 insertions(+), 13 deletions(-)
 create mode 100644 doc/github-org-owners.md

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index aeb39f6..81caef1 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -14,7 +14,8 @@
 
 /doc/org-repo.md @NixOS/steering
 /doc/discourse.md @NixOS/steering
-/doc/github.md @NixOS/steering
+/doc/github.md @infinisil @lassulus @tomberek @winterqt @zimbatm
+/doc/github-org-owners.md @NixOS/steering
 /doc/matrix.md @NixOS/steering
 /doc/moderation.md @NixOS/steering
 /doc/nixos-releases.md @NixOS/steering
diff --git a/README.md b/README.md
index 1cb9fb6..c9f5c12 100644
--- a/README.md
+++ b/README.md
@@ -18,6 +18,7 @@ For contributing see [here](./CONTRIBUTING.md).
 - [Org repo](./doc/org-repo.md)
 - [Discourse](./doc/discourse.md)
 - [GitHub](./doc/github.md)
+  - [Org owners](./doc/github-org-owners.md)
 - [Matrix](./doc/matrix.md)
 - [Moderation](./doc/moderation.md)
 - [NixOS releases](./doc/nixos-releases.md)
diff --git a/doc/github-org-owners.md b/doc/github-org-owners.md
new file mode 100644
index 0000000..a1ddc6f
--- /dev/null
+++ b/doc/github-org-owners.md
@@ -0,0 +1,44 @@
+## GitHub org owners
+
+The following people are owners of the GitHub Organisation:
+<!-- Keep this in sync with the code owners of github.md! -->
+- [@infinisil](https://github.com/infinisil)
+- [@lassulus](https://github.com/lassulus)
+- [@tomberek](https://github.com/tomberek)
+- [@winterqt](https://github.com/winterqt)
+- [@zimbatm](https://github.com/zimbatm)
+
+For any GitHub-related needs, you can reach out to the org owners by either:
+- [Creating an issue in this repository](https://github.com/NixOS/org/issues/new).
+- Messaging in the [Github org owners help desk Matrix room](https://matrix.to/#/#org_owners:nixos.org).
+
+### Authority and processes
+
+All org owners can individually take care of implementing:
+- Decisions by bodies that have the authority to make GitHub org changes such as:
+  - Arbitrary decisions by the Steering Committee.
+  - Moderation decisions by the moderation team.
+  - Changes from approved RFCs.
+- Low-impact changes, such as:
+  - Adding new org members to allow review requests.
+  - Creating new unprivileged Nixpkgs teams for mention.
+  - Updating repository meta information.
+  - Taking care of occasional maintenance of otherwise unmaintained repositories.
+
+With approval by at least 2 org owners, they can take care of implementing
+higher-impact changes that are _not controversial_, such as:
+- Administer unmaintained repos, such as:
+  - Giving commit access to trusted people that offer maintenance.
+  - Archiving if appropriate.
+- Create GitHub apps to unblock automation.
+
+Org owners have no authority to make other changes.
+
+### Responsibilities
+
+- Receive and process requests.
+  - Each request should land in at least 2 org owners inboxes of some kind.
+- Ensure that all non-trivial and non-sensitive org owner actions are
+  publicly logged in either of the above channels.
+- Escalate requests outside the given authority to the Steering Committee.
+- Maintain the [GitHub organisation documentation](./github.md).
diff --git a/doc/github.md b/doc/github.md
index 22f92f8..cc013f0 100644
--- a/doc/github.md
+++ b/doc/github.md
@@ -2,18 +2,7 @@
 
 The [NixOS GitHub organisation](https://github.com/nixos) and all its repositories is part of the [official resources](./resources.md).
 
-A very small number of people are owners of this GitHub Organisation, and have ultimate permissions over it:
-- [@domenkozar](https://github.com/domenkozar)
-- [@edolstra](https://github.com/edolstra)
-- [@garbas](https://github.com/garbas)
-- [@zimbatm](https://github.com/zimbatm)
-
-Furthermore, there is an interim owner to help out:
-- [@lassulus](https://github.com/lassulus)
-
-This interim owner is responsible for receiving requests to change anything about the GitHub organisation in the [Github org owners help desk Matrix room](https://matrix.to/#/#org_owners:nixos.org), and either acting upon them or forwarding them to the right person.
-
-Over 200 people in the organisation have permissions over only certain parts.
+The org owners documentation is [here](./github-org-owners.md).
 
 ## Repositories