re6stnet: clean-up

software/re6stnet/buildout.hash.cfg

@@ -14,11 +14,11 @@
 # not need these here).
 [template]
 filename = instance.cfg.in
-md5sum = 610fc6fd0444d3bab3fca4478572749a
+md5sum = eea691b0919812b9717f17005f06681d
 
 [template-re6stnet]
 filename = instance-re6stnet.cfg.in
-md5sum = 002f7405f565c82219b0d4b92790ff8c
+md5sum = 7074948c958220e39a44f2c6cb56a0bb
 
 [template-apache-conf]
 filename = apache.conf.in
@@ -27,11 +27,3 @@ md5sum = 2ed3c4e9b9d58d2e57cda227bdd454d2
 [template-re6st-registry-conf]
 filename = re6st-registry.conf.in
 md5sum = b0f0facfea82a4481f4fb5b0b263e09a
-
-[template-wrapper]
-filename = wrapper.in
-md5sum = 7633bdfc0e638ff9979f963fbbca8f13
-
-[template-registry-run]
-filename = registry-run.in
-md5sum = 0bf4f2c03e06b55c6c6cc55fa33e65d6

software/re6stnet/instance-re6stnet.cfg.in

-
+{% set bin_directory = parameter_dict['bin-directory'] -%}
 {% set python_bin = parameter_dict['python-executable'] -%}
-{% set re6st_registry = parameter_dict['re6st-registry'] -%}
-{% set re6stnet = parameter_dict['re6stnet'] -%}
 {% set publish_dict = {} -%}
 {% set part_list = [] -%}
 {% set ipv6 = (ipv6_set | list)[0] -%}
@@ -96,18 +94,19 @@ hash-existing-files = ${buildout:directory}/software_release/buildout.cfg
 
 [apache-httpd-graceful]
 recipe = slapos.recipe.template:jinja2
-template = {{ parameter_dict['template-wrapper'] }}
 rendered = ${directory:script}/httpd-graceful
-mode = 0700
-context =
-  raw content {{ parameter_dict['apache-location'] }}/bin/httpd -Sf ${apache-conf:rendered}; if [ $? -eq 0 ]; then kill -USR1 $(cat ${apache-conf:pid-file}); fi
-  raw dash {{ dash_binary }}
+template = inline:{{'{{content}}'}}
+context = key content :script
+script =
+  #!/bin/sh -e
+  {{ parameter_dict['apache-location'] }}/bin/httpd -Sf ${apache-conf:rendered}
+  {{ bin_directory }}/slapos-kill --pidfile ${apache-conf:pid-file} -s USR1
 
 [logrotate-apache]
 < = logrotate-entry-base
 name = apache
 log = ${apache-conf:error-log} ${apache-conf:access-log}
-post = test ! -s ${apache-conf:pid-file} || {{ parameter_dict['bin-directory'] }}/slapos-kill --pidfile ${apache-conf:pid-file} -s USR1
+post = test ! -s ${apache-conf:pid-file} || {{ bin_directory }}/slapos-kill --pidfile ${apache-conf:pid-file} -s USR1
 
 [re6st-registry-conf-dict]
 port = 9201
@@ -139,14 +138,10 @@ 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
+recipe = slapos.cookbook:wrapper
+wrapper-path = ${directory:services}/re6st-registry
+pidfile = ${directory:run}/registry.pid
+command-line = {{ bin_directory }}/re6st-registry @${re6st-registry-conf:rendered}
 
 [re6st-registry]
 recipe = slapos.cookbook:re6stnet.registry
@@ -181,14 +176,14 @@ command-line = "{{ python_bin }}" ${re6st-registry:manager-wrapper}
 recipe = slapos.cookbook:cron.d
 cron-entries = ${cron:cron-entries}
 name = re6stnet-check-token
-frequency = */5 * * * *
+time = *:0/5
 command = {{ python_bin }} ${re6st-registry:manager-wrapper}
 
 [logrotate-entry-re6stnet]
 < = logrotate-entry-base
 name = re6stnet
 log = ${re6st-registry-conf-dict:logfile}
-post = test ! -s ${re6st-registry-wrapper:pid-file} || {{ parameter_dict['bin-directory'] }}/slapos-kill --pidfile ${re6st-registry-wrapper:pid-file} -s USR1
+post = [ ! -s ${re6st-registry-wrapper:pidfile} ] || {{ bin_directory }}/slapos-kill --pidfile ${re6st-registry-wrapper:pidfile} -s USR1
 
 [port-redirection]
 recipe = slapos.recipe.template:jinja2

software/re6stnet/instance.cfg.in

@@ -23,20 +23,15 @@ context =
     key slapparameter_dict slap-configuration:configuration
     key computer_id slap-configuration:computer
     raw logrotate_cfg {{ template_logrotate_base }}
-    raw dash_binary {{ dash_location }}/bin/dash
     raw openssl_bin {{ openssl_location}}/bin
     ${:extra-context}
 
 [dynamic-template-re6stnet-parameters]
 bin-directory = {{ bin_directory }}
 python-executable  = {{ python_with_eggs }}
-re6st-registry = {{ bin_directory }}/re6st-registry
-re6stnet = {{ bin_directory }}/re6stnet
 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

@@ -2,13 +2,9 @@
 
 extends =
   buildout.hash.cfg
-  ../../component/dash/buildout.cfg
-  ../../component/dcron/buildout.cfg
-  ../../component/gzip/buildout.cfg
   ../../component/openssl/buildout.cfg
   ../../component/logrotate/buildout.cfg
   ../../component/apache/buildout.cfg
-  ../../component/pycurl/buildout.cfg
   ../../component/python-cryptography/buildout.cfg
   ../../stack/slapos.cfg
 
@@ -17,7 +13,6 @@ extends =
 
 parts +=
   slapos-cookbook
-  dash
   template
 
 [re6st-eggs]
@@ -43,15 +38,12 @@ context =
     key develop_eggs_directory buildout:develop-eggs-directory
     key eggs_directory buildout:eggs-directory
     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:bin-directory}/${re6st-eggs:interpreter}
 
@@ -64,12 +56,6 @@ context =
 [template-re6st-registry-conf]
 < = download-base
 
-[template-wrapper]
-< = download-base
-
-[template-registry-run]
-< = download-base
-
 [versions]
 re6stnet = 0.551
 

software/re6stnet/wrapper.in

-#!{{ dash }}
-
-{{ content }}