software/cloudooo: Switch to monitor-promise-base

software/cloudooo/buildout.hash.cfg

@@ -18,4 +18,4 @@ md5sum = 6e4431cf4b0a0d034402604b1e2844c0
 
 [template-cloudooo-instance]
 filename = instance-cloudooo.cfg.in
-md5sum = 31ed5c856ce2dff0305d7029caefc3f6
+md5sum = 79f2740f7e28ad9fcd2f823d076e790e

software/cloudooo/instance-cloudooo.cfg.in

@@ -68,7 +68,9 @@ mode = {{ mode }}
 [buildout]
 extends =
   {{ parameter_dict['template-logrotate-base'] }}
+  {{ parameter_dict['template-monitor'] }}
 parts =
+  monitor-base
   publish
   apache
   apache-conf
@@ -114,10 +116,11 @@ crl = ${apache-ssl-client:crl}
 
 [apache-promise]
 # Check any apache port in ipv4, expect other ports and ipv6 to behave consistently
-recipe = slapos.cookbook:check_port_listening
-path = ${directory:promise}/apache
-hostname = {{ ipv4 }}
-port = {{ apache_dict.values()[0][0] }}
+<= monitor-promise-base
+module = check_port_listening
+name = apache.py
+config-hostname = {{ ipv4 }}
+config-port = {{ apache_dict.values()[0][0] }}
 
 [apache-conf-ssl]
 cert = ${directory:apache-conf}/apache.crt
@@ -262,7 +265,6 @@ font = ${:srv}/font
 log = ${:var}/log
 newcerts = ${:ca-dir}/newcerts
 private = ${:ca-dir}/private
-promise = ${directory:etc}/promise
 requests = ${:ca-dir}/requests
 run = ${:var}/run
 services = ${:etc}/run

software/cloudooo/software-common.cfg

@@ -3,6 +3,7 @@ extends =
   buildout.hash.cfg
   ../../stack/cloudooo.cfg
   ../../stack/logrotate/buildout.cfg
+  ../../stack/monitor/buildout.cfg
 parts =
   ${cloudooo-buildout:parts}
 
@@ -78,6 +79,7 @@ xserver = ${xserver:location}
 zlib = ${zlib:location}
 template-apache-conf = ${template-apache-backend-conf:target}
 template-logrotate-base = ${template-logrotate-base:rendered}
+template-monitor = ${monitor2-template:rendered}
 
 [template-cloudooo-instance]
 recipe = slapos.recipe.build:download