fix re6stnet log rotate, split certificate generation

slapos/recipe/re6stnet/__init__.py

@@ -29,7 +29,7 @@ import subprocess
 from slapos.recipe.librecipe import GenericBaseRecipe
 import socket
 import struct
-import os
+import os, stat
 import string, random
 import json
 import traceback
@@ -72,12 +72,18 @@ class Recipe(GenericBaseRecipe):
     key_file = self.options['key-file'].strip()
     cert_file = self.options['cert-file'].strip()
     dh_file = self.options['dh-file'].strip()
-    if not os.path.exists(key_file):
-      serial = self.getSerialFromIpv6(self.options['ipv6-prefix'].strip())
-
+    if not os.path.exists(dh_file):
       dh_command = [self.options['openssl-bin'], 'dhparam', '-out',
                             '%s' % dh_file, self.options['key-size']]
+      try:
+        subprocess.check_call(dh_command)
+      except Exception:
+        if os.path.exists(dh_file):
+          os.unlink(dh_file)
+        raise
 
+    if not os.path.exists(cert_file):
+      serial = self.getSerialFromIpv6(self.options['ipv6-prefix'].strip())
       key_command = [self.options['openssl-bin'], 'genrsa', '-out',
                             '%s' % key_file, self.options['key-size']]
 
@@ -86,9 +92,19 @@ class Recipe(GenericBaseRecipe):
                   '-x509', '-batch', '-key', '%s' % key_file, '-set_serial',
                   '%s' % serial, '-days', '3650', '-out', '%s' % cert_file]
 
-      subprocess.check_call(dh_command)
+      try:
         subprocess.check_call(key_command)
+      except Exception:
+        if os.path.exists(key_file):
+          os.unlink(key_file)
+        raise
+
+      try:
         subprocess.check_call(cert_command)
+      except Exception:
+        if os.path.exists(cert_file):
+          os.unlink(cert_file)
+        raise
 
   def generateSlaveTokenList(self, slave_instance_list, token_file):
     to_remove_dict = {}
@@ -150,9 +166,15 @@ class Recipe(GenericBaseRecipe):
 
     self.generateCertificate()
 
-    wrapper = self.createWrapper(name=self.options['wrapper'],
-                            command=self.options['command'],
-                            parameters=['@%s' % self.options['config-file']])
+    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)
 

slapos/recipe/re6stnet/template/registry-run.in

+#!/bin/sh
+
+echo $$ > %(pid_file)s
+exec %(command)s \
+  %(parameter)s
\ No newline at end of file

software/re6stnet/instance-re6stnet.cfg.in

@@ -123,6 +123,7 @@ context = section parameter_dict re6st-registry-conf-dict
 recipe = slapos.cookbook:re6stnet.registry
 command = {{ re6st_registry }}
 wrapper = ${directory:services}/re6st-registry
+pid-file = ${directory:run}/registry.pid
 manager-wrapper = ${directory:bin}/re6stManageToken
 check-service-wrapper = ${directory:bin}/re6stCheckService
 drop-service-wrapper = ${directory:bin}/re6stManageDeleteToken
@@ -178,6 +179,7 @@ command = {{ python_bin }} ${re6st-registry:drop-service-wrapper}
 < = logrotate-entry-base
 name = re6stnet
 log = ${re6st-registry-conf-dict:logfile}
+post = {{ parameter_dict['bin-directory'] }}/slapos-kill --pidfile ${re6st-registry:pid-file} -s USR1
 
 [re6st-registry-promise]
 recipe = slapos.cookbook:check_port_listening

software/re6stnet/software.cfg

@@ -94,7 +94,7 @@ extra-context =
 [template-re6stnet]
 < = download-base
 filename = instance-re6stnet.cfg.in
-md5sum = ff1242b9ed8295181e4a4178d480dbcb
+md5sum = c83fceedba8a817d49f8cf56bfbc2b83
 
 [template-logrotate-base]
 < = template-jinja2-base