software/plantuml: Switch to monitor-promise-base

software/plantuml/buildout.hash.cfg

@@ -15,7 +15,7 @@
 
 [instance]
 filename = instance.cfg.in
-md5sum = 8ed7b3f59d94869a328c72fa9bbfd7d5
+md5sum = 602f1c57df08abefe0d8dc3ae22abaf0
 
 [tomcat-server-xml]
 filename = server.xml.in

software/plantuml/instance.cfg.in

@@ -7,6 +7,8 @@ eggs-directory = ${buildout:eggs-directory}
 develop-eggs-directory = ${buildout:develop-eggs-directory}
 offline = true
 
+extends = ${monitor2-template:rendered}
+
 [fontconfig-conf]
 recipe = slapos.recipe.template
 url = ${font.conf:output}
@@ -78,16 +80,14 @@ needs = $${tomcat-web-xml:location}
 [promises]
 recipe =
 instance-promises =
-  $${tomcat-listen-promise:path}
-
-[check-port-listening-promise]
-recipe = slapos.cookbook:check_port_listening
-path = $${directory:promises}/$${:_buildout_section_name_}
+  $${tomcat-listen-promise:name}
 
 [tomcat-listen-promise]
-<= check-port-listening-promise
-hostname= $${tomcat-instance:ip}
-port = $${tomcat-instance:port}
+<= monitor-promise-base
+module = check_port_listening
+name = tomcat_listen_promise.py
+config-hostname= $${tomcat-instance:ip}
+config-port = $${tomcat-instance:port}
 
 [publish-connection-parameter]
 recipe = slapos.cookbook:publish
@@ -110,7 +110,6 @@ srv = $${buildout:directory}/srv
 bin = $${buildout:directory}/bin
 tmp = $${buildout:directory}/tmp
 services = $${:etc}/service
-promises = $${:etc}/promise
 
 fonts = $${:srv}/fonts/
 fontcache = $${buildout:directory}/.fontcache/

software/plantuml/software.cfg

 [buildout]
 extends =
   ../../stack/slapos.cfg
+  ../../stack/monitor/buildout.cfg
   ../../stack/nodejs.cfg
   ../../component/fontconfig/buildout.cfg
   ../../component/freetype/buildout.cfg