software/nginx-push-stream: use switch-softwaretype

softwaretype recipe is deprecated

software/nginx-push-stream/buildout.hash.cfg

 [template]
 filename = instance.cfg.in
-md5sum = eb4c69df9a8dbb94fb76d0a6c11e360f
+md5sum = 509605f8222f92aa62b6cb4a078a78df
 
 [template-nginx-configuration]
 filename = template-nginx.cfg.in
@@ -8,4 +8,4 @@ md5sum = 022e4b53e1b2db16c4e518fe76f638fa
 
 [template-nginx]
 filename = instance-nginx.cfg.in
-md5sum = a3e1e8638c6078b0d3f60c304c2d70f7
+md5sum = 565deec1e9678485cc8e542a54f5d076

software/nginx-push-stream/instance-nginx.cfg.in

@@ -6,9 +6,6 @@ parts =
 
 extends = ${monitor-template:rendered}
 
-eggs-directory = ${buildout:eggs-directory}
-develop-eggs-directory = ${buildout:develop-eggs-directory}
-offline = true
 
 [directory]
 recipe = slapos.cookbook:mkdirectory
@@ -40,8 +37,8 @@ output = $${directory:etc}/nginx.cfg
 mode = 0600
 access-log = $${directory:log}/nginx-access.log
 error-log = $${directory:log}/nginx-error.log
-ip = $${slap-network-information:global-ipv6}
-local-ip = $${slap-network-information:local-ipv4}
+ip = $${slap-configuration:ipv6-random}
+local-ip = $${slap-configuration:ipv4-random}
 port = 9443
 base-url = https://[$${nginx-configuration:ip}]:$${nginx-configuration:port}
 

software/nginx-push-stream/instance.cfg.in

@@ -7,9 +7,9 @@ develop-eggs-directory = ${buildout:develop-eggs-directory}
 offline = true
 
 [switch-softwaretype]
-recipe = slapos.cookbook:softwaretype
-default = $${:nginx}
-nginx = $${dynamic-template-nginx:rendered}
+recipe = slapos.cookbook:switch-softwaretype
+default = dynamic-template-nginx:rendered
+RootSoftwareInstance = $${:default}
 
 [dynamic-template-nginx]
 recipe = slapos.recipe.template:jinja2
@@ -17,20 +17,10 @@ template = ${template-nginx:output}
 rendered = $${buildout:parts-directory}/$${:_buildout_section_name_}/$${:filename}
 filename = instance-nginx.cfg
 
-[slap-connection]
-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}
-
-[instance-parameter]
-# 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}
+[slap-configuration]
+recipe = slapos.cookbook:slapconfiguration
+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}