From cebe544fac7a790e3c3d701ad011e668ce73c522 Mon Sep 17 00:00:00 2001 From: kjwon15 Date: Tue, 19 Jan 2016 09:21:55 +0900 Subject: [PATCH 1/2] Get PORT env for dokku(-alt) apps --- assets/tor_config.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/assets/tor_config.py b/assets/tor_config.py index 14590d7..0424765 100644 --- a/assets/tor_config.py +++ b/assets/tor_config.py @@ -11,8 +11,9 @@ def set_conf(): with open("/etc/tor/torrc", "a") as conf: for link in links: path = "/var/lib/tor/hidden_service/{service}".format(service=link) + env_port = links[link]['environment'].get('PORT') # Test if link has ports - if len(links[link]['ports']) == 0: + if len(links[link]['ports']) == 0 and not env_port: print("{link} has no port") continue conf.write('HiddenServiceDir {path}\n'.format(path=path)) @@ -26,6 +27,13 @@ def set_conf(): conf.write('HiddenServicePort {service}\n'.format( service=service )) + if env_port: + service = '{port} {ip}:{port}'.format( + port=env_port, ip=links[link]['ip'] + ) + conf.write('HiddenServicePort {service}\n'.format( + service=service + )) # set relay if enabled in env (not so secure) if 'RELAY' in os.environ: conf.write("ORPort 9001\n") From d4d3ab3eb91e3e2fe81ac036eb7ef9d3ce167115 Mon Sep 17 00:00:00 2001 From: kjwon15 Date: Tue, 19 Jan 2016 09:47:20 +0900 Subject: [PATCH 2/2] Expose dokku app on 80 port --- assets/tor_config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/tor_config.py b/assets/tor_config.py index 0424765..5cfbabb 100644 --- a/assets/tor_config.py +++ b/assets/tor_config.py @@ -28,7 +28,7 @@ def set_conf(): service=service )) if env_port: - service = '{port} {ip}:{port}'.format( + service = '80 {ip}:{port}'.format( port=env_port, ip=links[link]['ip'] ) conf.write('HiddenServicePort {service}\n'.format(