kvm software: use logrotate stack

software/kvm/common.cfg

@@ -17,6 +17,7 @@ extends =
   ../../stack/nodejs.cfg
   ../../stack/resilient/buildout.cfg
   ../../stack/monitor/buildout.cfg
+  ../../stack/logrotate/buildout.cfg
 
 # stacks are listed from most generic to most specific,
 # to avoid versioning issues
@@ -101,7 +102,7 @@ recipe = hexagonit.recipe.download
 ignore-existing = true
 url = ${:_profile_base_location_}/instance-kvm.cfg.jinja2
 mode = 644
-md5sum = d09d37dc3bcf34da8d31b11215866b27
+md5sum = b7b06fa8586198640ca0bb185ab48161
 download-only = true
 on-update = true
 
@@ -251,17 +252,6 @@ md5sum = 599dbbbd438fe7801e3f8642ae9e9a78
 download-only = true
 on-update = true
 
-[template-logrotate-base]
-recipe = slapos.recipe.template:jinja2
-filename = instance-logrotate-base.cfg
-template = ${:_profile_base_location_}/instance-logrotate-base.cfg.in
-rendered = ${buildout:parts-directory}/${:_buildout_section_name_}/instance-logrotate-base.cfg
-md5sum = f28fbd310944f321ccb34b2a34c82005
-context =
-    key dcron_location dcron:location
-    key gzip_location gzip:location
-    key logrotate_location logrotate:location
-
 [template-httpd]
 recipe = slapos.recipe.template:jinja2
 filename = template-httpd.cfg

software/kvm/instance-kvm.cfg.jinja2

@@ -524,24 +524,11 @@ command = {{ python_executable }} {{ file_download_script }} {{ bootstrap_url }}
 update-command =
 stop-on-error = true
 
-[cron-entry-logrotate]
-<= cron
-recipe = slapos.cookbook:cron.d
-name = logrotate
-# One time per week
-frequency = 0 0 * * *
-command = ${logrotate:wrapper}
-
 [logrotate-vm-bootstrap]
 < = logrotate-entry-base
 name = vm-bootstrap
 log = ${directory:public}/ansible/vm-bootstrap.log
 
-[logrotate-entry-base]
-recipe = slapos.cookbook:logrotate.d
-logrotate-entries = ${logrotate:logrotate-entries}
-backup = ${logrotate:backup}
-
 [slap-parameter]
 # Default values if not specified
 frontend-software-type = frontend

software/kvm/instance-logrotate-base.cfg.in

-[buildout]
-parts =
-  cron-entry-logrotate
-
-[cron]
-recipe = slapos.cookbook:cron
-cron-entries = ${logrotate-directory:cron-entries}
-dcrond-binary = {{ dcron_location }}/sbin/crond
-crontabs = ${logrotate-directory:crontabs}
-cronstamps = ${logrotate-directory:cronstamps}
-catcher = ${cron-simplelogger:wrapper}
-binary = ${logrotate-directory:services}/crond
-
-[cron-simplelogger]
-recipe = slapos.cookbook:simplelogger
-wrapper = ${logrotate-directory:bin}/cron_simplelogger
-log = ${logrotate-directory:log}/cron.log
-
-[logrotate]
-recipe = slapos.cookbook:logrotate
-logrotate-entries = ${logrotate-directory:logrotate-entries}
-backup = ${logrotate-directory:logrotate-backup}
-logrotate-binary = {{ logrotate_location }}/usr/sbin/logrotate
-gzip-binary = {{ gzip_location }}/bin/gzip
-gunzip-binary = {{ gzip_location }}/bin/gunzip
-wrapper = ${logrotate-directory:bin}/logrotate
-conf = ${logrotate-directory:etc}/logrotate.conf
-state-file = ${logrotate-directory:srv}/logrotate.status
-
-[cron-entry-logrotate]
-recipe = slapos.cookbook:cron.d
-cron-entries = ${cron:cron-entries}
-name = logrotate
-frequency = 0 0 * * *
-command = ${logrotate:wrapper}
-
-[logrotate-directory]
-recipe = slapos.cookbook:mkdirectory
-cron-entries = ${:etc}/cron.d
-cronstamps = ${:etc}/cronstamps
-crontabs = ${:etc}/crontabs
-logrotate-backup = ${:backup}/logrotate
-logrotate-entries = ${:etc}/logrotate.d
-bin = ${buildout:directory}/bin
-srv = ${buildout:directory}/srv
-backup = ${:srv}/backup
-etc = ${buildout:directory}/etc
-services = ${:etc}/service
-log = ${buildout:directory}/var/log
-