Merge branch 'upstream'
This commit is contained in:
commit
65c80bca55
|
@ -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')
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -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",
|
||||||
|
|
Loading…
Reference in New Issue