[software/htmlvalidatorserver] Add the monitor stack

software/htmlvalidatorserver/instance-validator.cfg.in

 ###############################
 # Instanciate nvu
 ###############################
-[directory]
+[basedirectory]
 recipe = slapos.cookbook:mkdirectory
 etc = $${buildout:directory}/etc
 bin = $${buildout:directory}/bin
@@ -26,7 +26,7 @@ catalina_conf = $${:catalina_base}/conf
 [tomcat-service]
 recipe = slapos.recipe.template
 url = ${template-tomcat-service:output}
-output = $${directory:services}/tomcat
+output = $${basedirectory:services}/tomcat
 mode = 0700
 virtual-depends = 
   $${tomcat-configuration:ip}
@@ -34,7 +34,7 @@ virtual-depends =
 [tomcat-configuration]
 recipe = slapos.recipe.template
 url = ${template-tomcat-configuration:output}
-output = $${directory:catalina_conf}/server.xml
+output = $${basedirectory:catalina_conf}/server.xml
 mode = 0600
 ip = $${slap-network-information:global-ipv6}
 port = 8899
@@ -43,21 +43,28 @@ port = 8899
 recipe = slapos.cookbook:check_port_listening
 hostname = $${tomcat-configuration:ip}
 port = $${tomcat-configuration:port}
-path = $${directory:promises}/tomcat_listen
+path = $${basedirectory:promises}/tomcat_listen
 
 #################################
 # Slapos publish
 #################################
 [publish-url]
 recipe = slapos.cookbook:publish
-url = http://[$${tomcat-configuration:ip}]:$${tomcat-configuration:port}/
+<= monitor-publish
+vnu-url = http://[$${tomcat-configuration:ip}]:$${tomcat-configuration:port}/
+
+[monitor-instance-parameter]
+monitor-httpd-port = 8333
 
 # Add parts generated by template
 [buildout]
+extends =
+  ${monitor-template:rendered}
 parts =
   publish-url
   tomcat-service
   tomcat-listen-promise
+  monitor-base
 
 eggs-directory = ${buildout:eggs-directory}
 develop-eggs-directory = ${buildout:develop-eggs-directory}

software/htmlvalidatorserver/software.cfg

@@ -7,6 +7,8 @@ extends =
   ../../component/tomcat/buildout.cfg
   ../../component/vnu/buildout.cfg
   ../../stack/slapos.cfg
+# Monitoring stack (keep on bottom)
+  ../../stack/monitor/buildout.cfg
 
 parts =
   slapos-cookbook
@@ -25,7 +27,7 @@ mode = 0644
 [template-tomcat-service]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/template-tomcat-service.sh.in
-md5sum = ac921bff4b6ed9bc649d72aabfced88b
+md5sum = 09803fb71404edbccb32c44a0040dae4
 output = ${buildout:directory}/template-tomcat-service.sh.in
 mode = 0644
 
@@ -35,7 +37,7 @@ mode = 0644
 [template-validator]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-validator.cfg.in
-md5sum = ffd825a0fb1c9f94e647dcefbf9de4ba
+md5sum = 30c0294f5a0cad1f3c2833c1cc61b3c4
 output = ${buildout:directory}/template-validator.cfg
 mode = 0644
 
@@ -53,3 +55,34 @@ gunicorn = 19.1.1
 plone.recipe.command = 1.1
 slapos.recipe.template = 2.4.2
 inotifyx = 0.2.2
+apache-libcloud = 2.2.1
+gitdb2 = 2.0.3
+smmap2 = 2.0.3
+
+# Required by:
+# slapos.toolbox==0.73
+GitPython = 2.1.8
+
+# Required by:
+# slapos.toolbox==0.73
+atomize = 0.2.0
+
+# Required by:
+# slapos.toolbox==0.73
+dnspython = 1.15.0
+
+# Required by:
+# slapos.toolbox==0.73
+erp5.util = 0.4.50
+
+# Required by:
+# slapos.toolbox==0.73
+feedparser = 5.2.1
+
+# Required by:
+# slapos.toolbox==0.73
+lockfile = 0.12.2
+
+# Required by:
+# slapos.toolbox==0.73
+passlib = 1.7.1

software/htmlvalidatorserver/template-tomcat-service.sh.in

@@ -3,6 +3,6 @@
 # BEWARE: It will be overwritten automatically
 
 export JRE_HOME=${java-re-8:location}
-export CATALINA_BASE=$${directory:catalina_base}
+export CATALINA_BASE=$${basedirectory:catalina_base}
 
 exec ${tomcat7-output:catalina} run