re6stnet: srv/res6stnet/registry -> srv/re6stnet

software/re6stnet/buildout.hash.cfg

@@ -18,7 +18,7 @@ md5sum = 99e8d2b0a0a937ca21d449b542fd8f45
 
 [template-re6stnet]
 filename = instance-re6stnet.cfg.in
-md5sum = 0a5e61e126ed5138e8d04fbb7670ae95
+md5sum = f6dbd62f8db7de1c431eb82b82568085
 
 [template-apache-conf]
 filename = apache.conf.in

software/re6stnet/instance-re6stnet.cfg.in

@@ -14,11 +14,10 @@ log = ${:var}/log
 services = ${:etc}/service
 script = ${:etc}/run
 run = ${:var}/run
-re6st = ${:srv}/res6stnet
 
 [re6stnet-dirs]
 recipe = slapos.cookbook:mkdirectory
-registry = ${directory:re6st}/registry
+data = ${directory:srv}/re6stnet
 log = ${directory:log}/re6stnet
 conf = ${directory:etc}/re6stnet
 ssl = ${:conf}/ssl
@@ -68,7 +67,7 @@ post = test ! -s ${apache-conf:pid-file} || {{ bin_directory }}/slapos-kill --pi
 port = 9201
 ipv4 = {{ ipv4 }}
 ipv6 = {{ ipv6 }}
-db = ${re6stnet-dirs:registry}/registry.db
+db = ${re6stnet-dirs:data}/registry.db
 ca = ${re6stnet-dirs:ssl}/re6stnet.crt
 key = ${re6stnet-dirs:ssl}/re6stnet.key
 dh = ${re6stnet-dirs:ssl}/dh.pem
@@ -93,6 +92,20 @@ template = {{ parameter_dict['template-re6st-registry-conf'] }}
 rendered = ${directory:etc}/re6st-registry.conf
 context = section parameter_dict re6st-registry-conf-dict
 
+depends = ${re6st-compat:recipe}
+[re6st-compat]
+recipe = slapos.recipe.build
+update =
+  import errno, os
+  res6stnet = self.buildout['directory']['srv'] + '/res6stnet'
+  try:
+    os.rename(res6stnet + '/registry', self.buildout['re6stnet-dirs']['data'])
+  except OSError as e:
+    if e.errno != errno.ENOENT:
+      raise
+  else:
+    os.rmdir(res6stnet)
+
 [re6st-registry-wrapper]
 recipe = slapos.cookbook:wrapper
 wrapper-path = ${directory:services}/re6st-registry