pch_xyz/relay
1
0
Fork 0
mirror of https://git.pleroma.social/pleroma/relay.git synced 2024-11-22 14:38:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'upstream'

Browse source
This commit is contained in:
kjwon15 2018-12-29 13:41:14 +09:00
parent c1f1cfe066 950cd1e720
commit 65c80bca55
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
relay/actor.py
View file

@ -22,8 +22,8 @@ if "actorKeys" not in DATABASE:
pubkey = privkey.publickey() pubkey = privkey.publickey()
DATABASE["actorKeys"] = { DATABASE["actorKeys"] = {
"publicKey": pubkey.exportKey('PEM').decode('UTF-8'), "publicKey": pubkey.exportKey('PEM').decode('utf-8'),
"privateKey": privkey.exportKey('PEM').decode('UTF-8') "privateKey": privkey.exportKey('PEM').decode('utf-8')
} }

2
relay/default.py
View file

@ -7,9 +7,9 @@ host = CONFIG['ap']['host']
note = CONFIG['note'] note = CONFIG['note']
inboxes = DATABASE.get('relay-list', []) inboxes = DATABASE.get('relay-list', [])
targets = '<br>'.join([urllib.parse.urlsplit(target).hostname for target in inboxes])
async def default(request): async def default(request):
targets = '<br>'.join([urllib.parse.urlsplit(target).hostname for target in inboxes])
return aiohttp.web.Response( return aiohttp.web.Response(
status=200, status=200,
content_type="text/html", content_type="text/html",