From e93cd702f050ade707594dcc067c49707304e1d9 Mon Sep 17 00:00:00 2001
From: Stephen Smoogen <smooge@redhat.com>
Date: Mon, 25 Mar 2019 22:04:15 +0000
Subject: [PATCH] [repospanner] try to make the configs actually work for more
 than one system.

---
 roles/repospanner/server/tasks/main.yml                | 6 +++---
 roles/repospanner/server/templates/repoSpanner.service | 4 ++--
 roles/repospanner/server/templates/repoSpanner.yml     | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/roles/repospanner/server/tasks/main.yml b/roles/repospanner/server/tasks/main.yml
index 1293032d33..fb84cda54b 100644
--- a/roles/repospanner/server/tasks/main.yml
+++ b/roles/repospanner/server/tasks/main.yml
@@ -41,7 +41,7 @@
 
 - name: Deploy configuration
   template: src=repoSpanner.yml
-            dest=/etc/repospanner/config.yml
+            dest=/etc/repospanner/{{region}}-config.yml
             owner=repoSpanner group=repoSpanner mode=0600
   register: repospanner_refresh
   tags:
@@ -56,9 +56,9 @@
   - src: ca.crt
     dest: ca.crt
   - src: "{{node}}.{{region}}.crt"
-    dest: node.crt
+    dest: node-{{region}}.crt
   - src: "{{node}}.{{region}}.key"
-    dest: node.key
+    dest: node-{{region}}.key
   register: repospanner_refresh
   tags:
   - repospanner/server
diff --git a/roles/repospanner/server/templates/repoSpanner.service b/roles/repospanner/server/templates/repoSpanner.service
index 3b859293c1..88716772d2 100644
--- a/roles/repospanner/server/templates/repoSpanner.service
+++ b/roles/repospanner/server/templates/repoSpanner.service
@@ -1,10 +1,10 @@
 [Unit]
-Description=repoSpanner - instance %i
+Description=repoSpanner - instance {{region}}
 After=network.target
 
 [Service]
 Type=simple
-ExecStart=/usr/bin/repospanner serve --config /etc/repospanner/%i.yml --debug
+ExecStart=/usr/bin/repospanner serve --config /etc/repospanner/{{region}}-config.yml --debug
 User=repoSpanner
 Group=repoSpanner
 LimitNOFILE=65536
diff --git a/roles/repospanner/server/templates/repoSpanner.yml b/roles/repospanner/server/templates/repoSpanner.yml
index bb01307f2b..5673d2bb09 100644
--- a/roles/repospanner/server/templates/repoSpanner.yml
+++ b/roles/repospanner/server/templates/repoSpanner.yml
@@ -11,12 +11,12 @@ listen:
 certificates:
   ca: /etc/repospanner/ca.crt
   client:
-    cert: /etc/repospanner/node.crt
-    key:  /etc/repospanner/node.key
+    cert: /etc/repospanner/node-{{region}}.crt
+    key:  /etc/repospanner/node-{{region}}.key
   server:
     default:
-      cert: /etc/repospanner/node.crt
-      key:  /etc/repospanner/node.key
+      cert: /etc/repospanner/node-{{region}}.crt
+      key:  /etc/repospanner/node-{{region}}.key
 hooks:
   bubblewrap:
     enabled: false