From 702320750de8938ef79eec7fc28deb43d79a2b22 Mon Sep 17 00:00:00 2001
From: David Runge <dvzrv@archlinux.org>
Date: Sun, 9 May 2021 17:59:14 +0200
Subject: [PATCH] Extend issue templates to set title and be more specific

.gitlab/issue_templates/*.md:
Set the title in all issue templates.
Add an explicit identifier (MODIFY) to all parts of the template where
modification is required by the user.
Extend the main key removal template by more specific steps for the main
key holders and keyring maintainer.
---
 .gitlab/issue_templates/New Main Key.md        |  7 ++++---
 .gitlab/issue_templates/New Packager Key.md    | 11 ++++++-----
 .gitlab/issue_templates/Remove Main Key.md     | 14 +++++++++++---
 .gitlab/issue_templates/Remove Packager Key.md |  7 ++++---
 4 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/.gitlab/issue_templates/New Main Key.md b/.gitlab/issue_templates/New Main Key.md
index a322eee..650a968 100644
--- a/.gitlab/issue_templates/New Main Key.md	
+++ b/.gitlab/issue_templates/New Main Key.md	
@@ -5,6 +5,7 @@ It is used by users with a valid packager key.
 -->
 /assign @allan @anthraxx @bluewind @dvzrv @pierre
 /label ~"new main key"
+/title New main key of <!-- MODIFY: Add new main key holder's username -->
 <!--
 Please do not remove the above quick actions, which automatically label the
 issue and assign relevant users.
@@ -14,9 +15,9 @@ issue and assign relevant users.
 
 ## Details
 
-- Username: <!-- Add the @-prefixed username -->
-- PGP key ID: <!-- Add the "long format" key ID of the new PGP public key here -->
-- Revocation Certificate Holder: <!-- Add the @-prefixed username of the revocation certificate holder -->
+- Username: <!-- MODIFY: Add the @-prefixed username -->
+- PGP key ID: <!-- MODIFY: Add the "long format" key ID of the new PGP public key here -->
+- Revocation Certificate Holder: <!-- MODIFY: Add the @-prefixed username of the revocation certificate holder -->
 
 <!--
 NOTE: Attach the above information as a clearsigned document to this ticket
diff --git a/.gitlab/issue_templates/New Packager Key.md b/.gitlab/issue_templates/New Packager Key.md
index 4eaf6a2..20a7900 100644
--- a/.gitlab/issue_templates/New Packager Key.md	
+++ b/.gitlab/issue_templates/New Packager Key.md	
@@ -6,6 +6,7 @@ when adding a new key for themself.
 -->
 /assign @allan @anthraxx @bluewind @dvzrv @pierre
 /label ~"new packager key"
+/title New packager key of <!-- MODIFY: Add new packager key holder's username -->
 <!--
 Please do not remove the above quick actions, which automatically label the
 issue and assign relevant users.
@@ -15,11 +16,11 @@ issue and assign relevant users.
 
 ## Details
 
-- Username: <!-- Add the @-prefixed username -->
-- PGP key ID: <!-- Add the "long format" key ID of the new PGP public key here -->
-- Sponsors: <!-- Add the @-prefixed usernames of the sponsors -->
-- Application: <!-- Add link to application, if this is the key of a new packager, else remove -->
-- Results: <!-- Add link to results of application, if this is the key of a new packager, else remove -->
+- Username: <!-- MODIFY: Add the @-prefixed username -->
+- PGP key ID: <!-- MODIFY: Add the "long format" key ID of the new PGP public key here -->
+- Sponsors: <!-- MODIFY: Add the @-prefixed usernames of the sponsors -->
+- Application: <!-- MODIFY: Add link to application, if this is the key of a new packager, else remove -->
+- Results: <!-- MODIFY: Add link to results of application, if this is the key of a new packager, else remove -->
 
 <!--
 NOTE: Attach the above information as a clearsigned document to this ticket.
diff --git a/.gitlab/issue_templates/Remove Main Key.md b/.gitlab/issue_templates/Remove Main Key.md
index f7dbaab..1435e30 100644
--- a/.gitlab/issue_templates/Remove Main Key.md	
+++ b/.gitlab/issue_templates/Remove Main Key.md	
@@ -5,6 +5,7 @@ It is used by users with a valid main key.
 -->
 /assign @allan @anthraxx @bluewind @dvzrv @pierre
 /label ~"remove main key"
+/title Remove main key of <!-- MODIFY: Add main key holder's username -->
 <!--
 Please do not remove the above quick actions, which automatically label the
 issue and assign relevant users.
@@ -14,13 +15,20 @@ issue and assign relevant users.
 
 ## Details
 
-- Username: <!-- Add the @-prefixed username -->
-- PGP key ID: <!-- Add the "long format" key ID of the PGP public key here -->
-- Resignation: <!-- Link to resignation of key holder -->
+- Username: <!-- MODIFY: Add the @-prefixed username -->
+- PGP key ID: <!-- MODIFY: Add the "long format" key ID of the PGP public key here -->
+- Resignation: <!-- MODIFY: Link to resignation of key holder -->
 
 ## Checks
 
+### Main key holders
+
 - [ ] There are more than or equal to three valid main keys remaining after
   removal of this key.
 - [ ] All packagers have at least three valid main key signatures for their
   packager key after removal of this key.
+
+### Keyring maintainer
+
+- [ ] The key has been revoked by either the revocation certificate holder or
+  the main key holder.
diff --git a/.gitlab/issue_templates/Remove Packager Key.md b/.gitlab/issue_templates/Remove Packager Key.md
index 2a3be3d..f95170a 100644
--- a/.gitlab/issue_templates/Remove Packager Key.md	
+++ b/.gitlab/issue_templates/Remove Packager Key.md	
@@ -5,6 +5,7 @@ It is used by users with a valid main key or a valid packager key.
 -->
 /assign @allan @anthraxx @bluewind @dvzrv @pierre
 /label ~"remove packager key"
+/title Remove packager key of <!-- MODIFY: Add packager key holder's username -->
 <!--
 Please do not remove the above quick actions, which automatically label the
 issue and assign relevant users.
@@ -14,9 +15,9 @@ issue and assign relevant users.
 
 ## Details
 
-- Username: <!-- Add the @-prefixed username -->
-- PGP key ID: <!-- Add the "long format" key ID of the PGP public key here -->
-- Resignation: <!-- Link to resignation of key holder -->
+- Username: <!-- MODIFY: Add the @-prefixed username -->
+- PGP key ID: <!-- MODIFY: Add the "long format" key ID of the PGP public key here -->
+- Resignation: <!-- MODIFY: Link to resignation of key holder -->
 
 ## Checks