Mercurial > libervia-web
diff libervia_server/libervia.sh @ 417:2bd609d7dd65
server_side: use XDG recommended paths as the defaults
author | souliane <souliane@mailoo.org> |
---|---|
date | Sun, 23 Mar 2014 23:05:23 +0100 |
parents | 9834136b15ed |
children | ec8775575886 |
line wrap: on
line diff
--- a/libervia_server/libervia.sh Mon Mar 24 17:12:14 2014 +0100 +++ b/libervia_server/libervia.sh Sun Mar 23 23:05:23 2014 +0100 @@ -19,31 +19,29 @@ #We use python to parse config files eval `"$PYTHON" << PYTHONEND +from sat.core.constants import Const from ConfigParser import SafeConfigParser from os.path import expanduser, join import sys -config = SafeConfigParser(defaults={'local_dir':'~/.libervia', - 'pid_dir':'/tmp', - 'log_dir':'%(local_dir)s'}) +config = SafeConfigParser(defaults=Const.DEFAULT_CONFIG) try: - config.read(map(expanduser, ['/etc/libervia.conf', '~/libervia.conf', '~/.libervia.conf', 'libervia.conf', '.libervia.conf'])) + config.read(Const.CONFIG_FILES) except: print ("echo \"/!\\ Can't read main config ! Please check the syntax\";") print ("exit 1") sys.exit() env=[] -env.append("LOCAL_DIR='%s'" % join(expanduser(config.get('DEFAULT', 'local_dir')),'')) env.append("PID_DIR='%s'" % join(expanduser(config.get('DEFAULT', 'pid_dir')),'')) -env.append("LOG_DIR='%s'" % join(expanduser(config.get('DEFAULT', 'pid_dir')),'')) +env.append("LOG_DIR='%s'" % join(expanduser(config.get('DEFAULT', 'log_dir')),'')) print ";".join(env) PYTHONEND ` PID_FILE="$PID_DIR$NAME.pid" -LOG_FILE="$LOCAL_DIR$NAME.log" +LOG_FILE="$LOG_DIR$NAME.log" DAEMON="n" MAIN_OPTIONS="-${DAEMON}o"