Skip to content

slapos
slapos
Commit ac475276 authored by Rafael Monnerat's avatar Rafael Monnerat
Browse files
Options

erp5testnode: ca-httpd is duplicated with section present on monitor

parent 86e26fbd
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
software/erp5testnode/instance-default.cfg
View file @ ac475276
...@@ -13,7 +13,7 @@ parts = ...@@ -13,7 +13,7 @@ parts =
shellinabox shellinabox
certificate-authority certificate-authority
ca-shellinabox ca-shellinabox
ca-httpd ca-httpd-testnode
monitor-base monitor-base
monitor-publish monitor-publish
...@@ -126,7 +126,7 @@ wrapper = $${basedirectory:services}/shellinaboxd ...@@ -126,7 +126,7 @@ wrapper = $${basedirectory:services}/shellinaboxd
key-file = $${shellinabox:key-file} key-file = $${shellinabox:key-file}
cert-file = $${shellinabox:cert-file} cert-file = $${shellinabox:cert-file}
[ca-httpd] [ca-httpd-testnode]
<= certificate-authority <= certificate-authority
recipe = slapos.cookbook:certificate_authority.request recipe = slapos.cookbook:certificate_authority.request
executable = $${testnode:httpd-wrapper} executable = $${testnode:httpd-wrapper}
......
software/erp5testnode/software.cfg
View file @ ac475276
...@@ -61,7 +61,7 @@ recipe = slapos.recipe.template ...@@ -61,7 +61,7 @@ recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-default.cfg url = ${:_profile_base_location_}/instance-default.cfg
output = ${buildout:directory}/template-default.cfg output = ${buildout:directory}/template-default.cfg
mode = 0644 mode = 0644
md5sum = 621c84f7adcba394686acbaf44cc1d7d md5sum = 7fb3f4177dccac601d8fafd342af3c38
[versions] [versions]
PyXML = 0.8.5 PyXML = 0.8.5
......
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