mirror of https://gitlab.com/bashrc2/epicyon
Check that alternative domains exist
parent
5573613fb8
commit
bb22f0e87d
|
|
@ -2408,20 +2408,21 @@ def daemon_http_get(self) -> None:
|
||||||
return
|
return
|
||||||
|
|
||||||
if self.path in ('/specification', '/protocol', '/activitypub'):
|
if self.path in ('/specification', '/protocol', '/activitypub'):
|
||||||
if calling_domain.endswith('.onion'):
|
if calling_domain.endswith('.onion') and self.server.onion_domain:
|
||||||
msg = \
|
msg = \
|
||||||
html_specification(self.server.base_dir, 'http',
|
html_specification(self.server.base_dir, 'http',
|
||||||
self.server.onion_domain,
|
self.server.onion_domain,
|
||||||
None, self.server.translate,
|
None, self.server.translate,
|
||||||
self.server.system_language)
|
self.server.system_language)
|
||||||
elif calling_domain.endswith('.i2p'):
|
elif calling_domain.endswith('.i2p') and self.server.i2p_domain:
|
||||||
msg = \
|
msg = \
|
||||||
html_specification(self.server.base_dir, 'http',
|
html_specification(self.server.base_dir, 'http',
|
||||||
self.server.i2p_domain,
|
self.server.i2p_domain,
|
||||||
None,
|
None,
|
||||||
self.server.translate,
|
self.server.translate,
|
||||||
self.server.system_language)
|
self.server.system_language)
|
||||||
elif is_yggdrasil_address(calling_domain):
|
elif (is_yggdrasil_address(calling_domain) and
|
||||||
|
self.server.yggdrasil_domain):
|
||||||
msg = \
|
msg = \
|
||||||
html_specification(self.server.base_dir, 'http',
|
html_specification(self.server.base_dir, 'http',
|
||||||
self.server.yggdrasil_domain,
|
self.server.yggdrasil_domain,
|
||||||
|
|
@ -2450,7 +2451,7 @@ def daemon_http_get(self) -> None:
|
||||||
http_403(self)
|
http_403(self)
|
||||||
return
|
return
|
||||||
|
|
||||||
if calling_domain.endswith('.onion'):
|
if calling_domain.endswith('.onion') and self.server.onion_domain:
|
||||||
msg = \
|
msg = \
|
||||||
html_known_epicyon_instances(
|
html_known_epicyon_instances(
|
||||||
self.server.base_dir, 'http',
|
self.server.base_dir, 'http',
|
||||||
|
|
@ -2458,7 +2459,7 @@ def daemon_http_get(self) -> None:
|
||||||
self.server.system_language,
|
self.server.system_language,
|
||||||
self.server.known_epicyon_instances,
|
self.server.known_epicyon_instances,
|
||||||
self.server.translate)
|
self.server.translate)
|
||||||
elif calling_domain.endswith('.i2p'):
|
elif calling_domain.endswith('.i2p') and self.server.i2p_domain:
|
||||||
msg = \
|
msg = \
|
||||||
html_known_epicyon_instances(
|
html_known_epicyon_instances(
|
||||||
self.server.base_dir, 'http',
|
self.server.base_dir, 'http',
|
||||||
|
|
@ -2466,7 +2467,8 @@ def daemon_http_get(self) -> None:
|
||||||
self.server.system_language,
|
self.server.system_language,
|
||||||
self.server.known_epicyon_instances,
|
self.server.known_epicyon_instances,
|
||||||
self.server.translate)
|
self.server.translate)
|
||||||
elif is_yggdrasil_address(calling_domain):
|
elif (is_yggdrasil_address(calling_domain) and
|
||||||
|
self.server.yggdrasil_domain):
|
||||||
msg = \
|
msg = \
|
||||||
html_known_epicyon_instances(
|
html_known_epicyon_instances(
|
||||||
self.server.base_dir, 'http',
|
self.server.base_dir, 'http',
|
||||||
|
|
@ -2493,19 +2495,20 @@ def daemon_http_get(self) -> None:
|
||||||
return
|
return
|
||||||
|
|
||||||
if self.path in ('/manual', '/usermanual', '/userguide'):
|
if self.path in ('/manual', '/usermanual', '/userguide'):
|
||||||
if calling_domain.endswith('.onion'):
|
if calling_domain.endswith('.onion') and self.server.onion_domain:
|
||||||
msg = \
|
msg = \
|
||||||
html_manual(self.server.base_dir, 'http',
|
html_manual(self.server.base_dir, 'http',
|
||||||
self.server.onion_domain,
|
self.server.onion_domain,
|
||||||
None, self.server.translate,
|
None, self.server.translate,
|
||||||
self.server.system_language)
|
self.server.system_language)
|
||||||
elif calling_domain.endswith('.i2p'):
|
elif calling_domain.endswith('.i2p') and self.server.i2p_domain:
|
||||||
msg = \
|
msg = \
|
||||||
html_manual(self.server.base_dir, 'http',
|
html_manual(self.server.base_dir, 'http',
|
||||||
self.server.i2p_domain,
|
self.server.i2p_domain,
|
||||||
None, self.server.translate,
|
None, self.server.translate,
|
||||||
self.server.system_language)
|
self.server.system_language)
|
||||||
elif is_yggdrasil_address(calling_domain):
|
elif (is_yggdrasil_address(calling_domain) and
|
||||||
|
self.server.yggdrasil_domain):
|
||||||
msg = \
|
msg = \
|
||||||
html_manual(self.server.base_dir, 'http',
|
html_manual(self.server.base_dir, 'http',
|
||||||
self.server.yggdrasil_domain,
|
self.server.yggdrasil_domain,
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue