on-watch stash patch

on-watch.stash.patch

+commit 4c1ddcfc0333f5407a029152bcde5be011a88114
+Author: Tristan Cavelier <tristan.cavelier@nexedi.com>
+Date:   Mon Feb 29 14:49:02 2016 +0000
+
+    stack/erp5: make some services to be watched
+    
+    instance-balancer: haproxy, apache
+    instance-cloudooo: cloudooo
+    instance-kumofs: kumofs_service, kumofs_manager and kumofs_server
+    instance-mariadb: mariadb
+    instance-zeo: zeo, tidstoraged
+    instance-zope: ca, test-ca, zope
+
+diff --git a/stack/erp5/buildout.cfg b/stack/erp5/buildout.cfg
+index a1538d6..1ba3aed 100644
+--- a/stack/erp5/buildout.cfg
++++ b/stack/erp5/buildout.cfg
+@@ -155,7 +155,7 @@ mode = 755
+ [template-mariadb]
+ <= download-base
+ filename = instance-mariadb.cfg.in
+-md5sum = fbc39d333bf70894f6f9d094515a2a4a
++md5sum = a342c7e9ddcf903629a86d73acb6fdf9
+ link-binary =
+   ${coreutils:location}/bin/basename
+   ${coreutils:location}/bin/cat
+@@ -171,12 +171,12 @@ link-binary =
+ [template-kumofs]
+ <= download-base
+ filename = instance-kumofs.cfg.in
+-md5sum = 763db0c4a94649296e74fe1f53c03940
++md5sum = 18742d5cea99ab059ed0fcdaa58d3e42
+ 
+ [template-cloudooo]
+ <= download-base
+ filename = instance-cloudoo.cfg.in
+-md5sum = 1b515056c5892a86d4ece252ad114a97
++md5sum = 3a921396a93d4ac2fab8056ad246ac61
+ 
+ [template-zope-conf]
+ <= download-base
+@@ -335,12 +335,12 @@ md5sum = 66edf64eeaecded8977459acb26f4424
+ [template-zeo]
+ <= download-base
+ filename = instance-zeo.cfg.in
+-md5sum = b0cb0ee97cddc79112a718e065806037
++md5sum = 289480ed7d8023d38332bdbb5aad4ff0
+ 
+ [template-zope]
+ <= download-base
+ filename = instance-zope.cfg.in
+-md5sum = 7ce689894afa26be98b7394874dd9b6b
++md5sum = f0b81aea9fde270e02bc3a063b1190de
+ link-binary =
+   ${aspell:location}/bin/aspell
+   ${dmtx-utils:location}/bin/dmtxwrite
+@@ -364,7 +364,7 @@ link-binary =
+ [template-balancer]
+ <= download-base
+ filename = instance-balancer.cfg.in
+-md5sum = ec9321514674c084e509ca070763b4a1
++md5sum = df72e8a78bbd92ed71de0a9be8078056
+ 
+ [template-apache-conf]
+ <= download-base
+diff --git a/stack/erp5/instance-balancer.cfg.in b/stack/erp5/instance-balancer.cfg.in
+index 6bcae5e..12390fd 100644
+--- a/stack/erp5/instance-balancer.cfg.in
++++ b/stack/erp5/instance-balancer.cfg.in
+@@ -196,7 +196,7 @@ apache-conf = ${:etc}/apache
+ bin = ${buildout:directory}/bin
+ etc = ${buildout:directory}/etc
+ promise = ${directory:etc}/promise
+-services = ${:etc}/run
++services = ${:etc}/service
+ var = ${buildout:directory}/var
+ run = ${:var}/run
+ log = ${:var}/log
+diff --git a/stack/erp5/instance-cloudoo.cfg.in b/stack/erp5/instance-cloudoo.cfg.in
+index 1b3acf1..29067ff 100644
+--- a/stack/erp5/instance-cloudoo.cfg.in
++++ b/stack/erp5/instance-cloudoo.cfg.in
+@@ -97,7 +97,7 @@ base-name = cloudooo-tunnel
+ recipe = slapos.cookbook:mkdirectory
+ etc = ${buildout:directory}/etc
+ srv = ${buildout:directory}/srv
+-service = ${:etc}/run
++service = ${:etc}/service
+ promise = ${:etc}/promise
+ cloudooo-data = ${:srv}/cloudooo
+ font = ${:srv}/font
+diff --git a/stack/erp5/instance-kumofs.cfg.in b/stack/erp5/instance-kumofs.cfg.in
+index 7f0ea99..8620db6 100644
+--- a/stack/erp5/instance-kumofs.cfg.in
++++ b/stack/erp5/instance-kumofs.cfg.in
+@@ -72,7 +72,7 @@ log = ${kumofs-instance:kumo-gateway-log} ${kumofs-instance:kumo-manager-log} ${
+ [directory]
+ recipe = slapos.cookbook:mkdirectory
+ log = ${buildout:directory}/var/log
+-services = ${buildout:directory}/etc/run
++services = ${buildout:directory}/etc/service
+ promise = ${buildout:directory}/etc/promise
+ srv = ${buildout:directory}/srv
+ kumofs-data = ${:srv}/kumofs
+diff --git a/stack/erp5/instance-mariadb.cfg.in b/stack/erp5/instance-mariadb.cfg.in
+index be71774..7db8d3b 100644
+--- a/stack/erp5/instance-mariadb.cfg.in
++++ b/stack/erp5/instance-mariadb.cfg.in
+@@ -139,7 +139,7 @@ context = section parameter_dict init-script-parameters
+ 
+ [update-mysql]
+ recipe = slapos.cookbook:generic.mysql.wrap_update_mysql
+-output = ${directory:services}/mariadb_update
++output = ${directory:unwatch_service}/mariadb_update
+ binary = ${binary-wrap-mysql_upgrade:wrapper-path}
+ mysql = ${binary-wrap-mysql:wrapper-path}
+ init-script = ${init-script:rendered}
+@@ -200,7 +200,8 @@ command = mysql_tzinfo_to_sql
+ recipe = slapos.cookbook:mkdirectory
+ bin = ${buildout:directory}/bin
+ etc = ${buildout:directory}/etc
+-services = ${:etc}/run
++unwatch_service = ${:etc}/run
++services = ${:etc}/service
+ promise = ${:etc}/promise
+ srv = ${buildout:directory}/srv
+ backup = ${:srv}/backup
+diff --git a/stack/erp5/instance-zeo.cfg.in b/stack/erp5/instance-zeo.cfg.in
+index 9c4512b..ce606fe 100644
+--- a/stack/erp5/instance-zeo.cfg.in
++++ b/stack/erp5/instance-zeo.cfg.in
+@@ -175,7 +175,7 @@ mode = 755
+ recipe = slapos.cookbook:mkdirectory
+ bin = ${buildout:directory}/bin
+ etc = ${buildout:directory}/etc
+-services = ${:etc}/run
++services = ${:etc}/service
+ promises = ${:etc}/promise
+ srv = ${buildout:directory}/srv
+ var = ${buildout:directory}/var
+diff --git a/stack/erp5/instance-zope.cfg.in b/stack/erp5/instance-zope.cfg.in
+index dac9d24..9f28406 100644
+--- a/stack/erp5/instance-zope.cfg.in
++++ b/stack/erp5/instance-zope.cfg.in
+@@ -59,7 +59,7 @@ instance-propertysheet = ${:instance}/PropertySheet
+ instance-tests = ${:instance}/tests
+ log = ${:var}/log
+ run = ${:var}/run
+-services = ${:etc}/run
++services = ${:etc}/service
+ srv = ${buildout:directory}/srv
+ tmp = ${buildout:directory}/tmp
+ var = ${buildout:directory}/var