[gentoo-commits] dev/zorry:master commit in: gobs/pym/, gobs/conf/

[gentoo-commits] dev/zorry:master commit in: gobs/pym/, gobs/conf/

[Magnus Granberg]

commit:     913959754ebe05a500bf69c21d6ab6bf1d1a17ca
Author:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 25 10:12:46 2011 +0000
Commit:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Mon Apr 25 10:12:46 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/zorry.git;a=commit;h=91395975

Change the name of the config file

---
 gobs/conf/gobs.conf  |   13 +++++++++++++
 gobs/pym/readconf.py |   12 ++++++------
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/gobs/conf/gobs.conf b/gobs/conf/gobs.conf
new file mode 100644
index 0000000..734aba8
--- /dev/null
+++ b/gobs/conf/gobs.conf
@@ -0,0 +1,13 @@
+# The Sql Backend
+SQLBACKEND=pgsql
+# The Sql Datebase
+SQLDB=buildhost
+# Sql Host
+SQLHOST=localhost
+# Sql user
+SQLUSER=buildhost
+# Sql Password
+SQLPASSWD=buildhost
+# Gobs root
+GOBSROOT=/home/buildhost/
+GOBSCONFIG=jasmin.ume.nu/hardened

diff --git a/gobs/pym/readconf.py b/gobs/pym/readconf.py
index 24e8c0b..848a3e6 100644
--- a/gobs/pym/readconf.py
+++ b/gobs/pym/readconf.py
@@ -6,7 +6,7 @@ class get_conf_settings(object):
 # open the /etc/buildhost/buildhost.conf file and get the needed
 # settings for gobs
 	def __init__(self):
-		self.configfile = "/etc/buildhost/buildhost.conf"
+		self.configfile = "/etc/gobs/gobs.conf"
 
 	def read_gobs_settings_all(self):
 	# It will return a dict with options from the configfile
@@ -28,11 +28,11 @@ class get_conf_settings(object):
 			if element[0] == 'SQLPASSWD':		# Password
 				get_sql_passwd = element[1]
 			# Buildhost root (dir for host/setup on host)
-			if element[0] == 'BUILDHOSTROOT':
-				get_buildhost_root = element[1]
+			if element[0] == 'GOBSROOT':
+				get_gobs_root = element[1]
 			# Buildhost setup (host/setup on guest)
-			if element[0] == 'BUILDCONFIG':
-				get_build_config = element[1]
+			if element[0] == 'GOBSCONFIG':
+				get_gobs_config = element[1]
 			open_conffile.close()
 		gobs_settings_dict = {}
 		gobs_settings_dict['sql_backend'] = get_sql_backend.rstrip('\n')
@@ -40,6 +40,6 @@ class get_conf_settings(object):
 		gobs_settings_dict['sql_host'] = get_sql_host.rstrip('\n')
 		gobs_settings_dict['sql_user'] = get_sql_user.rstrip('\n')
 		gobs_settings_dict['sql_passwd'] = get_sql_passwd.rstrip('\n')
-		gobs_settings_dict['host_setup_root'] = get_buildhost_root.rstrip('\n')
+		gobs_settings_dict['host_setup_root'] = get_gobs_root.rstrip('\n')
 		gobs_settings_dict['guest_setup_root'] = get_build_config.rstrip('\n')
 		return gobs_settings_dict