From 8ff1e6d9f79ca86e1e39a54597d7d59fc5ebf17c Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Wed, 9 Oct 2024 15:55:30 -0700
Subject: [PATCH] koji / production: upgrade config to 1.35

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
---
 roles/koji_hub/templates/hub.conf.j2    |  2 --
 roles/koji_hub/templates/kojira.conf.j2 | 20 --------------------
 2 files changed, 22 deletions(-)

diff --git a/roles/koji_hub/templates/hub.conf.j2 b/roles/koji_hub/templates/hub.conf.j2
index 7fb897448d..6ec02fced0 100644
--- a/roles/koji_hub/templates/hub.conf.j2
+++ b/roles/koji_hub/templates/hub.conf.j2
@@ -23,12 +23,10 @@ MemoryWarnThreshold = 10000
 MaxRequestLength = 167772160
 RLIMIT_AS = 10737418240
 CheckClientIP = False
-{% if env == "staging" %}
 # Max newrepo tasks at a time
 MaxRepoTasks = 30
 # We want a srpms repo for rawhide and eln only
 SeparateSourceTags = f{{ FedoraRawhideNumber }}-build eln-build
-{% endif %}
 
 # Kerb auth
 {% if env == "staging" %}
diff --git a/roles/koji_hub/templates/kojira.conf.j2 b/roles/koji_hub/templates/kojira.conf.j2
index e3de884822..160f90c0d5 100644
--- a/roles/koji_hub/templates/kojira.conf.j2
+++ b/roles/koji_hub/templates/kojira.conf.j2
@@ -21,22 +21,11 @@ logfile=/var/log/kojira/kojira.log
 ; Include srpms in repos? (not needed for normal operation)
 with_src=no
 
-{% if env != "staging" %}
-; We want a srpms repo for rawhide only
-separate_source_tags=f{{ FedoraRawhideNumber }}-build eln-build
-{% endif %}
-
 ; prevent repo cleanup from stalling repo regen
 ;prune_batch_size=1
 ;delete_batch_size=1
 max_delete_processes=20
 
-{% if env != "staging" %}
-; prevent kojira from flooding the build system with newRepo tasks
-max_repo_tasks=30
-repo_tasks_limit=40
-{% endif %}
-
 ; Server certificate authority
 serverca = /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem
 
@@ -55,12 +44,3 @@ dist_repo_lifetime = 7257600
 ; you can end with weird behaviour. For details see
 ; https://pagure.io/koji/issue/2159
 check_external_repos = True
-
-{% if env != "staging" %}
-; Writable path could be set here. In such case, kojira will write a
-; list of currently monitored tags there with simple statistics in
-; every cycle. File would contain information about how long these
-; tags are expired and what is the computed score for them. This can
-; be used to debug and check in realtime the actual performance.
-queue_file = /mnt/koji/kojira/queue
-{% endif %}