re6stnet: move registry conf to a more appropriate place

aad7050a · Julien Muchembled · 9fc19401 · aad7050a · aad7050a
Commit aad7050a authored Apr 07, 2021 by Julien Muchembled
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

software/re6stnet/buildout.hash.cfg software/re6stnet/buildout.hash.cfg +1 -1

software/re6stnet/instance-re6stnet.cfg.in software/re6stnet/instance-re6stnet.cfg.in +1 -1

No files found.
--- a/software/re6stnet/buildout.hash.cfg
+++ b/software/re6stnet/buildout.hash.cfg
@@ -18,7 +18,7 @@ md5sum = 01938aa1683b7994f814fff6d964b9ba

 [template-re6stnet]
 filename = instance-re6stnet.cfg.in
-md5sum = 1dee1b15c4ec19e523038c806d83ee12
+md5sum = 4e4475c8ef80a3a53aa63a2ae444586d

 [template-apache-conf]
 filename = apache.conf.in

--- a/software/re6stnet/instance-re6stnet.cfg.in
+++ b/software/re6stnet/instance-re6stnet.cfg.in
@@ -88,7 +88,7 @@ same-country = {{ slapparameter_dict.get('same-country', '') }}
 [re6st-registry-conf]
 recipe = slapos.recipe.template:jinja2
 template = {{ parameter_dict['template-re6st-registry-conf'] }}
-rendered = ${directory:etc}/re6st-registry.conf
+rendered = ${re6stnet-dirs:conf}/registry.conf
 context = section parameter_dict re6st-registry-conf-dict

 depends = ${re6st-compat:recipe}