htmlvalidatorserver: switch to switch-softwaretype

software/htmlvalidatorserver/buildout.hash.cfg

@@ -22,8 +22,8 @@ md5sum = 87781e6bcb523bb8434888d5f984f36c
 
 [template-validator]
 filename = instance-validator.cfg.in
-md5sum = e2ab378e4eb4b418a958fc90309ca443
+md5sum = 9d12472bb2e337d3cc18f2cc6f235425
 
 [template]
 filename = instance.cfg.in
-md5sum = 2b4d33e9ef1082dd4d6a53f55b391772
+md5sum = 94fc13254c819cba33b03f30251bc469

software/htmlvalidatorserver/instance-validator.cfg.in

@@ -49,7 +49,7 @@ recipe = slapos.recipe.template
 url = ${template-tomcat-configuration:output}
 output = $${basedirectory:catalina_conf}/server.xml
 mode = 0600
-ip = $${slap-network-information:global-ipv6}
+ip = {{ partition_ipv6 }}
 port = 8899
 scheme = https
 

software/htmlvalidatorserver/instance.cfg.in

@@ -6,29 +6,26 @@ eggs-directory = ${buildout:eggs-directory}
 develop-eggs-directory = ${buildout:develop-eggs-directory}
 offline = true
 
-[switch-softwaretype]
-recipe = slapos.cookbook:softwaretype
-default = $${:validator}
-validator = ${template-validator:output}
-
-[slap-connection]
-# part to migrate to new - separated words
-computer-id = $${slap_connection:computer_id}
-partition-id = $${slap_connection:partition_id}
-server-url = $${slap_connection:server_url}
-software-release-url = $${slap_connection:software_release_url}
-key-file = $${slap_connection:key_file}
-cert-file = $${slap_connection:cert_file}
+[dynamic-template-validator]
+recipe = slapos.recipe.template:jinja2
+template = ${template-validator:output}
+rendered = $${buildout:parts-directory}/$${:_buildout_section_name_}/$${:filename}
+filename = instance-validator.cfg
+context =
+# partition_ipv6 is the random ipv6 allocated to the local partition
+    key partition_ipv6 slap-configuration:ipv6-random
 
-# [slap-parameter]
-# slave-instance-list = []
+[switch-softwaretype]
+recipe = slapos.cookbook:switch-softwaretype
+RootSoftwareInstance = $${:validator}
+validator = dynamic-template-validator:rendered
 
-[instance-parameter]
+[slap-configuration]
 # Fetches parameters defined in SlapOS Master for this instance.
 # Always the same.
 recipe = slapos.cookbook:slapconfiguration.serialised
-computer = $${slap_connection:computer_id}
-partition = $${slap_connection:partition_id}
-url = $${slap_connection:server_url}
-key = $${slap_connection:key_file}
-cert = $${slap_connection:cert_file}
+computer = $${slap-connection:computer-id}
+partition = $${slap-connection:partition-id}
+url = $${slap-connection:server-url}
+key = $${slap-connection:key-file}
+cert = $${slap-connection:cert-file}

software/htmlvalidatorserver/software.cfg

@@ -49,5 +49,4 @@ mode = 0644
 # 1.3.4nxd2 is invalid version string, thus pached version string is not '1.3.4nxd2+SlapOSPatched001'
 # but '1.3.4nxd2-SlapOSPatched001'.
 gunicorn = 19.1.1
-plone.recipe.command = 1.1
 inotifyx = 0.2.2