commit 1d8993c852cddd970982e1eb9a54a048096ce46e Author: Nicolas Chauvet <kwizart(a)gmail.com&gt; Date: Thu Apr 4 16:18:53 2019 +0200 Update sigul-bridge roles/sigul/bridge/files/koji-primary.conf | 8 ++++++-- roles/sigul/bridge/templates/bridge.conf.j2 | 10 +++++----- 2 files changed, 11 insertions(+), 7 deletions(-) --- diff --git a/roles/sigul/bridge/files/koji-primary.conf b/roles/sigul/bridge/files/koji-primary.conf index 5ff3981..37a7291 100644 --- a/roles/sigul/bridge/files/koji-primary.conf +++ b/roles/sigul/bridge/files/koji-primary.conf @@ -9,16 +9,20 @@ server = http://koji.rpmfusion.org/kojihub weburl = http://koji.rpmfusion.org/koji ;url of package download site -topurl = https://kojipkgs.rpmfusion.org/ +topurl = https://koji.rpmfusion.org/kojifiles ;path to the koji top directory ;topdir = /mnt/koji -anon_retry = true +authtype = ssl + +;anon_retry = true ;client certificate cert = /etc/sigul/rpmfusion.cert +ca = /etc/sigul/rpmfusion-upload-ca.cert + ;certificate of the CA that issued the HTTP server certificate serverca = /etc/sigul/rpmfusion-server-ca.cert diff --git a/roles/sigul/bridge/templates/bridge.conf.j2 b/roles/sigul/bridge/templates/bridge.conf.j2 index fc0226b..e648b64 100644 --- a/roles/sigul/bridge/templates/bridge.conf.j2 +++ b/roles/sigul/bridge/templates/bridge.conf.j2 @@ -12,16 +12,16 @@ client-listen-port: 44334 server-listen-port: 44333 # A RPM Fusion account system group required for access to the signing server. If # empty, no RPM Fusion account check is done. -required-fas-group: signers +required-fas-group: rpmfusion-signers # User name and password for an account on the RPM Fusion account system that can # be used to verify group memberships fas-user-name: {{ fedoraDummyUser }} fas-password: {{ fedoraDummyUserPassword }} [koji] -koji-instances: primary -koji-config-primary: /etc/koji-primary.conf -koji-config: /etc/koji-primary.conf +koji-instances: rpmfusion +koji-config-rpmfusion: /etc/sigul/koji-rpmfusion.conf + [daemon] # The user to run as @@ -35,7 +35,7 @@ nss-dir: /var/lib/sigul # Password for accessing the NSS database. If not specified, the bridge will # ask on startup # Currently no password is used -nss-password: +nss-password: {{ sigulBridgePassword }} # Minimum and maximum versions of TLS used nss-min-tls: tls1.2 nss-max-tls: tls1.2