Merge branch 'master' into 1.0

component/apache/buildout.cfg

@@ -33,9 +33,9 @@ md5sum = 2202b18f269ad606d70e1864857ed93c
 [apache]
 # inspired on http://old.aclark.net/team/aclark/blog/a-lamp-buildout-for-wordpress-and-other-php-apps/
 recipe = slapos.recipe.cmmi
-version = 2.4.23
+version = 2.4.25
 url = https://archive.apache.org/dist/httpd/httpd-${:version}.tar.bz2
-md5sum = 04f19c60e810c028f5240a062668a688
+md5sum = 2826f49619112ad5813c0be5afcc7ddb
 pre-configure =
   cp -ar ${apr:location}/apr-${apr:version} srclib/apr/ &&
   cp -ar ${apr-util:location}/apr-util-${apr-util:version} srclib/apr-util
@@ -115,9 +115,9 @@ environment =
 [apache-2.2]
 # inspired on http://old.aclark.net/team/aclark/blog/a-lamp-buildout-for-wordpress-and-other-php-apps/
 recipe = slapos.recipe.cmmi
-version = 2.2.31
+version = 2.2.32
 url = https://archive.apache.org/dist/httpd/httpd-${:version}.tar.bz2
-md5sum = 6c10e15835ab214464228a9beb7afba8
+md5sum = d590ca1a8ce577b6bdfbd738d2de4741
 patch-options = -p1
 configure-options = --disable-static
                     --enable-authn-alias

component/haproxy/buildout.cfg

@@ -12,8 +12,8 @@ parts = haproxy
 
 [haproxy]
 recipe = slapos.recipe.cmmi
-url = http://www.haproxy.org/download/1.6/src/haproxy-1.6.6.tar.gz
-md5sum = b418d83cf4f2da328f6eb8c255b8716b
+url = http://www.haproxy.org/download/1.7/src/haproxy-1.7.2.tar.gz
+md5sum = 7330b36f3764ebe409e9305803dc30e2
 configure-command = true
 # If the system is running on Linux 2.6, we use "linux26" as the TARGET,
 # otherwise use "generic".

component/nginx/buildout.cfg

@@ -21,6 +21,7 @@ configure-options=
   --with-http_ssl_module
   --with-http_v2_module
   --with-http_gzip_static_module
+  --with-http_realip_module
   --with-mail
   --with-mail_ssl_module
   --with-ld-opt="-L ${openssl:location}/lib -L ${pcre:location}/lib -L ${zlib:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${zlib:location}/lib"

component/openssl/buildout.cfg

@@ -25,7 +25,6 @@ prefix = ${:location}
 patch-binary = ${patch:location}/bin/patch
 patches =
   ${:_profile_base_location_}/openssl-nodoc.patch#a78c14908fe9ec624b1fb9fa97e01bb9
-  ${:_profile_base_location_}/openssl-exlibs.patch#fba5c873cf974ba80a973be41da3c738
   ${:_profile_base_location_}/openssl-1.0.2d-parallel-build.patch#e4cf66a48a85a0da68fd4842e6fab54b
 patch-options = -p1
 configure-command = ./config

component/openssl/openssl-exlibs.patch

---- a/engines/ccgost/Makefile~	2010-08-24 23:46:34.000000000 +0200
-+++ b/engines/ccgost/Makefile	2012-03-14 10:11:46.826419864 +0100
-@@ -7,6 +7,7 @@
- AR= ar r
- CFLAGS= $(INCLUDES) $(CFLAG)
- LIB=$(TOP)/libcrypto.a
-+EX_LIBS= 
- 
- LIBSRC= gost2001.c gost2001_keyx.c gost89.c gost94_keyx.c gost_ameth.c gost_asn1.c gost_crypt.c gost_ctl.c gost_eng.c gosthash.c gost_keywrap.c gost_md.c gost_params.c gost_pmeth.c gost_sign.c
- 
-@@ -32,7 +33,7 @@
- 		$(MAKE) -f $(TOP)/Makefile.shared -e \
- 			LIBNAME=$(LIBNAME) \
- 			LIBEXTRAS='$(LIBOBJ)' \
--			LIBDEPS='-L$(TOP) -lcrypto' \
-+			LIBDEPS='-L$(TOP) -lcrypto $(EX_LIBS)' \
- 			link_o.$(SHLIB_TARGET); \
- 	else \
- 		$(AR) $(LIB) $(LIBOBJ); \

software/agent/software.cfg

@@ -51,29 +51,29 @@ pycrypto = 2.6.1
 pycurl = 7.43.0
 slapos.recipe.download = 1.0
 slapos.recipe.template = 2.8
-slapos.toolbox = 0.63
+slapos.toolbox = 0.64
 smmap = 0.9.0
 
 # Required by:
-# slapos.toolbox = 0.63
+# slapos.toolbox = 0.64
 GitPython = 2.0.8
 
 # Required by:
-# slapos.toolbox = 0.63
+# slapos.toolbox = 0.64
 atomize = 0.2.0
 
 # Required by:
-# slapos.toolbox = 0.63
+# slapos.toolbox = 0.64
 feedparser = 5.2.1
 
 # Required by:
-# slapos.toolbox = 0.63
+# slapos.toolbox = 0.64
 lockfile = 0.12.2
 
 # Required by:
-# slapos.toolbox = 0.63
+# slapos.toolbox = 0.64
 paramiko = 2.0.1
 
 # Required by:
-# slapos.toolbox = 0.63
+# slapos.toolbox = 0.64
 rpdb = 0.1.5

software/apache-frontend/software.cfg

@@ -15,7 +15,7 @@ plone.recipe.command = 1.1
 pycrypto = 2.6.1
 rdiff-backup = 1.0.5
 slapos.recipe.template = 2.8
-slapos.toolbox = 0.63
+slapos.toolbox = 0.64
 smmap = 0.9.0
 numpy = 1.11.2
 
@@ -34,29 +34,29 @@ erp5.util = 0.4.46
 passlib = 1.6.5
 
 # Required by:
-# slapos.toolbox = 0.63
+# slapos.toolbox = 0.64
 GitPython = 2.0.8
 
 # Required by:
-# slapos.toolbox = 0.63
+# slapos.toolbox = 0.64
 atomize = 0.2.0
 
 # Required by:
-# slapos.toolbox = 0.63
+# slapos.toolbox = 0.64
 feedparser = 5.2.1
 
 # Required by:
-# slapos.toolbox = 0.63
+# slapos.toolbox = 0.64
 lockfile = 0.12.2
 
 # Required by:
-# slapos.toolbox = 0.63
+# slapos.toolbox = 0.64
 paramiko = 2.0.1
 
 # Required by:
-# slapos.toolbox = 0.63
+# slapos.toolbox = 0.64
 pycurl = 7.43.0
 
 # Required by:
-# slapos.toolbox = 0.63
+# slapos.toolbox = 0.64
 rpdb = 0.1.5

software/fluentd/fluentd-agent.conf.jinja2.in

+{% set conf_text = slapparameter_dict.get('conf_text', '')  -%}
+{{ conf_text }}
\ No newline at end of file

software/fluentd/instance-input-schema.json

+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "description": "Parameters to instantiate Fluentd",
+  "additionalProperties": false,
+  "properties": {
+    "conf_text": {
+      "description": "Fluentd configuration. You can write it entirely by yourself. See fluentd-agent.conf.jinja2.in",
+      "default": "",
+      "type": "string"
+    },
+  }
+}

software/fluentd/instance.cfg.in

+[buildout]
+parts =
+  directory
+  service-fluentd
+  fluentd-agent-conf
+
+eggs-directory = {{ buildout['eggs-directory'] }}
+develop-eggs-directory = {{ buildout['develop-eggs-directory'] }}
+offline = true
+
+[instance-parameter]
+recipe = slapos.cookbook:slapconfiguration.serialised
+computer = ${slap_connection:computer_id}
+partition = ${slap_connection:partition_id}
+url = ${slap_connection:server_url}
+key = ${slap_connection:key_file}
+cert = ${slap_connection:cert_file}
+
+[directory]
+recipe = slapos.cookbook:mkdirectory
+home = ${buildout:directory}
+etc = ${:home}/etc
+var = ${:home}/var
+script = ${:etc}/run/
+service = ${:etc}/service
+promise = ${:etc}/promise/
+log = ${:var}/log
+bin = ${:home}/bin
+
+[service-fluentd]
+recipe  = slapos.cookbook:wrapper
+wrapper-path    = ${directory:service}/fluentd-service
+command-line    = {{ fluentd_location }}/bin/fluentd
+    -v
+    -c ${directory:etc}/fluentd-agent.conf
+environment = 
+  GEM_PATH={{ fluentd_location }}/lib/ruby/gems/1.8/
+
+[fluentd-agent-conf]
+recipe  = slapos.recipe.template:jinja2
+template = {{ fluentd_conf }}/fluentd-agent.conf.jinja2.in
+rendered = ${buildout:directory}/etc/fluentd-agent.conf
+mode = 0644
+context = 
+  key slapparameter_dict instance-parameter:configuration

software/fluentd/software.cfg

+[buildout]
+
+extends =
+  ../../component/fluentd/buildout.cfg
+  ../../stack/slapos.cfg
+
+parts = 
+  fluentd
+  fluentd-agent-conf
+  instance-profile
+  slapos-cookbook
+
+[instance-profile]
+recipe = slapos.recipe.template:jinja2
+template = ${:_profile_base_location_}/instance.cfg.in
+rendered = ${buildout:directory}/instance.cfg
+mode = 0644
+extensions = jinja2.ext.do
+context =
+  section buildout  buildout
+  raw fluentd_location                ${fluentd:location}
+  raw fluentd_conf                    ${buildout:directory}
+
+[fluentd-agent-conf]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/fluentd-agent.conf.jinja2.in
+#md5sum = 4b81ddcbe2f16d23013caac37151d396 
+output = ${buildout:directory}/fluentd-agent.conf.jinja2.in
+mode = 0644
+
+[fluentd]
+gems += 
+  fluent-plugin-wendelin==0.1
+  fluent-plugin-bin

software/gitlab/gitlab-parameters.cfg

@@ -102,7 +102,10 @@ configuration.nginx_gzip_proxied        = any
 configuration.nginx_gzip_types          = text/plain text/css application/x-javascript text/xml application/xml application/xml+rss text/javascript application/json
 configuration.nginx_keepalive_timeout   = 65
 
-# TODO allow configuring trusted proxies
-# configuration.nginx_real_ip_trusted_addresses
-# configuration.nginx_real_ip_header
-# configuration.nginx_real_ip_recursive
+# configuring trusted proxies
+# GitLab is behind a reverse proxy, so we don't want the IP address of the proxy
+# to show up as the client address (because rack attack blacklists the lab
+# frontend)
+configuration.nginx_real_ip_trusted_addresses   =
+configuration.nginx_real_ip_header              = X-Forwarded-For
+configuration.nginx_real_ip_recursive           = off

software/gitlab/software.cfg

@@ -303,7 +303,7 @@ md5sum  = eb1230fee50067924ba89f4dc6e82fa9
 
 [gitlab-parameters.cfg]
 <= download-file
-md5sum  = a74670934ec0190cc212d1f3468c11ed
+md5sum  = 9ff67261781092ae4d1096d65927b9f2
 
 [gitlab-shell-config.yml.in]
 <= download-template
@@ -315,7 +315,7 @@ md5sum  = a9cb347f60aad3465932fd36cd4fe25d
 
 [gitlab.yml.in]
 <= download-template
-md5sum  = 176939a6428a7aca4767a36421b0af2b
+md5sum  = fb52f20f04b3c0bacd6a767dac9d6483
 
 [instance-gitlab.cfg.in]
 <= download-file
@@ -331,7 +331,7 @@ md5sum  = a56a44e96f65f5ed20211bb6a54279f4
 
 [nginx-gitlab-http.conf.in]
 <= download-template
-md5sum  = a11b50d2ff2b1fa842ba4aa20041e2fe
+md5sum  = 37ea159762fe25db2af6b4ac3870d1e3
 
 [nginx.conf.in]
 <= download-template

software/gitlab/template/gitlab.yml.in

@@ -36,11 +36,9 @@ production: &base
     # Customize if you have GitLab behind a reverse proxy which is running on a different machine.
     # Add the IP address for your reverse proxy to the list, otherwise users will appear signed in from that address.
     trusted_proxies:
-    {# TODO support configuring trusted proxies
-<% @trusted_proxies.each do |proxy| %>
-      - <%= proxy %>
-<% end %>
-    #}
+    {% for proxy in cfg("nginx_real_ip_trusted_addresses").split() %}
+      - {{ proxy }}
+    {% endfor %}
 
     # Uncomment and customize if you can't use the default user to run GitLab (default: 'git')
     user: {{ backend_info.user }}

software/gitlab/template/nginx-gitlab-http.conf.in

@@ -101,17 +101,15 @@ server {
 
   ## Real IP Module Config
   ## http://nginx.org/en/docs/http/ngx_http_realip_module.html
-  {# TODO support trusted proxies & realip
-  <% if @real_ip_header %>
-  real_ip_header <%= @real_ip_header %>;
-  <% end %>
-  <% if @real_ip_recursive %>
-  real_ip_recursive <%= @real_ip_recursive %>;
-  <% end %>
-  <% @real_ip_trusted_addresses.each do |trusted_address| %>
-  set_real_ip_from <%= trusted_address %>;
-  <% end %>
-  #}
+  {% if '{{ cfg("nginx_real_ip_header") }}' %}
+  real_ip_header '{{ cfg("nginx_real_ip_header") }}';
+  {% endif %}
+  {% if '{{ cfg("nginx_real_ip_recursive") }}' %}
+  real_ip_recursive '{{ cfg("nginx_real_ip_recursive") }}';
+  {% endif %}
+  {% for trusted_address in cfg("nginx_real_ip_trusted_addresses").split() %}
+  set_real_ip_from {{ trusted_address }};
+  {% endfor %}
 
   ## Individual nginx logs for this GitLab vhost
   access_log  {{ nginx.log }}/gitlab_access.log gitlab_access;

software/kvm/software.cfg

@@ -5,7 +5,7 @@ extends = common.cfg
 # XXX - use websockify = 0.5.1 for compatibility with kvm frontend
 websockify = 0.5.1
 
-slapos.toolbox = 0.63
+slapos.toolbox = 0.64
 erp5.util = 0.4.46
 apache-libcloud = 1.1.0
 collective.recipe.environment = 0.2.0

software/monitor/instance-monitor.cfg.jinja2

@@ -76,7 +76,7 @@ context =
 
 [fluentd-wrapper]
 recipe = slapos.cookbook:wrapper
-command-line = {{ fluentd_location }}/bin/fluentd -l ${monitor-directory:log}/fluend.log -c ${fluentd-conf-configuration:rendered}
+command-line = {{ fluentd_location }}/bin/fluentd -qq -l ${monitor-directory:log}/fluend.log -c ${fluentd-conf-configuration:rendered}
 wrapper-path = ${monitor-directory:service}/fluentd
 environment = 
   GEM_PATH={{ fluentd_location }}/lib/ruby/gems/1.8/
@@ -92,7 +92,6 @@ context =
   key fluentd_log_directory monitor-directory:fluentd-log
   key computer_id slap-connection:computer-id
 
-
 [monitor-collect-csv-wrapper]
 recipe = slapos.cookbook:wrapper
 command-line = 

software/monitor/software.cfg

@@ -32,7 +32,7 @@ mode = 0644
 recipe = slapos.recipe.build:download 
 url = ${:_profile_base_location_}/instance-monitor.cfg.jinja2
 destination = ${buildout:directory}/template-base-monitor.cfg
-md5sum = 20738a1b16de234e8bb7e88c822552b9
+md5sum = df37b01b194f9621ce8928fe361db728
 mode = 0644
 
 [template-monitor-distributor]
@@ -94,7 +94,6 @@ scripts =
   monitor.collect
   monitor.runpromise
   monitor.genstatus
-  monitor.genrss
   monitor.configwrite
 
 [fluentd]

software/neoppod/software-common.cfg

@@ -117,8 +117,8 @@ transaction = 1.7.0
 zdaemon = 4.1.0
 zodbpickle = 0.6.0
 zodbtools = 0.0.0.dev3
-# Required by slapos.toolbox = 0.63
-slapos.toolbox = 0.63
+# Required by slapos.toolbox = 0.64
+slapos.toolbox = 0.64
 PyRSS2Gen = 1.1
 apache-libcloud = 1.5.0
 atomize = 0.2.0

software/re6stnet/software.cfg

@@ -125,15 +125,15 @@ plone.recipe.command = 1.1
 pycrypto = 2.6.1
 pycurl = 7.43.0
 slapos.recipe.template = 2.7
-slapos.toolbox = 0.63
+slapos.toolbox = 0.64
 smmap = 0.9.0
 
 # Required by:
-# slapos.toolbox = 0.63
+# slapos.toolbox = 0.64
 GitPython = 2.0.8
 
 # Required by:
-# slapos.toolbox = 0.63
+# slapos.toolbox = 0.64
 atomize = 0.2.0
 
 # Required by:
@@ -141,11 +141,11 @@ atomize = 0.2.0
 backports.ssl-match-hostname = 3.4.0.2
 
 # Required by:
-# slapos.toolbox = 0.63
+# slapos.toolbox = 0.64
 feedparser = 5.1.3
 
 # Required by:
-# slapos.toolbox = 0.63
+# slapos.toolbox = 0.64
 lockfile = 0.12.2
 
 # Required by:
@@ -153,10 +153,10 @@ lockfile = 0.12.2
 miniupnpc = 1.9
 
 # Required by:
-# slapos.toolbox = 0.63
+# slapos.toolbox = 0.64
 paramiko = 2.0.1
 
 # Required by:
-# slapos.toolbox = 0.63
+# slapos.toolbox = 0.64
 rpdb = 0.1.5
 

software/slaprunner/software.cfg

@@ -17,7 +17,7 @@ gunicorn = 19.4.5
 prettytable = 0.7.2
 pycurl = 7.43.0
 slapos.recipe.template = 2.9
-slapos.toolbox = 0.63
+slapos.toolbox = 0.64
 smmap = 0.9.0
 
 # Required by:

stack/erp5/buildout.cfg

@@ -704,6 +704,7 @@ backports-abc = 0.5
 backports.shutil-get-terminal-size = 1.0.0
 chardet = 2.3.0
 csp-eventlet = 0.7.0
+cycler = 0.10.0
 erp5diff = 0.8.1.7
 eventlet = 0.20.1
 five.formlib = 1.0.4
@@ -719,8 +720,9 @@ ipython = 5.1.0
 ipython-genutils = 0.1.0
 ipywidgets = 5.2.2
 logilab-common = 1.3.0
-matplotlib = 1.5.3
+matplotlib = 2.0.0
 mistune = 0.7.3
+msgpack-python = 0.4.8
 notebook = 4.3.1
 numpy = 1.11.3
 objgraph = 3.1.0
@@ -743,6 +745,8 @@ rtjp-eventlet = 0.3.2
 scikit-learn = 0.18.1
 scipy = 0.18.1
 simplegeneric = 0.8.1
+slapos.recipe.template = 2.9
+slapos.toolbox = 0.64
 socketpool = 0.5.3
 spyne = 2.12.14
 suds = 0.4
@@ -771,13 +775,8 @@ backports.ssl-match-hostname = 3.5.0.1
 certifi = 2016.9.26
 
 # Required by:
-# matplotlib==1.5.3
-cycler = 0.10.0
-
-# Required by:
-# ipython==5.1.0
-# traitlets==4.3.1
-decorator = 4.0.10
+# eventlet==0.20.1
+enum-compat = 0.0.2
 
 # Required by:
 # SOAPpy===0.12.0nxd001
@@ -814,7 +813,7 @@ pexpect = 4.2.1
 pickleshare = 0.7.4
 
 # Required by:
-# matplotlib==1.5.3
+# matplotlib==2.0.0
 # pandas==0.19.2
 python-dateutil = 2.6.0
 
@@ -822,6 +821,10 @@ python-dateutil = 2.6.0
 # tornado==4.4.2
 singledispatch = 3.4.0.3
 
+# Required by:
+# matplotlib==2.0.0
+subprocess32 = 3.2.7
+
 # Required by:
 # prompt-toolkit==1.0.9
 wcwidth = 0.1.7

stack/logrotate/buildout.cfg

@@ -11,7 +11,7 @@ recipe = slapos.recipe.template:jinja2
 template = ${:_profile_base_location_}/${:filename}.in
 rendered = ${buildout:directory}/${:filename}
 filename = instance-logrotate-base.cfg
-md5sum = af19ff0c7817df85987c69738fb083f2
+md5sum = 4f940a5b5a6abac039738b45633c709c
 context =
     key dcron_location dcron:location
     key gzip_location gzip:location

stack/logrotate/instance-logrotate-base.cfg.in

 [buildout]
 parts =
   cron-entry-logrotate
+  logrotate-entry-cron
 
 [cron]
 recipe = slapos.cookbook:cron
@@ -34,6 +35,16 @@ name = logrotate
 frequency = 0 0 * * *
 command = ${logrotate:wrapper}
 
+[logrotate-entry-base]
+recipe = slapos.cookbook:logrotate.d
+logrotate-entries = ${logrotate:logrotate-entries}
+backup = ${logrotate-directory:backup}
+
+[logrotate-entry-cron]
+<= logrotate-entry-base
+name = crond
+log = ${cron-simplelogger:log}
+
 [logrotate-directory]
 recipe = slapos.cookbook:mkdirectory
 cron-entries = ${:etc}/cron.d

stack/monitor/buildout.cfg

@@ -11,6 +11,7 @@ extends =
   ../../component/lxml-python/buildout.cfg
   ../../component/pycurl/buildout.cfg
   ../../component/python-cryptography/buildout.cfg
+  ../../stack/logrotate/buildout.cfg
 
 parts =
   slapos-cookbook
@@ -96,15 +97,15 @@ 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 = 04b4555615c48fb615dd452294c185e0
+md5sum = 3a0417a9a3c2710c31be37e7a66f8a82
 context =
     key apache_location apache:location
     key gzip_location gzip:location
+    key template_logrotate_base template-logrotate-base:rendered
     raw monitor_bin ${buildout:directory}/bin/monitor.bootstrap
     raw monitor_collect ${buildout:directory}/bin/monitor.collect
     raw monitor_runpromise ${buildout:directory}/bin/monitor.runpromise
     raw monitor_genstatus ${buildout:directory}/bin/monitor.genstatus
-    raw monitor_genrss ${buildout:directory}/bin/monitor.genrss
     raw monitor_configwrite ${buildout:directory}/bin/monitor.configwrite
     raw monitor_conf_template ${monitor-conf:location}/${monitor-conf:filename}
     raw monitor_https_cors ${monitor-httpd-cors:location}/${monitor-httpd-cors:filename}
@@ -125,5 +126,5 @@ depends =
 PyRSS2Gen = 1.1
 cns.recipe.symlink = 0.2.3
 pycurl = 7.43.0
-slapos.toolbox = 0.63
+slapos.toolbox = 0.64
 

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

@@ -10,44 +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
-wrapper = ${monitor-directory:bin}/cron_simplelogger
-log = ${monitor-directory:log}/cron.log
-
 [directory]
 recipe = slapos.cookbook:mkdirectory
 etc = ${buildout:directory}/etc
@@ -81,20 +43,6 @@ services-conf = ${directory:etc}/monitor.conf.d
 log = ${directory:log}/monitor
 monitor-var = ${directory:var}/monitor
 
-[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
 root = ${directory:srv}/ssl
@@ -281,20 +229,6 @@ context =
     raw dash_binary {{ dash_executable_location }}
 command = kill -USR1 $(cat ${monitor-httpd-conf-parameter:pid-file})
 
-[monitor-status2rss-wrapper]
-recipe = slapos.cookbook:wrapper
-# XXX - hard-coded Urls
-command-line = {{ monitor_genrss }} --output '${monitor-directory:public}/feed' --items_folder '${monitor-directory:public}'  --feed_url '${monitor-conf-parameters:base-url}/public/feed' --public_url '${monitor-conf-parameters:base-url}/share/jio_public/' --private_url '${monitor-conf-parameters:base-url}/share/jio_private/' --instance_name '${monitor-conf-parameters:title}' --hosting_name '${monitor-conf-parameters:root-title}'
-
-wrapper-path = ${directory:bin}/monitor-status2rss.py
-
-[monitor-status2rss-cron-entry]
-recipe = slapos.cookbook:cron.d
-cron-entries = ${cron:cron-entries}
-name = monitor-status2rss
-frequency = * * * * *
-command = ${monitor-status2rss-wrapper:wrapper-path}
-
 [monitor-globalstate-wrapper]
 recipe = slapos.cookbook:wrapper
 command-line = {{ monitor_genstatus }} '${monitor-conf:rendered}' '${monitor-instance-info:rendered}'
@@ -387,7 +321,7 @@ input = inline:#!{{ dash_executable_location }}
   if [ -s $pidfile ]; then
     COUNTER=0
     # Wait until max 20 seconds, the limit promise timeout
-    while [ $COUNTER -lt 20 ]; do
+    while [ $COUNTER -lt 40 ]; do
       if [ -n "$(ps -p $(cat $pidfile) -o pid=)" ]; then
         ((COUNTER=COUNTER+1))
         sleep 0.5
@@ -421,15 +355,21 @@ depends =
   ${monitor-globalstate-cron-entry:name}
   ${monitor-configurator-cron-entry:name}
   ${cron-entry-logrotate:name}
+  ${logrotate-entry-cron:name}
   ${certificate-authority:wrapper}
   ${monitor-conf:rendered}
   ${start-monitor:wrapper-path}
   ${ca-monitor-httpd:wrapper}
   ${monitor-httpd-promise:filename}
-  ${monitor-status2rss-cron-entry:name}
   ${monitor-bootstrap-promise:file}
   ${promise-check-slapgrid:output}
 
 [monitor-publish]
 monitor-base-url = ${publish:monitor-base-url}
 monitor-setup-url = ${monitor-instance-parameter:interface-url}/#page=settings_configurator&url=${publish:monitor-url}&username=$${publish:monitor-user}&password=${publish:monitor-password}
+
+
+[buildout]
+
+extends = 
+  {{ template_logrotate_base }}
\ No newline at end of file

stack/slapos.cfg

@@ -105,25 +105,25 @@ zc.recipe.egg = 1.3.2.post5
 # Use own version of h.r.download to be able to open .xz and .lz archives
 hexagonit.recipe.download = 1.7.post4
 
-Jinja2 = 2.9.3
+Jinja2 = 2.9.4
 PyYAML = 3.12
 MarkupSafe = 0.23
 Werkzeug = 0.11.15
 buildout-versions = 1.7
 cffi = 1.9.1
 click = 6.7
-cliff = 2.3.0
+cliff = 2.4.0
 cmd2 = 0.6.9
-collective.recipe.template = 1.13
+collective.recipe.template = 2.0
 cryptography = 1.7.1
-decorator = 4.0.10
+decorator = 4.0.11
 idna = 2.2
 inotifyx = 0.2.2
 itsdangerous = 0.24
 lock-file = 2.0
 lxml = 3.7.2
 meld3 = 1.0.2
-netaddr = 0.7.18
+netaddr = 0.7.19
 pbr = 1.10.0
 plone.recipe.command = 1.1
 prettytable = 0.7.2
@@ -132,7 +132,7 @@ pyOpenSSL = 16.2.0
 pyasn1 = 0.1.9
 pyparsing = 2.1.10
 pytz = 2016.10
-requests = 2.12.4
+requests = 2.12.5
 setuptools = 19.6.2
 six = 1.10.0
 slapos.cookbook = 1.0.45
@@ -141,7 +141,7 @@ slapos.extension.strip = 0.2
 slapos.libnetworkcache = 0.14.5
 slapos.recipe.build = 0.28
 slapos.recipe.cmmi = 0.2
-stevedore = 1.19.1
+stevedore = 1.20.0
 unicodecsv = 0.14.1
 xml-marshaller = 0.9.7
 
@@ -159,7 +159,7 @@ functools32 = 3.2.3.post2
 
 # Required by:
 # cryptography==1.7.1
-ipaddress = 1.0.17
+ipaddress = 1.0.18
 
 # Required by:
 # slapos.cookbook==1.0.45