backupserver: switch to switch-softwaretype

software/backupserver/buildout.hash.cfg

@@ -46,8 +46,8 @@ md5sum = ae4a0043414336a521b524d9c95f1c68
 
 [template-pullrdiffbackup]
 filename = instance-pullrdiffbackup.cfg.in
-md5sum = c03595acae67565d4333fff07d629b61
+md5sum = f2e6f30a0e8228cbfb93eaaae10fe884
 
 [template]
 filename = instance.cfg.in
-md5sum = 42021b325159dff29e4bd4e33b8ff2f3
+md5sum = 3df515def97f1e8a9f181514ae6ef03f

software/backupserver/instance-pullrdiffbackup.cfg.in

@@ -206,7 +206,7 @@ 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}
+ip = {{ partition_ipv6 }}
 port = 9443
 ssl_key = $${directory:ssl}/nginx.key
 ssl_csr = $${directory:ssl}/nginx.csr

software/backupserver/instance.cfg.in

@@ -13,32 +13,21 @@ rendered = $${buildout:parts-directory}/$${:_buildout_section_name_}/$${:filenam
 filename = instance-pullrdiffbackup.cfg
 extensions = jinja2.ext.do
 context =
-    key slave_instance_list instance-parameter:slave-instance-list
+    key slave_instance_list slap-configuration:slave-instance-list
+# partition_ipv6 is the random ipv6 allocated to the local partition
+    key partition_ipv6 slap-configuration:ipv6-random
 
 [switch-softwaretype]
-recipe = slapos.cookbook:softwaretype
-default = $${:pullrdiffbackup}
-# pullrdiffbackup = ${template-pullrdiffbackup:output}
-pullrdiffbackup = $${dynamic-template-pullrdiffbackup:rendered}
+recipe = slapos.cookbook:switch-softwaretype
+RootSoftwareInstance = $${:pullrdiffbackup}
+pullrdiffbackup = dynamic-template-pullrdiffbackup:rendered
 
-[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}
-
-# [slap-parameter]
-# slave-instance-list = []
-
-[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/backupserver/software.cfg

@@ -102,5 +102,3 @@ mode = 0644
 
 [versions]
 gunicorn = 19.1.1
-plone.recipe.command = 1.1
-PyRSS2Gen = 1.1