Skip to content

slapos-caddy
slapos-caddy
Commit 6b454bd7 authored by Cédric de Saint Martin's avatar Cédric de Saint Martin
Browse files
Options

Add public_ipv4 parameter support to ease deployment of slave frontend

parent a1721a06
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 3 deletions
slapos/recipe/apache_frontend/__init__.py
View file @ 6b454bd7
...@@ -168,9 +168,12 @@ class Recipe(BaseSlapRecipe): ...@@ -168,9 +168,12 @@ class Recipe(BaseSlapRecipe):
"instance: %s" % reference) "instance: %s" % reference)
try: try:
connection_dict = { connection_dict = {
'frontend_ipv6_address': self.getGlobalIPv6Address(), # Send the public IPs (if possible) so that user knows what IP
'frontend_ipv4_address': self.getLocalIPv4Address(), # to bind to its domain name
'site_url': url 'frontend_ipv6_address': self.getGlobalIPv6Address(),
'frontend_ipv4_address': self.parameter_dict.get("public-ipv4",
self.getLocalIPv4Address()),
'site_url': url,
} }
self.setConnectionDict(connection_dict, reference) self.setConnectionDict(connection_dict, reference)
except: except:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7