-make psql connect use config

- remove sqlite from flamenco2

1 files changed, 9 insertions, 4 deletions

diff --git a/config.py b/config.py
index 3547cca..7b133cb 100644
--- a/config.py
+++ b/config.py
@@ -4,10 +4,15 @@ class Config:
     ''' Read in the config and set up the vars with the correct type.
     '''
     def __init__(self, configfile, name):
+        # "name" argument no longer used
         c = ConfigParser.ConfigParser()
         c.read(configfile)
-        self.database = c.get(name, 'database')
-        self.mailhost = c.get(name, 'mailhost')
-        self.adminemail = c.get(name, 'adminemail')
-        self.url = c.get(name, 'url')
+        self.database_name = c.get('database', 'name')
+        self.database_user = c.get('database', 'user')
+        self.database_files_dir = c.get('database', 'files_dir')
+
+        self.mailhost = c.get('webui', 'mailhost')
+        self.adminemail = c.get('webui', 'adminemail')
+        self.url = c.get('webui', 'url')
+        self.files_url = c.get('webui', 'files_url')