diff --git a/stack/resilient/buildout.cfg b/stack/resilient/buildout.cfg index 7df1a9baad4a8ebd2a316848c87c21653e9988b9..f97eaca70de44c36233684be8a67794f0141d413 100644 --- a/stack/resilient/buildout.cfg +++ b/stack/resilient/buildout.cfg @@ -36,7 +36,7 @@ mode = 0644 recipe = slapos.recipe.template url = ${:_profile_base_location_}/pbsready-import.cfg.in output = ${buildout:directory}/pbsready-import.cfg -md5sum = 1b1308fd39476d48b5ca13db48ea6dc9 +md5sum = 3c2e73f49abdc52282fc045e6d91f3e9 mode = 0644 [pbsready-export] @@ -45,7 +45,7 @@ mode = 0644 recipe = slapos.recipe.template url = ${:_profile_base_location_}/pbsready-export.cfg.in output = ${buildout:directory}/pbsready-export.cfg -md5sum = 5d9e20c436fd307e8e4ab224a9a65792 +md5sum = a0e22a5de727544c5767d6bee059a77a mode = 0644 [template-pull-backup] diff --git a/stack/resilient/pbsready-export.cfg.in b/stack/resilient/pbsready-export.cfg.in index fcd356901561566ca6f7e9036f61b359e8f24b82..9859724df2dfa1ec1ef57d3bed6889abb7229c0d 100644 --- a/stack/resilient/pbsready-export.cfg.in +++ b/stack/resilient/pbsready-export.cfg.in @@ -2,7 +2,21 @@ extends = ${pbsready:output} -parts += +# Explicitely define extended parts from pbsready +# then add local parts +parts = + resiliency + logrotate + logrotate-entry-cron + logrotate-entry-equeue + cron + cron-entry-logrotate + sshkeys-authority + dropbear-server + sshkeys-dropbear + dropbear-server-pbs-authorized-key + notifier + cron-entry-backup [resilient-publish-connection-parameter] diff --git a/stack/resilient/pbsready-import.cfg.in b/stack/resilient/pbsready-import.cfg.in index b2b7491e70e3f69c19e96eb0bb70e422a517cc6e..419ba1bed91eab0f3620fd0fb533db542556adbf 100644 --- a/stack/resilient/pbsready-import.cfg.in +++ b/stack/resilient/pbsready-import.cfg.in @@ -2,7 +2,21 @@ extends = ${pbsready:output} -parts += +# Explicitely define extended parts from pbsready +# then add local parts +parts = + resiliency + logrotate + logrotate-entry-cron + logrotate-entry-equeue + cron + cron-entry-logrotate + sshkeys-authority + dropbear-server + sshkeys-dropbear + dropbear-server-pbs-authorized-key + notifier + import-on-notification resilient-publish-connection-parameter