Merge branch 'master' of github.com:kellya/chainlink

This commit is contained in:
Alex Kelly 2020-01-05 20:28:02 -05:00
commit daa2b825e1
2 changed files with 11 additions and 3 deletions

View file

@ -15,16 +15,18 @@ def root():
host = request.get_header('host') host = request.get_header('host')
helptext = f""" helptext = f"""
<p>General format is {host}/&lt;domain&gt;/&lt;action&gt; <p>General format is {host}/&lt;domain&gt;/&lt;action&gt;
<p>If <action> is blank, it will attempt to use the redirect <p>If &lt;action&gt; is blank, it will attempt to use the redirect
<p>You may also/optionally specify an action which can be any of the following <p>You may also/optionally specify an action which can be any of the following
<table margin-left="100px"> <table margin-left="100px">
<tr> <tr>
<td>raw</td> <td>raw</td>
<td>Show the raw json (formatted as an html table)</td> <td>Show the raw json (formatted as an html table)</td>
</tr> </tr>
<tr>
<td>html</td> <td>html</td>
<td>Hit the IPFS hash via cloudflare-ipfs.com</td> <td>Hit the IPFS hash via cloudflare-ipfs.com</td>
</tr> </tr>
<tr>
<td>redir</td> <td>redir</td>
<td>Use the redirect parameter and just return a 302 redirect to whatever is set</td> <td>Use the redirect parameter and just return a 302 redirect to whatever is set</td>
</tr> </tr>
@ -69,4 +71,4 @@ def redirectDomain(domain, action=None):
return json2html.json2html.convert(json = body) return json2html.json2html.convert(json = body)
if __name__ == "__main__": if __name__ == "__main__":
run(app, host='localhost', port='5000', reloader=True) run(app, host='0.0.0.0', port='5000', reloader=True)

View file

@ -1,6 +1,12 @@
bottle==0.12.18
certifi==2019.11.28
chardet==3.0.4
Click==7.0 Click==7.0
Flask==1.1.1 idna==2.8
itsdangerous==1.1.0 itsdangerous==1.1.0
Jinja2==2.10.3 Jinja2==2.10.3
json2html==1.3.0
MarkupSafe==1.1.1 MarkupSafe==1.1.1
requests==2.22.0
urllib3==1.25.7
Werkzeug==0.16.0 Werkzeug==0.16.0