kev/Onionr
1
0
Fork 0
Code Issues 24 Pull Requests Projects Releases 2 Wiki Activity

Use ONIONR_HOME or DATA_DIR env vars

Browse Source
This commit is contained in:
Arinerron 2019-03-28 12:08:07 -07:00
parent 9bd5efce1f
commit 8bae211a8d
No known key found for this signature in database
GPG Key ID: 99383627861C62F0
4 changed files with 18 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
onionr/config.py
View File

@ -20,13 +20,11 @@
import os, json, logger import os, json, logger
try: # set data dir
dataDir = os.environ['ONIONR_HOME'] dataDir = os.environ.get('ONIONR_HOME', os.environ.get('DATA_DIR', 'data/'))
if not dataDir.endswith('/'): if not dataDir.endswith('/'):
dataDir += '/' dataDir += '/'
except KeyError:
dataDir = 'data/'
_configfile = os.path.abspath(dataDir + 'config.json') _configfile = os.path.abspath(dataDir + 'config.json')
_config = {} _config = {}

10
onionr/core.py
View File

@ -39,12 +39,10 @@ class Core:
Initialize Core Onionr library Initialize Core Onionr library
''' '''
try: # set data dir
self.dataDir = os.environ['ONIONR_HOME'] self.dataDir = os.environ.get('ONIONR_HOME', os.environ.get('DATA_DIR', 'data/'))
if not self.dataDir.endswith('/'): if not self.dataDir.endswith('/'):
self.dataDir += '/' self.dataDir += '/'
except KeyError:
self.dataDir = 'data/'
try: try:
self.onionrInst = None self.onionrInst = None

12
onionr/netcontroller.py
View File

@ -46,12 +46,10 @@ class NetController:
''' '''
def __init__(self, hsPort, apiServerIP='127.0.0.1'): def __init__(self, hsPort, apiServerIP='127.0.0.1'):
try: # set data dir
self.dataDir = os.environ['ONIONR_HOME'] self.dataDir = os.environ.get('ONIONR_HOME', os.environ.get('DATA_DIR', 'data/'))
if not self.dataDir.endswith('/'): if not self.dataDir.endswith('/'):
self.dataDir += '/' self.dataDir += '/'
except KeyError:
self.dataDir = 'data/'
self.torConfigLocation = self.dataDir + 'torrc' self.torConfigLocation = self.dataDir + 'torrc'
self.readyState = False self.readyState = False
@ -165,7 +163,7 @@ HiddenServicePort 80 ''' + self.apiServerIP + ''':''' + str(self.hsPort)
except KeyboardInterrupt: except KeyboardInterrupt:
logger.fatal('Got keyboard interrupt.', timestamp = False, level = logger.LEVEL_IMPORTANT) logger.fatal('Got keyboard interrupt.', timestamp = False, level = logger.LEVEL_IMPORTANT)
return False return False
logger.debug('Finished starting Tor.', timestamp=True) logger.debug('Finished starting Tor.', timestamp=True)
self.readyState = True self.readyState = True

10
onionr/onionrplugins.py
View File

@ -21,12 +21,10 @@
import os, re, importlib, config, logger import os, re, importlib, config, logger
import onionrevents as events import onionrevents as events
try: # set data dir
dataDir = os.environ['ONIONR_HOME'] dataDir = os.environ.get('ONIONR_HOME', os.environ.get('DATA_DIR', 'data/'))
if not dataDir.endswith('/'): if not dataDir.endswith('/'):
dataDir += '/' dataDir += '/'
except KeyError:
dataDir = 'data/'
_pluginsfolder = dataDir + 'plugins/' _pluginsfolder = dataDir + 'plugins/'
_instances = dict() _instances = dict()