Commit c6c0b7e5 authored by Antoine Catton's avatar Antoine Catton

Add name to apache pull/push backup server slave instances.

parent 066f6dfa
...@@ -91,14 +91,14 @@ mode = 0644 ...@@ -91,14 +91,14 @@ mode = 0644
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-apache-backup.cfg url = ${:_profile_base_location_}/instance-apache-backup.cfg
output = ${buildout:directory}/template-apache-backup.cfg output = ${buildout:directory}/template-apache-backup.cfg
md5sum = 2dca50fc8cd9548f8971d1675315d7ab md5sum = bb304cefde1f981f91b8ad08eb14d3a8
mode = 0644 mode = 0644
[template-backuped] [template-backuped]
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-backuped.cfg url = ${:_profile_base_location_}/instance-backuped.cfg
output = ${buildout:directory}/template-backuped.cfg output = ${buildout:directory}/template-backuped.cfg
md5sum = 4ffb75f5c040cb0e1a1c02b89ee801a1 md5sum = d2e4cdda25ee5e5a7b147e0c22f5d341
mode = 0644 mode = 0644
[template-mariadb] [template-mariadb]
......
...@@ -138,12 +138,13 @@ name = Pull Backup Server pushing to backup Apache ...@@ -138,12 +138,13 @@ name = Pull Backup Server pushing to backup Apache
software-url = $${slap-connection:software-release-url} software-url = $${slap-connection:software-release-url}
software-type = pull-backup software-type = pull-backup
slave = true slave = true
config = url id type request-agent-url authorized-key config = url id type request-agent-url authorized-key name
config-url = ssh://nobody@[$${dropbear-server:host}]:$${dropbear-server:port}/$${rdiff-backup-server:path} config-url = ssh://nobody@[$${dropbear-server:host}]:$${dropbear-server:port}/$${rdiff-backup-server:path}
config-id = $${slap-parameter:pbs-id} config-id = $${slap-parameter:pbs-id}
config-type = push config-type = push
config-request-agent-url = http://[$${agent-data:host}]:$${agent-data:port}/ config-request-agent-url = http://[$${agent-data:host}]:$${agent-data:port}/
config-authorized-key = $${sshkeys-dropbear:public-key-value} config-authorized-key = $${sshkeys-dropbear:public-key-value}
config-name = $${:name}
return = feed-url agent-url return = feed-url agent-url
[logrotate-entry-equeue] [logrotate-entry-equeue]
......
...@@ -186,13 +186,14 @@ name = Pull Backup Server pulling from main Apache ...@@ -186,13 +186,14 @@ name = Pull Backup Server pulling from main Apache
software-url = $${slap-connection:software-release-url} software-url = $${slap-connection:software-release-url}
software-type = pull-backup software-type = pull-backup
slave = true slave = true
config = url id type request-agent-url authorized-key frequency config = url id type request-agent-url authorized-key frequency name
config-url = ssh://nobody@[$${dropbear-server:host}]:$${dropbear-server:port}/$${rdiff-backup-server:path} config-url = ssh://nobody@[$${dropbear-server:host}]:$${dropbear-server:port}/$${rdiff-backup-server:path}
config-id = $${uuid-generator:uuid-apache-backup} config-id = $${uuid-generator:uuid-apache-backup}
config-type = pull config-type = pull
config-request-agent-url = http://[$${agent-data:host}]:$${agent-data:port}/ config-request-agent-url = http://[$${agent-data:host}]:$${agent-data:port}/
config-authorized-key = $${sshkeys-dropbear:public-key-value} config-authorized-key = $${sshkeys-dropbear:public-key-value}
config-frequency = 0 * * * * config-frequency = 0 * * * *
config-name = ${:name}
return = feed-url agent-url return = feed-url agent-url
[basedirectory] [basedirectory]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment