Disable restore from backup

Move and rename the mariadb backup restoration script

With this, we don't loose it (it may help an admin to be able to restore it) and it does not get run by webrunner automatically when updating resilience snapshot

/reviewed-on nexedi/slapos!304

component/logrotate/buildout.cfg

@@ -11,7 +11,7 @@ url = https://github.com/logrotate/logrotate/releases/download/3.11.0/logrotate-
 md5sum = 3a9280e4caeb837427a2d54518fbcdac
 # BBB this is only for backward-compatibility.
 post-install =
-  ln -sf . ${buildout:parts-directory}/${:_buildout_section_name_}/usr
+  ln -nsf . ${buildout:parts-directory}/${:_buildout_section_name_}/usr
 environment =
   PATH=${xz-utils:location}/bin:%(PATH)s
   CPPFLAGS=-I${popt:location}/include

software/slaprunner/buildout.hash.cfg

@@ -23,7 +23,7 @@ md5sum = 16ff762e71c92f8a8e1062906eb10b9c
 
 [template-runner-import-script]
 filename = template/runner-import.sh.jinja2
-md5sum = 1edd9c7a20e208b6cb647886bfb6d1bb
+md5sum = 948a4a5fcb244131847e5df8480678e1
 
 [instance-runner-import]
 filename = instance-runner-import.cfg.in

software/slaprunner/template/runner-import.sh.jinja2

@@ -14,7 +14,7 @@ exec 2>&1
 echo -e "\n\n$0 run at : $(date)"
 
 srv_directory='{{ directory["srv"] }}'
-backup_directory='{{ directory["backup"] }}'
+backup_directory='{{ directory["backup"] }}/../'
 etc_directory='{{ directory["etc"] }}'
 
 RESTORE_EXIT_CODE_FILE='{{ restore_exit_code_file }}'

stack/erp5/buildout.hash.cfg

@@ -27,7 +27,7 @@ md5sum = 1af531c51f575a1d1362f2ca2d61620d
 
 [template-mariadb]
 filename = instance-mariadb.cfg.in
-md5sum = 705f017e19dc2d1048770284d1d6b31f
+md5sum = 06e4e35e2a9ed3c6a611938ff3bc3b65
 
 [template-kumofs]
 filename = instance-kumofs.cfg.in

stack/erp5/instance-mariadb.cfg.in

@@ -292,7 +292,7 @@ context =
 # Generate after import script used by importer instance of webrunner
 < = jinja2-template-executable
 template = {{ parameter_dict['mariadb-resiliency-after-import-script'] }}
-rendered = ${directory:srv}/runner-import-restore
+rendered = ${directory:bin}/restore-from-backup
 context =
   key dash dash:dash
   key mysql_executable binary-wrap-mysql:wrapper-path