diff --git a/sys/config.py b/sys/config.py index 0251d4a..5e1b109 100644 --- a/sys/config.py +++ b/sys/config.py @@ -4,22 +4,26 @@ import os cp = ConfigParser() cp.read(["/etc/brathuhn/config.cfg","brathuhn.cfg",os.path.expanduser('~/.brathuhn.cfg')]) +## +## Account +## NAME = cp.get("Account","NAME") SRV = cp.get("Account","SRV") PWD = cp.get("Account","PWD") - try: RESOURCE = cp.get("Account","RESOURCE") except: RESOURCE = 'bot' + + +## +## General +## try: - S5B_PROXY = cp.get("General","PROXY") -except: - S5B_PROXY = 'proxy.jabbim.cz' -try: - PCACHE = cp.get("General","PROXY") + PCACHE = cp.get("General","PCACHE") except: PCACHE = 'pcache.ini' +print PCACHE try: LOGFILE = cp.get("General","LOGFILE") except: @@ -28,7 +32,15 @@ try: PIDFILE = cp.get("General","PIDFILE") except: PIDFILE = 'pid' +try: + S5B_PROXY = cp.get("General","PROXY") +except: + S5B_PROXY = 'proxy.jabbim.cz' + +## +## Conference +## ROOM = cp.get("Conference","ROOM") PWD_ROOM = cp.get("Conference","PWD_ROOM")