From 379278485b951be9727829ee76e2614aa73f3002 Mon Sep 17 00:00:00 2001
From: Trevor Batley <trevor@batley.id.au>
Date: Fri, 27 Sep 2024 19:38:39 +1000
Subject: [PATCH] Updated plugins readmes

---
 plugins/README.md                  | 43 ++++++++++++++++++++++++++----
 plugins/koji-plugin-sign/sign.conf | 10 +++----
 2 files changed, 43 insertions(+), 10 deletions(-)

diff --git a/plugins/README.md b/plugins/README.md
index 493799e..986cfcf 100644
--- a/plugins/README.md
+++ b/plugins/README.md
@@ -5,6 +5,7 @@
 To install these plugins:
 
 Copy the tag2distrepo.py and sign.py programs into /usr/lib/koji-hub-plugins
+
 Set the configurations as per the directions for each plugin below
 
 Edit the following settings in /etc/koji-hub/hub.conf to enable the plugins:
@@ -13,15 +14,47 @@ Edit the following settings in /etc/koji-hub/hub.conf to enable the plugins:
     Plugins = tag2distrepo sign
 
 Reload Apache
+
     $ systemctl reload httpd
 
-###koji-plugin-sign
+### koji-plugin-sign
 
 Automagically sign rpms with our key after successful build
-This is a slightly modified version of the OSG Software Teams koji-hub plugin which can be found at <https://github.com/osg-htc/koji-plugin-sign> 
 
-###tag2distrepo
+This is a slightly modified version of the OSG Software Teams koji-hub plugin which can be found at <https://github.com/osg-htc/koji-plugin-sign>
 
-This is a koji-hub plugin available in the available in default koji installation
-Create an external repository for any tag when a new build is completed, or a build is attached (tag-build) to a tag
+Copy your gpg keys etc. into /etc/koji-hub/gnupgp
 
+Copy sign.conf into /etc/koji-hub-plugins
+
+Edit /etc/koji-hub-plugins/sign.conf to have the correct gpg key names for each tag
+
+### tag2distrepo
+
+This is a koji-hub plugin available in the default koji installation
+
+It will create an external repository for any tag when a new build is completed in, or a build is attached to (tag-build) a tag
+
+Set the extra options on the tag so the plugin will generate the repository:
+
+    koji edit-tag -x tag2distrepo.enabled=True -x tag2distrepo.keys='44922a28' smecontribs11
+
+You can check by doing:
+
+    koji taginfo smecontribs11
+
+and you should see
+
+    Tag: smecontribs11 [38]
+    Arches: x86_64
+    Groups: 
+    Tag options:
+      mock.bootstrap_image : 'rockylinux:8'
+      mock.package_manager : 'dnf'
+      rpm.macro.dist : '.el8.sme'
+      rpm.macro.distribution : 'SME Server v11'
+      rpm.macro.packager : 'Koozali.org <http://www.koozali.org>'
+      rpm.macro.vendor : 'Koozali.org <http://www.koozali.org>'
+      tag2distrepo : '44922a28'
+      tag2distrepo.enabled : True
+    Inheritance:
diff --git a/plugins/koji-plugin-sign/sign.conf b/plugins/koji-plugin-sign/sign.conf
index 1f1858a..eb6240d 100644
--- a/plugins/koji-plugin-sign/sign.conf
+++ b/plugins/koji-plugin-sign/sign.conf
@@ -4,12 +4,12 @@
 rpm = /bin/rpm
 gpgbin = /usr/bin/gpg
 gpg_path = /etc/koji-sign-plugin/gnupg
-gpg_name = My Company, Inc. <support@mycompany.com>
-gpg_pass = my_passphrase
+gpg_name = kojiadmin@koozali.org
+gpg_pass = ''
 enabled = 1
 
 # Defaults can be overridden on a per tag basis
-[dist-foo-build]
-gpg_name = My Other Company, Inc. <support@myothercompany.com>
-gpg_pass = my_other_passphrase
+#[dist-sme12-os]
+#gpg_name = sme12@koozali.org
+#gpg_pass = ''