From eacabeee1c8d54e1b35ebc986e13aaa4ed41e518 Mon Sep 17 00:00:00 2001 From: nazunalika Date: Wed, 23 Dec 2020 05:20:39 -0700 Subject: [PATCH] fixes --- defaults/main.yml | 2 +- templates/etc/kojira/kojira.conf.j2 | 1 + templates/etc/kojiweb/web.conf.j2 | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index b9dde03..85344d9 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -64,7 +64,7 @@ koji_hub_proxy_principals: koji/kojiweb@ROCKYLINUX.ORG koji_hub_keytab: /etc/koji.keytab koji_hub_principal_format: compile/%s@ROCKYLINUX.ORG # This should be sufficient even for LE -koji_hub_ca: /etc/pki/tls/certs/ca-bundle.crt +koji_hub_ca: "{{ koji_web_cacert }}" # Koji FAS Syncing # This isn't implemented yet diff --git a/templates/etc/kojira/kojira.conf.j2 b/templates/etc/kojira/kojira.conf.j2 index 9604fd9..d1099c9 100644 --- a/templates/etc/kojira/kojira.conf.j2 +++ b/templates/etc/kojira/kojira.conf.j2 @@ -5,3 +5,4 @@ logfile=/var/log/kojira.log ;with_src=no principal = {{ koji_kojira_principal }} keytab = {{ koji_kojira_keytab }} +serverca = {{ koji_hub_ca }} diff --git a/templates/etc/kojiweb/web.conf.j2 b/templates/etc/kojiweb/web.conf.j2 index 4328a5a..a447377 100644 --- a/templates/etc/kojiweb/web.conf.j2 +++ b/templates/etc/kojiweb/web.conf.j2 @@ -1,7 +1,7 @@ [web] SiteName = {{ koji_sitename }} -{% if koji_custom_theme %} -KojiTheme = {{ koji_theme }} +{% if koji_theme %} +KojiTheme = {{ koji_theme_name }} {% endif %} # Key urls