re6st-registry: Move the wrapper out of the recipe

  This commit is a clean up, it don't change anything for the final behaviour.

slapos/recipe/re6stnet/__init__.py

@@ -168,18 +168,6 @@ class Recipe(GenericBaseRecipe):
 
     self.generateCertificate()
 
-    wrapper = self.createFile(self.options['wrapper'], self.substituteTemplate(
-      self.getTemplateFilename('registry-run.in'), dict(
-          parameter='@%s' % self.options['config-file'],
-          pid_file=self.options['pid-file'],
-          command=self.options['command']
-        )
-      )
-    )
-    os.chmod(self.options['wrapper'], stat.S_IRWXU)
-
-    path_list.append(wrapper)
-
     registry_url = 'http://%s:%s/' % (self.options['ipv4'], self.options['port'])
     token_dict, add_token_dict, rm_token_dict = self.generateSlaveTokenList(
                                               self.slave_list, token_save_path)
@@ -206,7 +194,7 @@ class Recipe(GenericBaseRecipe):
                         token_json=token_save_path,
                         partition_id=self.computer_partition_id,
                         computer_id=self.computer_id,
-                        registry_url=registry_url
+                        registry_url=registry_url,
                         server_url=self.server_url,
                         cert_file=self.cert_file,
                         key_file=self.key_file)

software/re6stnet/instance-re6stnet.cfg.in

@@ -132,11 +132,18 @@ template = {{ parameter_dict['template-re6st-registry-conf'] }}
 rendered = ${directory:etc}/re6st-registry.conf
 context = section parameter_dict re6st-registry-conf-dict
 
+[re6st-registry-wrapper]
+recipe = slapos.recipe.template:jinja2
+template = {{ parameter_dict['template-registry-run'] }}
+rendered = ${directory:services}/re6st-registry
+pid-file = ${directory:run}/registry.pid
+context =
+  key pid_file :pid-file
+  raw re6st_command {{ re6st_registry }}
+  key re6st_conf re6st-registry-conf:rendered
+
 [re6st-registry]
 recipe = slapos.cookbook:re6stnet.registry
-command = {{ re6st_registry }}
-wrapper = ${directory:services}/re6st-registry
-pid-file = ${directory:run}/registry.pid
 manager-wrapper = ${directory:bin}/re6stManageToken
 openssl-bin = {{ openssl_bin }}/openssl
 python-bin = {{ python_bin }}
@@ -175,7 +182,7 @@ command = {{ python_bin }} ${re6st-registry:manager-wrapper}
 < = logrotate-entry-base
 name = re6stnet
 log = ${re6st-registry-conf-dict:logfile}
-post = test ! -s ${re6st-registry:pid-file} || {{ parameter_dict['bin-directory'] }}/slapos-kill --pidfile ${re6st-registry:pid-file} -s USR1
+post = test ! -s ${re6st-registry-wrapper:pid-file} || {{ parameter_dict['bin-directory'] }}/slapos-kill --pidfile ${re6st-registry-wrapper:pid-file} -s USR1
 
 [re6st-registry-promise]
 recipe = slapos.cookbook:check_port_listening

software/re6stnet/instance.cfg.in

@@ -36,6 +36,7 @@ template-apache-conf = {{ template_apache_conf }}
 template-wrapper = {{ template_wrapper }}
 apache-location = {{ apache_location }}
 template-re6st-registry-conf = {{ template_re6st_registry_conf }}
+template-registry-run = {{ template_registry_run }}
 
 [dynamic-template-re6stnet]
 < = jinja2-template-base

software/re6stnet/registry-run.in

+#!/bin/bash
+
+echo $$ > {{ pid_file }}
+exec {{ re6st_command }} @{{ re6st_conf }}

software/re6stnet/software.cfg

@@ -14,7 +14,7 @@ extends =
 # Monitoring stack (keep on bottom)
   ../../stack/monitor/buildout.cfg
 
-extensions -=                                                                                   
+extensions -=
   buildout-versions
 
 parts +=
@@ -67,23 +67,25 @@ context =
 < = template-jinja2-base
 filename = template.cfg
 template = ${:_profile_base_location_}/instance.cfg.in
-md5sum = 84387d5af13561447c1170704a2076a6
+md5sum = 610fc6fd0444d3bab3fca4478572749a
 extra-context =
     key apache_location apache:location
     key dash_location dash:location
+    key logrotate_location logrotate:location
     key openssl_location openssl:location
     key template_apache_conf template-apache-conf:target
     key template_re6stnet template-re6stnet:target
     key template_re6st_registry_conf template-re6st-registry-conf:target
     key template_logrotate_base template-logrotate-base:rendered
     key template_wrapper template-wrapper:target
+    key template_registry_run template-registry-run:target
     key monitor2_template_rendered monitor2-template:rendered
     raw python_with_eggs ${buildout:directory}/bin/${extra-eggs:interpreter}
 
 [template-re6stnet]
 < = download-base
 filename = instance-re6stnet.cfg.in
-md5sum = 4596d91cef4184b97d257a68478b6330
+md5sum = 9e5e6cf010ec2a329e6bc8def7f95ba7
 
 [template-apache-conf]
 < = download-base
@@ -100,10 +102,15 @@ md5sum = 5dc218f887faeffc466e41c7d6191e49
 filename = wrapper.in
 md5sum = 69e63cb58267335e21da772bd867657e
 
+[template-registry-run]
+< = download-base
+filename = registry-run.in
+md5sum = 0bf4f2c03e06b55c6c6cc55fa33e65d6
+
 [versions]
-setuptools = 28.8.0                                                                             
-zc.buildout = 2.5.2+slapos005                                                                   
-zc.recipe.egg = 2.0.3+slapos002    
+setuptools = 28.8.0
+zc.buildout = 2.5.2+slapos005
+zc.recipe.egg = 2.0.3+slapos002
 apache-libcloud = 0.17.0
 ecdsa = 0.13
 gitdb = 0.6.4