diff --git a/onionr/onionrcommands/parser/arguments.py b/onionr/onionrcommands/parser/arguments.py index 8251f847..2eb87862 100644 --- a/onionr/onionrcommands/parser/arguments.py +++ b/onionr/onionrcommands/parser/arguments.py @@ -22,7 +22,7 @@ from .. import banblocks # Command to blacklist a block by its hash from .. import filecommands # commands to share files with onionr from .. import exportblocks # commands to export blocks from .. import pubkeymanager # commands to add or change id -from .. import resettor # command to reset the tor data directory +from .. import resettor # commands to reset the tor data directory or transport keypair from .. import resetplugins # command to reinstall default plugins import onionrexceptions from onionrutils import importnewblocks # func to import new blocks @@ -46,7 +46,8 @@ def get_arguments(): ('addid', 'add-id'): pubkeymanager.add_ID, ('changeid', 'change-id'): pubkeymanager.change_ID, ('resettor', 'reset-tor'): resettor.reset_tor, - ('resetplugins', 'reset-plugins'): resetplugins.reset + ('resetplugins', 'reset-plugins'): resetplugins.reset, + ('reset-tor-node-transport'): resettor.reset_tor_key_pair } return args diff --git a/onionr/onionrcommands/resettor.py b/onionr/onionrcommands/resettor.py index 86bc9c3f..a3712c33 100755 --- a/onionr/onionrcommands/resettor.py +++ b/onionr/onionrcommands/resettor.py @@ -20,11 +20,19 @@ import os, shutil import logger from onionrutils import localcommand +from utils import identifyhome -def reset_tor(): - tor_dir = c.dataDir + 'tordata' +def __delete(directory): + tor_dir = '%s/%s/' % (identifyhome.identify_home(), directory) if os.path.exists(tor_dir): if localcommand.local_command('/ping') == 'pong!': logger.warn('Cannot delete Tor data while Onionr is running', terminal=True) else: - shutil.rmtree(tor_dir) \ No newline at end of file + shutil.rmtree(tor_dir) + logger.info('Tor reset', terminal=True) + +def reset_tor(): + __delete('tordata') + +def reset_tor_key_pair(): + __delete('hs') diff --git a/onionr/static-data/bootstrap-nodes.txt b/onionr/static-data/bootstrap-nodes.txt index e69de29b..0201f0fd 100755 --- a/onionr/static-data/bootstrap-nodes.txt +++ b/onionr/static-data/bootstrap-nodes.txt @@ -0,0 +1 @@ +3msj7fgyxgpfsjvvtcji7a4tkjbna6jmpealv6mun7435jjyptctfxyd.onion \ No newline at end of file diff --git a/onionr/static-data/www/mail/index.html b/onionr/static-data/www/mail/index.html index 9aa1d56b..5be550b9 100755 --- a/onionr/static-data/www/mail/index.html +++ b/onionr/static-data/www/mail/index.html @@ -98,7 +98,7 @@ Subject:
- +
diff --git a/onionr/static-data/www/mail/mail.css b/onionr/static-data/www/mail/mail.css index 72240f55..c01ec3bd 100755 --- a/onionr/static-data/www/mail/mail.css +++ b/onionr/static-data/www/mail/mail.css @@ -33,4 +33,8 @@ .sentboxList{ padding-top: 1em; +} + +.messageContent{ + padding-top: 1em; } \ No newline at end of file