From 4cc1580eae41311e1d63f747e3d49a82ce84fe2e Mon Sep 17 00:00:00 2001
From: Ralph Bean <rbean@redhat.com>
Date: Thu, 11 Jun 2015 18:12:12 +0000
Subject: [PATCH] Collapse our different /etc/koji.conf copies into a template
 as well.

---
 inventory/group_vars/buildaarch64             |  3 ++-
 inventory/group_vars/buildarm                 |  3 ++-
 inventory/group_vars/buildhw                  |  3 ++-
 inventory/group_vars/buildvm                  |  3 ++-
 inventory/group_vars/buildvm-stg              |  3 ++-
 roles/koji_builder/files/arm-koji.conf        | 23 -------------------
 .../{files => templates}/koji.conf            |  6 ++---
 7 files changed, 13 insertions(+), 31 deletions(-)
 delete mode 100644 roles/koji_builder/files/arm-koji.conf
 rename roles/koji_builder/{files => templates}/koji.conf (80%)

diff --git a/inventory/group_vars/buildaarch64 b/inventory/group_vars/buildaarch64
index 6d13273c4a..8705cac1e9 100644
--- a/inventory/group_vars/buildaarch64
+++ b/inventory/group_vars/buildaarch64
@@ -3,5 +3,6 @@ host_group: kojibuilder
 fas_client_groups: sysadmin-releng
 sudoers: "{{ private }}/files/sudo/buildaarch64-sudoers"
 
-koji_topurl: "http://armpkgs.fedoraproject.org/"
 koji_server_url: "http://arm.koji.fedoraproject.org/kojihub"
+koji_weburl: "http://arm.koji.fedoraproject.org/koji"
+koji_topurl: "http://armpkgs.fedoraproject.org/"
diff --git a/inventory/group_vars/buildarm b/inventory/group_vars/buildarm
index 6b0e733eb5..34ccde7c97 100644
--- a/inventory/group_vars/buildarm
+++ b/inventory/group_vars/buildarm
@@ -2,5 +2,6 @@ host_group: kojibuilder
 fas_client_groups: sysadmin-releng
 sudoers: "{{ private }}/files/sudo/arm-releng-sudoers"
 
-koji_topurl: "http://armpkgs.fedoraproject.org/"
 koji_server_url: "http://arm.koji.fedoraproject.org/kojihub"
+koji_weburl: "http://arm.koji.fedoraproject.org/koji"
+koji_topurl: "http://armpkgs.fedoraproject.org/"
diff --git a/inventory/group_vars/buildhw b/inventory/group_vars/buildhw
index c6bc074750..ae54fda25d 100644
--- a/inventory/group_vars/buildhw
+++ b/inventory/group_vars/buildhw
@@ -4,5 +4,6 @@ fas_client_groups: sysadmin-releng
 sudoers: "{{ private }}/files/sudo/arm-releng-sudoers"
 freezes: true
 
-koji_topurl: "http://kojipkgs.fedoraproject.org/"
 koji_server_url: "http://koji.fedoraproject.org/kojihub"
+koji_weburl: "http://koji.fedoraproject.org/koji"
+koji_topurl: "http://kojipkgs.fedoraproject.org/"
diff --git a/inventory/group_vars/buildvm b/inventory/group_vars/buildvm
index dfbdbd0624..5f58b3e764 100644
--- a/inventory/group_vars/buildvm
+++ b/inventory/group_vars/buildvm
@@ -26,5 +26,6 @@ host_group: kojibuilder
 fas_client_groups: sysadmin-releng
 sudoers: "{{ private }}/files/sudo/arm-releng-sudoers"
 
-koji_topurl: "http://kojipkgs.fedoraproject.org/"
 koji_server_url: "http://koji.fedoraproject.org/kojihub"
+koji_weburl: "http://koji.fedoraproject.org/koji"
+koji_topurl: "http://kojipkgs.fedoraproject.org/"
diff --git a/inventory/group_vars/buildvm-stg b/inventory/group_vars/buildvm-stg
index 09c8b90f07..73dac8572b 100644
--- a/inventory/group_vars/buildvm-stg
+++ b/inventory/group_vars/buildvm-stg
@@ -26,5 +26,6 @@ sudoers: "{{ private }}/files/sudo/arm-releng-sudoers"
 datacenter: staging
 nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid"
 
-koji_topurl: "http://kojipkgs.stg.fedoraproject.org/"
 koji_server_url: "http://koji.stg.fedoraproject.org/kojihub"
+koji_weburl: "http://koji.stg.fedoraproject.org/koji"
+koji_topurl: "http://kojipkgs.stg.fedoraproject.org/"
diff --git a/roles/koji_builder/files/arm-koji.conf b/roles/koji_builder/files/arm-koji.conf
deleted file mode 100644
index 83eaa2dbef..0000000000
--- a/roles/koji_builder/files/arm-koji.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-[koji]
-
-;configuration for koji cli tool
-
-;url of XMLRPC server
-server = http://arm.koji.fedoraproject.org/kojihub
-
-;url of web interface
-weburl = http://arm.koji.fedoraproject.org/koji
-
-;path to the koji top directory
-;topdir = /mnt/koji
-
-;configuration for SSL athentication
-
-;client certificate
-;cert = ~/.koji/client.crt
-
-;certificate of the CA that issued the client certificate
-;ca = ~/.koji/clientca.crt
-
-;certificate of the CA that issued the HTTP server certificate
-;serverca = ~/.koji/serverca.crt
diff --git a/roles/koji_builder/files/koji.conf b/roles/koji_builder/templates/koji.conf
similarity index 80%
rename from roles/koji_builder/files/koji.conf
rename to roles/koji_builder/templates/koji.conf
index 36eafe9924..f4fcfd5f30 100644
--- a/roles/koji_builder/files/koji.conf
+++ b/roles/koji_builder/templates/koji.conf
@@ -3,13 +3,13 @@
 ;configuration for koji cli tool
 
 ;url of XMLRPC server
-server = http://koji.fedoraproject.org/kojihub
+server = {{ koji_server_url }}
 
 ;url of web interface
-weburl = http://koji.fedoraproject.org/koji
+weburl = {{ koji_weburl }}
 
 ;url of package download site
-topurl = http://kojipkgs.fedoraproject.org/
+topurl = {{ koji_topurl }}
 
 ;path to the koji top directory
 ;topdir = /mnt/koji