From 4270909b25a3e7ab3cf85385927a38ed1e7a6385 Mon Sep 17 00:00:00 2001
From: Victor Seva <vseva@sipwise.com>
Date: Thu, 15 Oct 2020 16:44:30 +0200
Subject: [PATCH] TT#7211 merge server.ini and gerrit.ini

* remove gerrit.ini
* read new groups and keys

Change-Id: Ia229490ad4cf13bd8118255a76a048575091a56f
---
 debian/gerrit.ini        |  3 ---
 debian/rules             |  1 -
 debian/server.ini        | 12 ++++++++++--
 repoapi/settings/prod.py | 16 +++++++++-------
 4 files changed, 19 insertions(+), 13 deletions(-)
 delete mode 100644 debian/gerrit.ini

diff --git a/debian/gerrit.ini b/debian/gerrit.ini
deleted file mode 100644
index cd71015..0000000
--- a/debian/gerrit.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[gerrit]
-HTTP_USER=fake
-HTTP_PASSWD=fakeHTTPpass
diff --git a/debian/rules b/debian/rules
index 90a0a46..b9ef002 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,6 @@ override_dh_auto_test:
 override_dh_auto_build:
 	# fake files needed to deploy
 	cp debian/secret_key .secret_key
-	cp debian/gerrit.ini gerrit.ini
 	cp debian/server.ini server.ini
 
 override_dh_auto_install:
diff --git a/debian/server.ini b/debian/server.ini
index e9e0ebb..f0cfd40 100644
--- a/debian/server.ini
+++ b/debian/server.ini
@@ -1,7 +1,5 @@
 [server]
-JENKINS_URL=fake
 BUILD_POOL=1
-GERRIT_URL=fake
 BROKER_URL=fake
 DOCKER_REGISTRY_URL=fake
 DB_NAME=fake
@@ -9,3 +7,13 @@ DB_USER=fake
 DB_PWD=fake
 AUTH_LDAP_SERVER_URI=fake
 AUTH_LDAP_USER_BASE=fake
+
+[jenkins]
+URL=fake
+HTTP_USER=fake
+HTTP_PASSWD=fakeHTTPpass
+
+[gerrit]
+URL=fake
+HTTP_USER=fake
+HTTP_PASSWD=fakeHTTPpass
diff --git a/repoapi/settings/prod.py b/repoapi/settings/prod.py
index c930711..62d76f3 100644
--- a/repoapi/settings/prod.py
+++ b/repoapi/settings/prod.py
@@ -50,8 +50,15 @@ LOGGING["loggers"]["repoapi"]["level"] = os.getenv(  # noqa
 
 server_config = RawConfigParser()
 server_config.read(join(VAR_DIR, "server.ini"))
-JENKINS_URL = server_config.get("server", "JENKINS_URL")
-GERRIT_URL = server_config.get("server", "GERRIT_URL")
+
+JENKINS_URL = server_config.get("jenkins", "URL")
+JENKINS_HTTP_USER = server_config.get("jenkins", "HTTP_USER")
+JENKINS_HTTP_PASSWD = server_config.get("jenkins", "HTTP_PASSWD")
+
+GERRIT_URL = server_config.get("gerrit", "URL")
+GERRIT_REST_HTTP_USER = server_config.get("gerrit", "HTTP_USER")
+GERRIT_REST_HTTP_PASSWD = server_config.get("gerrit", "HTTP_PASSWD")
+
 DOCKER_REGISTRY_URL = server_config.get("server", "DOCKER_REGISTRY_URL")
 AUTH_LDAP_SERVER_URI = server_config.get("server", "AUTH_LDAP_SERVER_URI")
 AUTH_LDAP_USER_BASE = server_config.get("server", "AUTH_LDAP_USER_BASE")
@@ -79,11 +86,6 @@ DATABASES = {
     }
 }
 
-gerrit_config = RawConfigParser()
-gerrit_config.read(join(VAR_DIR, "gerrit.ini"))
-GERRIT_REST_HTTP_USER = gerrit_config.get("gerrit", "HTTP_USER")
-GERRIT_REST_HTTP_PASSWD = gerrit_config.get("gerrit", "HTTP_PASSWD")
-
 GITWEB_URL = "https://git.mgm.sipwise.com/gitweb/?p={}.git;a=commit;h={}"
 WORKFRONT_CREDENTIALS = join(BASE_DIR, "/etc/jenkins_jobs/workfront.ini")
 WORKFRONT_NOTE = True