monitor: xxx

stack/monitor/buildout.cfg

@@ -10,8 +10,7 @@ extends =
   ../../component/dash/buildout.cfg
   ../../component/dcron/buildout.cfg
   ../../component/openssl/buildout.cfg
-  ../../component/logrotate/buildout.cfg
-  ../../component/gzip/buildout.cfg
+  ../../stack/logrotate/buildout.cfg
 
 parts =
   slapos-cookbook
@@ -100,10 +99,9 @@ recipe = slapos.recipe.template:jinja2
 filename = template-monitor.cfg
 template = ${:_profile_base_location_}/instance-monitor.cfg.jinja2.in
 rendered = ${buildout:directory}/template-monitor.cfg
-md5sum = 9d6f50e616655c1ae11ace419ac2861e  
+md5sum = 97e30bc904df1d9938ba212708a8c8a8
 context =
     key apache_location apache:location
-    key gzip_location gzip:location
     raw monitor_bin ${monitor2-bin:location}/${monitor2-bin:filename}
     raw monitor_collect ${monitor-collect:location}/${monitor-collect:filename}
     raw monitor_conf_template ${monitor-conf:location}/${monitor-conf:filename}
@@ -114,7 +112,6 @@ context =
     raw monitor_password_promise_template ${monitor-password-promise:location}/${monitor-password-promise:filename}
     raw curl_executable_location ${curl:location}/bin/curl
     raw dash_executable_location ${dash:location}/bin/dash
-    raw dcron_executable_location ${dcron:location}/sbin/crond
     raw logrotate_executable_location ${logrotate:location}/usr/sbin/logrotate
     raw monitor_httpd_template ${monitor-httpd-conf:location}/${monitor-httpd-conf:filename}
     raw monitor_service_conf_template ${monitor-service-conf-template:location}/${monitor-service-conf-template:filename}
@@ -123,6 +120,7 @@ context =
     raw python_with_eggs ${buildout:directory}/bin/${extra-eggs:interpreter}
     raw promise_executor_py ${run-promise-py:rendered}
     raw template_wrapper ${monitor-template-wrapper:location}/${monitor-template-wrapper:filename}
+    raw template_logrotate_base ${template-logrotate-base:rendered}
     raw status2rss_executable_path ${status2rss-executable:location}/${status2rss-executable:filename}
 depends = 
   ${monitor-eggs:eggs}

stack/monitor/instance-monitor.cfg.jinja2.in

@@ -10,38 +10,6 @@ cert = ${slap-connection:cert-file}
 root-instance-title = UNKNOWN H-S
 instance-title = UNKNOWN Instance
 
-[cron]
-recipe = slapos.cookbook:cron
-cron-entries = ${logrotate-directory:cron-entries}
-dcrond-binary = {{ dcron_executable_location }}
-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_executable_location }}
-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}
-
 # Add log to cron
 [cron-simplelogger]
 recipe = slapos.cookbook:simplelogger
@@ -87,18 +55,7 @@ monitor-password-interface = ${monitor-directory:monitor-password-var}/password/
 monitor-status2rss-var = ${monitor-directory:monitor-var}/status2rss
 
 [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
 
 [ca-directory]
 recipe = slapos.cookbook:mkdirectory
@@ -427,7 +384,9 @@ depends =
   ${monitor-httpd-promise:filename}
   ${monitor-status2rss-cron-entry:name}
 
-#[buildout]
+[buildout]
+extends =
+  {{ template_logrotate_base }}
 #parts =
 #  monitor-base
 #  publish