Skip to content

S
slapos-mynij-dev
Commit cb7c7fe2 authored by Alain Takoudjou's avatar Alain Takoudjou
Browse files
Options

fixup cloudooo: publish apache urls

parent 578f65bd
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
software/cloudooo/instance-cloudooo.cfg.in
View file @ cb7c7fe2
...@@ -157,7 +157,7 @@ post = test ! -s ${apache-conf-parameter-dict:pid-file} || {{ bin_directory }}/s ...@@ -157,7 +157,7 @@ post = test ! -s ${apache-conf-parameter-dict:pid-file} || {{ bin_directory }}/s
[publish] [publish]
recipe = slapos.cookbook:publish.serialised recipe = slapos.cookbook:publish.serialised
{% for family_name, (apache_port, scheme, _) in apache_dict.items() -%} {% for family_name, (apache_port, scheme, _, _) in apache_dict.items() -%}
{{ family_name ~ '-v6' }} = {% if ipv6_set %}{{ scheme ~ '://[' ~ ipv6 ~ ']:' ~ apache_port }}{% endif %} {{ family_name ~ '-v6' }} = {% if ipv6_set %}{{ scheme ~ '://[' ~ ipv6 ~ ']:' ~ apache_port }}{% endif %}
{{ family_name }} = {{ scheme ~ '://' ~ ipv4 ~ ':' ~ apache_port }} {{ family_name }} = {{ scheme ~ '://' ~ ipv4 ~ ':' ~ apache_port }}
{% endfor -%} {% endfor -%}
......
software/cloudooo/software-common.cfg
View file @ cb7c7fe2
...@@ -83,5 +83,5 @@ template-logrotate-base = ${template-logrotate-base:rendered} ...@@ -83,5 +83,5 @@ template-logrotate-base = ${template-logrotate-base:rendered}
[template-cloudooo-instance] [template-cloudooo-instance]
recipe = slapos.recipe.build:download recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/instance-cloudooo.cfg.in url = ${:_profile_base_location_}/instance-cloudooo.cfg.in
md5sum = 0a260754586e2a44010f3303c58a927a md5sum = 045830db85e1200f765788aa8b62289e
mode = 640 mode = 640
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