From 3461e334b202cf163251ee47d12634d2f194fe77 Mon Sep 17 00:00:00 2001
From: Mike McLean <mikem@redhat.com>
Date: Aug 23 2017 19:00:02 +0000
Subject: [PATCH 1/2] fix serverca default in kojivmd


---

diff --git a/vm/kojivmd b/vm/kojivmd
index 3ca7342..803d688 100755
--- a/vm/kojivmd
+++ b/vm/kojivmd
@@ -134,7 +134,7 @@ def get_options():
                 'allowed_scms': '',
                 'cert': '/etc/kojivmd/client.crt',
                 'ca': '',  # FIXME: Remove in next major release
-                'serverca': '/etc/kojivmd/serverca.crt'}
+                'serverca': None}
     if config.has_section('kojivmd'):
         for name, value in config.items('kojivmd'):
             if name in ['sleeptime', 'maxjobs', 'minspace', 'minmem',
@@ -157,6 +157,17 @@ def get_options():
         if getattr(options, name, None) is None:
             setattr(options, name, value)
 
+    # special handling for cert defaults
+    cert_defaults = {
+        'cert': '/etc/kojira/client.crt',
+        'serverca': '/etc/kojira/serverca.crt',
+    }
+    for name in cert_defaults:
+        if getattr(options, name, None) is None:
+            fn = cert_defaults[name]
+            if os.path.exists(fn):
+                setattr(options, name, fn)
+
     #make sure workdir exists
     if not os.path.exists(options.workdir):
         koji.ensuredir(options.workdir)

From ca9bd3941bda0fdc2c5b4b7985f33fc2c6f30a36 Mon Sep 17 00:00:00 2001
From: Mike McLean <mikem@redhat.com>
Date: Aug 23 2017 19:00:02 +0000
Subject: [PATCH 2/2] kojivmd: fix typo in serverca path and also fix cert value


---

diff --git a/vm/kojivmd b/vm/kojivmd
index 803d688..1976f7b 100755
--- a/vm/kojivmd
+++ b/vm/kojivmd
@@ -132,7 +132,7 @@ def get_options():
                 'offline_retry': True,
                 'offline_retry_interval': 120,
                 'allowed_scms': '',
-                'cert': '/etc/kojivmd/client.crt',
+                'cert': None,
                 'ca': '',  # FIXME: Remove in next major release
                 'serverca': None}
     if config.has_section('kojivmd'):
@@ -159,8 +159,8 @@ def get_options():
 
     # special handling for cert defaults
     cert_defaults = {
-        'cert': '/etc/kojira/client.crt',
-        'serverca': '/etc/kojira/serverca.crt',
+        'cert': '/etc/kojivmd/client.crt',
+        'serverca': '/etc/kojivmd/serverca.crt',
     }
     for name in cert_defaults:
         if getattr(options, name, None) is None: