Merge branch 'erp5-component' into erp5

component/dcron/buildout.cfg

@@ -4,9 +4,16 @@ extends =
 
 parts = dcron-output
 
+[dcron-hooks-download]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/${:filename}
+md5sum = 860e914dff4108b47565965fe5ebc7b5
+download-only = true
+filename = dcron-hooks.py
+
 [dcron-patch-nonroot]
 recipe = hexagonit.recipe.download
-md5sum = 2f5b22dc1cbe81060a9c28e6f5c06e8b
+md5sum = d5408ab682b65cc1eda40d588fcd7db8
 url = ${:_profile_base_location_}/${:filename}
 filename = dcron-4.4.noroot.no.globals.patch
 download-only = true
@@ -21,12 +28,13 @@ patches =
 patch-options = -p1
 make-options =
   PREFIX=${buildout:parts-directory}/${:_buildout_section_name_}
+post-make-hook = ${dcron-hooks-download:location}/${dcron-hooks-download:filename}:post_make_hook
 
 [dcron-output]
 # Shared binary location to ease migration
 recipe = plone.recipe.command
 stop-on-error = true
 update-command = ${:command}
-command = ${coreutils-output:test} -x ${:crond} -a -x ${:crontab}
+command = ${coreutils-output:test} -x ${:crond} -a -x ${:crontab} -a ! -u ${:crontab}
 crond = ${dcron:location}/sbin/crond
 crontab = ${dcron:location}/bin/crontab

component/dcron/dcron-4.4.noroot.no.globals.patch

-# Patch for making dcron usable without root user, as a local service
 diff -ru dcron-4.4.org/chuser.c dcron-4.4/chuser.c
 --- dcron-4.4.org/chuser.c	2010-01-18 16:27:31.000000000 +0100
-+++ dcron-4.4/chuser.c	2011-04-01 11:19:19.000000000 +0200
++++ dcron-4.4/chuser.c	2013-07-18 18:17:16.342147418 +0200
 @@ -14,47 +14,6 @@
  int
  ChangeUser(const char *user, char *dochdir)
@@ -53,7 +52,16 @@ diff -ru dcron-4.4.org/chuser.c dcron-4.4/chuser.c
  
 diff -ru dcron-4.4.org/crontab.c dcron-4.4/crontab.c
 --- dcron-4.4.org/crontab.c	2010-01-18 16:27:31.000000000 +0100
-+++ dcron-4.4/crontab.c	2011-04-01 11:19:19.000000000 +0200
++++ dcron-4.4/crontab.c	2013-07-18 18:18:07.768535485 +0200
+@@ -88,7 +88,7 @@
+ 				break;
+ 			case 'c':
+ 				/* getopt guarantees optarg != 0 here */
+-				if (*optarg != 0 && getuid() == geteuid()) {
++				if (*optarg != 0) {
+ 					CDir = optarg;
+ 				} else {
+ 					printlogf(0, "-c option: superuser only");
 @@ -316,9 +316,6 @@
  
  	close(filedes[0]);
@@ -75,7 +83,7 @@ diff -ru dcron-4.4.org/crontab.c dcron-4.4/crontab.c
  				ptr = PATH_VI;
 diff -ru dcron-4.4.org/job.c dcron-4.4/job.c
 --- dcron-4.4.org/job.c	2010-01-18 16:27:31.000000000 +0100
-+++ dcron-4.4/job.c	2011-04-01 11:19:19.000000000 +0200
++++ dcron-4.4/job.c	2013-07-18 18:17:16.342147418 +0200
 @@ -62,14 +62,6 @@
  		 * Change running state to the user in question
  		 */
@@ -108,7 +116,7 @@ diff -ru dcron-4.4.org/job.c dcron-4.4/job.c
  		/*
 diff -ru dcron-4.4.org/Makefile dcron-4.4/Makefile
 --- dcron-4.4.org/Makefile	2010-01-18 16:27:31.000000000 +0100
-+++ dcron-4.4/Makefile	2011-04-01 11:19:35.000000000 +0200
++++ dcron-4.4/Makefile	2013-07-18 18:17:16.342147418 +0200
 @@ -3,7 +3,6 @@
  
  # these variables can be configured by e.g. `make SCRONTABS=/different/path`

component/dcron/dcron-hooks.py

+import os
+import shutil
+def post_make_hook(options, buildout):
+  crontab_path = os.path.join(options['location'], 'bin', 'crontab')
+  os.chmod(crontab_path, 0750)

component/mariadb/buildout.cfg

@@ -25,10 +25,10 @@ download-only = true
 
 [mariadb]
 recipe = slapos.recipe.cmmi
-version = 5.5.31
+version = 5.5.32
 revision = 1
 url = http://downloads.askmonty.org/f/mariadb-${:version}/kvm-tarbake-jaunty-x86/mariadb-${:version}.tar.gz/from/http://ftp.osuosl.org/pub/mariadb
-md5sum = 3fe756bc76f0e7a3af2757e48ce0f3f4
+md5sum = 565c2dce6a2fb027c9d0ffbae4934135
 # compile directory is required to build mysql plugins.
 keep-compile-dir = true
 patch-options = -p0

slapos/recipe/generic_varnish/template/varnishd.in

@@ -4,6 +4,7 @@ DAEMON_OPTS="-F \
              -a %(varnish_ip)s:%(varnishd_server_port)s \
              -T %(varnish_ip)s:%(varnishd_manager_port)s \
              -t 0 \
+             -p nuke_limit=500 \
              -n %(varnish_instance_name)s \
              -f %(vcl_file)s \
              -s file,%(varnish_data)s/varnish_storage.bin,1G"

software/backupserver/software.cfg

 [buildout]
 extends =
-  ../../component/lxml-python/buildout.cfg
   ../../component/dash/buildout.cfg
   ../../component/dcron/buildout.cfg
   ../../component/logrotate/buildout.cfg
@@ -12,11 +11,10 @@ extends =
   ../../component/rsync/buildout.cfg
   ../../component/dropbear/buildout.cfg
   ../../component/grep/buildout.cfg
-  ../../stack/flask.cfg
+#   ../../stack/flask.cfg
   ../../stack/slapos.cfg
 
 parts =
-  eggs
   rdiff-backup
 #   duplicity
   dcron
@@ -30,6 +28,7 @@ parts =
   template-pullrdiffbackup
   template-backup-script
   template-crontab-line
+  slapos-cookbook
 
 [networkcache]
 # signature certificates of the following uploaders.
@@ -161,15 +160,6 @@ signature-certificate-list =
   m711+GzlW5xe6GyH9SZaGOPAdUbI6JTDwLzEgA==
   -----END CERTIFICATE-----
 
-[eggs]
-recipe = zc.recipe.egg
-eggs =
-  ${lxml-python:egg}
-
-[directory]
-recipe = slapos.cookbook:mkdirectory
-template = ${buildout:directory}/template
-
 ##########################################################
 # Service startup scripts and configuration files
 ##########################################################
@@ -177,28 +167,28 @@ template = ${buildout:directory}/template
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/template-dcron-service.sh.in
 md5sum = 1372441dac23e4fa7d2dc773a74725ea
-output = ${directory:template}/template-dcron-service.sh.in
+output = ${buildout:directory}/template-dcron-service.sh.in
 mode = 0644
 
 [template-backup-script]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/template-backup-script.sh.in
 md5sum = 19c3a72913cc285bf9745ab2f869018e
-output = ${directory:template}/template-backup-script.sh.in
+output = ${buildout:directory}/template-backup-script.sh.in
 mode = 0644
 
 [template-crontab-line]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/template-crontab-line.in
 md5sum = 5cbd64f04da0601ba4286516a6161f5e
-output = ${directory:template}/template-crontab-line.in
+output = ${buildout:directory}/template-crontab-line.in
 mode = 0644
 
 [template-crontab]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/template-crontab.in
 md5sum = 072be0fd04896880c931d44d8eabde37
-output = ${directory:template}/template-crontab.in
+output = ${buildout:directory}/template-crontab.in
 mode = 0644
 
 ##########################################################
@@ -208,7 +198,7 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-pullrdiffbackup.cfg.in
 md5sum = 62c236773dadecac11eb9a47dbca9351
-output = ${directory:template}/template-pullrdiffbackup.cfg
+output = ${buildout:directory}/template-pullrdiffbackup.cfg
 mode = 0644
 
 [template]
@@ -294,3 +284,7 @@ xml-marshaller = 0.9.7
 # slapos.core==0.35.1
 zope.interface = 4.0.5
 
+cliff = 1.4
+cmd2 = 0.6.5.1
+prettytable = 0.7.2
+requests = 1.2.3