From e52a337752b62bcbcab2ce05564378b9c1cd07e0 Mon Sep 17 00:00:00 2001
From: Alex Iribarren <Alex.Iribarren@cern.ch>
Date: Apr 11 2018 13:13:38 +0000
Subject: [PATCH 1/2] Add option to configure DB port


---

diff --git a/hub/hub.conf b/hub/hub.conf
index 8b5dd55..16b6192 100644
--- a/hub/hub.conf
+++ b/hub/hub.conf
@@ -10,6 +10,7 @@
 DBName = koji
 DBUser = koji
 #DBHost = db.example.com
+#DBPort = 5432
 #DBPass = example_password
 KojiDir = /mnt/koji
 
diff --git a/hub/kojixmlrpc.py b/hub/kojixmlrpc.py
index f518da8..675624b 100644
--- a/hub/kojixmlrpc.py
+++ b/hub/kojixmlrpc.py
@@ -400,6 +400,7 @@ def load_config(environ):
         ['DBUser', 'string', None],
         ['DBHost', 'string', None],
         ['DBhost', 'string', None],   # alias for backwards compatibility
+        ['DBPort', 'integer', 5432],
         ['DBPass', 'string', None],
         ['KojiDir', 'string', None],
 
@@ -665,7 +666,8 @@ def server_setup(environ):
         koji.db.provideDBopts(database=opts["DBName"],
                               user=opts["DBUser"],
                               password=opts.get("DBPass", None),
-                              host=opts.get("DBHost", None))
+                              host=opts.get("DBHost", None),
+                              port=opts.get("DBPort", 5432))
     except Exception:
         tb_str = ''.join(traceback.format_exception(*sys.exc_info()))
         logger.error(tb_str)

From b129f0d49c70a54c0c6dad936fe43cb5d0251d68 Mon Sep 17 00:00:00 2001
From: Alex Iribarren <Alex.Iribarren@cern.ch>
Date: May 04 2018 07:49:17 +0000
Subject: [PATCH 2/2] Keep None as the default DBPort


---

diff --git a/hub/kojixmlrpc.py b/hub/kojixmlrpc.py
index 675624b..c047243 100644
--- a/hub/kojixmlrpc.py
+++ b/hub/kojixmlrpc.py
@@ -400,7 +400,7 @@ def load_config(environ):
         ['DBUser', 'string', None],
         ['DBHost', 'string', None],
         ['DBhost', 'string', None],   # alias for backwards compatibility
-        ['DBPort', 'integer', 5432],
+        ['DBPort', 'integer', None],
         ['DBPass', 'string', None],
         ['KojiDir', 'string', None],
 
@@ -667,7 +667,7 @@ def server_setup(environ):
                               user=opts["DBUser"],
                               password=opts.get("DBPass", None),
                               host=opts.get("DBHost", None),
-                              port=opts.get("DBPort", 5432))
+                              port=opts.get("DBPort", None))
     except Exception:
         tb_str = ''.join(traceback.format_exception(*sys.exc_info()))
         logger.error(tb_str)