From 7608ce4d4965157f2deaef27033602b7b126f89c Mon Sep 17 00:00:00 2001
From: Patrick Uiterwijk <puiterwijk@redhat.com>
Date: Jul 03 2019 13:39:02 +0000
Subject: Fix up robosig koji conf in stg


Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com>

---

diff --git a/roles/robosignatory/files/koji.conf b/roles/robosignatory/files/koji.conf
deleted file mode 100644
index 64b78f1..0000000
--- a/roles/robosignatory/files/koji.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-[koji]
-server = https://koji.fedoraproject.org/kojihub
-weburl = https://koji.fedoraproject.org/koji
-topurl = https://kojipkgs.fedoraproject.org/
-anon_retry = false
-cert = /etc/robosignatory/koji.cert
-serverca = /etc/robosignatory/serverca.cert
diff --git a/roles/robosignatory/files/sigul.staging.conf b/roles/robosignatory/files/sigul.staging.conf
index 56d55aa..b4f534e 100644
--- a/roles/robosignatory/files/sigul.staging.conf
+++ b/roles/robosignatory/files/sigul.staging.conf
@@ -5,9 +5,9 @@ client-cert-nickname: sigul-client-cert
 user-name: autopen
 
 [koji]
-koji-config: /etc/sigul/koji.conf
+koji-config: /etc/robosignatory/koji.config
 koji-instances: primary
-koji-config-primary: /etc/sigul/koji.conf
+koji-config-primary: /etc/robosignatory/koji.config
 
 [nss]
 nss-dir: /etc/sigul
diff --git a/roles/robosignatory/tasks/main.yml b/roles/robosignatory/tasks/main.yml
index 11ba6ae..2e94e72 100644
--- a/roles/robosignatory/tasks/main.yml
+++ b/roles/robosignatory/tasks/main.yml
@@ -28,8 +28,8 @@
   - robosignatory
 
 - name: Install koji config
-  copy: src=koji.conf dest=/etc/robosignatory/koji.config
-        owner=fedmsg group=fedmsg mode=0640
+  template: src=koji.conf dest=/etc/robosignatory/koji.config
+            owner=fedmsg group=fedmsg mode=0640
   tags:
   - config
   - robosignatory
diff --git a/roles/robosignatory/templates/koji.conf b/roles/robosignatory/templates/koji.conf
new file mode 100644
index 0000000..9ccf35d
--- /dev/null
+++ b/roles/robosignatory/templates/koji.conf
@@ -0,0 +1,5 @@
+[koji]
+server = https://koji{{ env_suffix }}.fedoraproject.org/kojihub
+weburl = https://koji{{ env_suffix }}.fedoraproject.org/koji
+topurl = https://kojipkgs{{ env_suffix }}.fedoraproject.org/
+anon_retry = false