From b4d80da3ffc9d4be0c933a8528c9e80173a7da54 Mon Sep 17 00:00:00 2001 From: Kevin Froman Date: Mon, 14 Sep 2020 23:28:01 +0000 Subject: [PATCH] Work on fixing node uptime --- run-onionr-node.py | 13 ++++++++----- src/netcontroller/torcontrol/gentorrc.py | 4 ++-- static-data/www/shared/sidebar/sidebar.css | 7 ++++++- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/run-onionr-node.py b/run-onionr-node.py index 13f615ab..b901db67 100755 --- a/run-onionr-node.py +++ b/run-onionr-node.py @@ -59,8 +59,8 @@ parser.add_argument( "--show-stats", help="Display curses output of Onionr stats", type=int, default=0) parser.add_argument( - "--skip-onboarding", help="Skip Onionr onboarding", - type=int, default=0) + "--onboarding", help="Use Onionr onboarding (if first load)", + type=int, default=1) parser.add_argument( "--security-level", help="Set Onionr security level", type=int, default=0) @@ -76,6 +76,9 @@ parser.add_argument( parser.add_argument( '--private-key', help='Use existing private key', type=int, default=1) +parser.add_argument( + '--animated-background', help='Animated background on webui index. Just for looks.', + type=int, default=0) args = parser.parse_args() p = Popen([sub_script, 'version'], stdout=DEVNULL) @@ -88,14 +91,14 @@ from coredb import blockmetadb with open(config_file, 'r') as cf: config = ujson.loads(cf.read()) -if args.skip_onboarding: +if not args.onboarding: config['onboarding']['done'] = True - print('Disabling onboarding') if not args.random_localhost_ip: - print('Disabling randomized localhost') config['general']['random_bind_ip'] = False if not args.use_tor: config['transports']['tor'] = False +if not args.animated_background: + config['ui']['animated_background'] = False config['general']['display_header'] = False config['general']['security_level'] = args.security_level diff --git a/src/netcontroller/torcontrol/gentorrc.py b/src/netcontroller/torcontrol/gentorrc.py index dbd1dc4c..d1dc8749 100644 --- a/src/netcontroller/torcontrol/gentorrc.py +++ b/src/netcontroller/torcontrol/gentorrc.py @@ -79,8 +79,8 @@ HashedControlPassword """ + str(password) + """ if config.get('general.security_level', 1) == 0: torrc_data += """\nHiddenServiceDir """ + home_dir + """hs/ \n""" + hs_ver + """\n -HiddenServiceNumIntroductionPoints 6 -HiddenServiceMaxStreams 100 +HiddenServiceNumIntroductionPoints 20 +HiddenServiceMaxStreams 500 HiddenServiceMaxStreamsCloseCircuit 1 HiddenServicePort 80 """ + api_server_ip + """:""" + str(hs_port) diff --git a/static-data/www/shared/sidebar/sidebar.css b/static-data/www/shared/sidebar/sidebar.css index 1ba8edef..1aeee862 100644 --- a/static-data/www/shared/sidebar/sidebar.css +++ b/static-data/www/shared/sidebar/sidebar.css @@ -1,4 +1,9 @@ .quickview-body{ font-size: 1em; - background-color: #38292c; + background-color: #282f2f; +} +.quickview-block{ + padding-left: 1em; + padding-top: 5px; + font-size: 1em; } \ No newline at end of file