relay/application.py

@@ -26,13 +26,6 @@ class Application(web.Application):
 		if not self['config'].load():
 			self['config'].save()
 
-		if self.config.is_docker:
-			self.config.update({
-				'db': '/data/relay.jsonld',
-				'listen': '0.0.0.0',
-				'port': 8080
-			})
-
 		self['workers'] = []
 		self['last_worker'] = 0
 

relay/database.py

@@ -76,7 +76,7 @@ class RelayDatabase(dict):
 
 		if not self['private-key']:
 			logging.info("No actor keys present, generating 4096-bit RSA keypair.")
-			self.signer = aputils.Signer.new(self.config.keyid, size=4096)
+			self.signer = aputils.Signer.new(self.config.keyid, 4096)
 			self['private-key'] = self.signer.export()
 
 		else:

relay/http_client.py

@@ -159,7 +159,7 @@ class HttpClient:
 				return logging.verbose(await resp.read()) # change this to debug
 
 		except (ClientConnectorError, ServerTimeoutError):
-			logging.verbose(f'Failed to connect to {url}')
+			logging.verbose(f'Failed to connect to {url.netloc}')
 
 		## prevent workers from being brought down
 		except Exception as e:
@@ -174,10 +174,6 @@ class HttpClient:
 			loads = WellKnownNodeinfo.new_from_json
 		)
 
-		if not wk_nodeinfo:
-			logging.verbose(f'Failed to fetch well-known nodeinfo url for domain: {domain}')
-			return False
-
 		for version in ['20', '21']:
 			try:
 				nodeinfo_url = wk_nodeinfo.get_url(version)

relay/manage.py

@@ -43,12 +43,11 @@ def cli_setup():
 
 		click.echo('The domain must not be example.com')
 
-	if not app.config.is_docker:
+	app.config.listen = click.prompt('Which address should the relay listen on?', default=app.config.listen)
-		app.config.listen = click.prompt('Which address should the relay listen on?', default=app.config.listen)
 
-		while True:
+	while True:
-			app.config.port = click.prompt('What TCP port should the relay listen on?', default=app.config.port, type=int)
+		app.config.port = click.prompt('What TCP port should the relay listen on?', default=app.config.port, type=int)
-			break
+		break
 
 	app.config.save()
 

setup.cfg

@@ -28,7 +28,7 @@ install_requires =
     click >= 8.1.2
     pycryptodome >= 3.14.1
     PyYAML >= 5.0.0
-    aputils @ git+https://git.barkshark.xyz/barkshark/aputils@2cd1776f12
+    aputils @ https://git.barkshark.xyz/barkshark/aputils/archive/0.1.2.tar.gz
 python_requires = >=3.6
 
 [options.extras_require]