Merge branch 'master' into erp5-component

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