From a19d9e21ae128f8f90303b1d1202061b1647f7a4 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Jul 19 2022 19:43:04 +0000 Subject: [PATCH 1/4] Installing tools: Don't use KRB5_TRACE. I don't see a good reason to confuse new packagers with a bunch of debug output that's likely irrelevant to them. If someone has a problem and needs more information, they can read the linked wiki page. --- diff --git a/modules/ROOT/pages/Installing_Packager_Tools.adoc b/modules/ROOT/pages/Installing_Packager_Tools.adoc index a72567d..380fed4 100644 --- a/modules/ROOT/pages/Installing_Packager_Tools.adoc +++ b/modules/ROOT/pages/Installing_Packager_Tools.adoc @@ -38,7 +38,7 @@ Koji uses Kerberos for authentication. To acquire valid Kerberos ticket, do: ---- -$ KRB5_TRACE=/dev/stdout kinit @FEDORAPROJECT.ORG +$ kinit @FEDORAPROJECT.ORG ---- Here, `FEDORAPROJECT.ORG` must be in capital case. From 6394cf290152e44a8e5e10d66bdb528157e7352f Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Jul 19 2022 19:43:04 +0000 Subject: [PATCH 2/4] Use fkinit instead kinit Packagers should use fkinit to acquire a kerberos ticket. It supports 2FA without needing extra configuration, and generally makes sure everything is configured properly --- diff --git a/modules/ROOT/pages/Installing_Packager_Tools.adoc b/modules/ROOT/pages/Installing_Packager_Tools.adoc index 380fed4..a69a0b4 100644 --- a/modules/ROOT/pages/Installing_Packager_Tools.adoc +++ b/modules/ROOT/pages/Installing_Packager_Tools.adoc @@ -38,7 +38,7 @@ Koji uses Kerberos for authentication. To acquire valid Kerberos ticket, do: ---- -$ kinit @FEDORAPROJECT.ORG +$ fkinit -u ---- Here, `FEDORAPROJECT.ORG` must be in capital case. diff --git a/modules/ROOT/pages/New_Package_Process_for_Existing_Contributors.adoc b/modules/ROOT/pages/New_Package_Process_for_Existing_Contributors.adoc index 390dbd1..b317213 100644 --- a/modules/ROOT/pages/New_Package_Process_for_Existing_Contributors.adoc +++ b/modules/ROOT/pages/New_Package_Process_for_Existing_Contributors.adoc @@ -65,7 +65,7 @@ checkout the distgit repository with `fedpkg clone `. . Import your srpm -** First `kinit username@FEDORAPROJECT.ORG` +** First `fkinit -u username` ** Then you can import the approved SRPM into the rawhide branch by running `fedpkg import libfoo-x.x.x.src.rpm; git commit -m "Initial import (fedora#nnnnnn)."` (where `nnnnnn` is your Bugzilla package review bug number). If your package is using _autochangelog_, writing the bug number as specified will make Bodhi automatically close the bug when your package is submitted to Rawhide stable repository. From 421402caff3dfd679024de51fccd73a06e64a2c5 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Jul 19 2022 19:43:04 +0000 Subject: [PATCH 3/4] Further enhance docs re. acquiring a kerberos ticket --- diff --git a/modules/ROOT/pages/Installing_Packager_Tools.adoc b/modules/ROOT/pages/Installing_Packager_Tools.adoc index a69a0b4..ffc2c04 100644 --- a/modules/ROOT/pages/Installing_Packager_Tools.adoc +++ b/modules/ROOT/pages/Installing_Packager_Tools.adoc @@ -13,7 +13,7 @@ $ sudo dnf install fedora-packager fedora-review == Configuration -=== Ssh key +=== SSH key You also must have an ssh key configured in the https://accounts.fedoraproject.org/[Fedora Accounts System] @@ -41,9 +41,13 @@ To acquire valid Kerberos ticket, do: $ fkinit -u ---- -Here, `FEDORAPROJECT.ORG` must be in capital case. +Kerberos tickets have a set expiration time, +so you will frequently to renew it with `kinit -R` before it expires +or acquire a new one. -Kerberos tickets have an expiration time, so `kinit` needs to be periodically re-issued. +Alternatively, if you are using Fedora Workstation +and don't have 2FA enabled on your Fedora account, +you may add it through GNOME Online Accounts. See https://fedoraproject.org/wiki/Infrastructure/Kerberos[Infrastructure/Kerberos] for more information about the Fedora Kerberos setup. From da7a4715644fccfb0fb7cb6b5c426648617c626f Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Jul 19 2022 19:43:04 +0000 Subject: [PATCH 4/4] Fix typo and remove trailing whitespace --- diff --git a/modules/ROOT/pages/Installing_Packager_Tools.adoc b/modules/ROOT/pages/Installing_Packager_Tools.adoc index ffc2c04..ce45c15 100644 --- a/modules/ROOT/pages/Installing_Packager_Tools.adoc +++ b/modules/ROOT/pages/Installing_Packager_Tools.adoc @@ -24,7 +24,7 @@ for more information. === Mock -To be able to test the build procedure in a clean chroot with +To be able to test the build procedure in a clean chroot with https://rpm-software-management.github.io/mock/[Mock], you need to configure your account to be a member of the `mock` group: @@ -42,7 +42,7 @@ $ fkinit -u ---- Kerberos tickets have a set expiration time, -so you will frequently to renew it with `kinit -R` before it expires +so you will frequently have to renew it with `kinit -R` before it expires or acquire a new one. Alternatively, if you are using Fedora Workstation