software/proftpd: Switch to monitor-promise-base

software/proftpd/buildout.hash.cfg

@@ -15,11 +15,11 @@
 
 [instance-profile]
 filename = instance.cfg.in
-md5sum = 8ed5b4a7940db47ccb386c2f4e3e7273
+md5sum = efb4238229681447aa7fe73898dffad4
 
 [instance-default]
 filename = instance-default.cfg.in
-md5sum = 4cba10d2e9fc4b17c73c78bde0bcb86c
+md5sum = 6e378dc7fc9fbf1ba72b3bf4f2016507
 
 [proftpd-config-file]
 filename = proftpd-config-file.cfg.in

software/proftpd/instance-default.cfg.in

@@ -3,6 +3,7 @@ parts =
   promises
   publish-connection-parameter
 
+extends = {{ template_monitor }}
 
 [instance-parameter]
 # TODO: this is not needed
@@ -29,7 +30,6 @@ var = ${:home}/var
 log = ${:var}/log
 srv = ${:home}/srv
 service = ${:etc}/service
-promise = ${:etc}/promise
 proftpd-dir = ${:srv}/proftpd/
 ssh-authorized-keys-dir = ${:etc}/authorized_keys/
 
@@ -40,10 +40,6 @@ rendered = ${directory:etc}/${:_buildout_section_name_}.cfg
 mode = 0644
 extensions = jinja2.ext.do
 
-[check-port-listening-promise]
-recipe = slapos.cookbook:check_port_listening
-path = ${directory:promise}/${:_buildout_section_name_}
-
 [proftpd-userinfo]
 recipe = slapos.cookbook:userinfo
 
@@ -81,9 +77,11 @@ command-line =
 wrapper-path = ${directory:service}/proftpd
 
 [proftpd-listen-promise]
-<= check-port-listening-promise
-hostname = ${proftpd:ipv6}
-port = ${proftpd:sftp-port}
+<= monitor-promise-base
+module = check_port_listening
+name = proftpd_listen_promise.py
+config-hostname = ${proftpd:ipv6}
+config-port = ${proftpd:sftp-port}
 
 
 [ftpasswd]
@@ -129,7 +127,7 @@ context =
 [promises]
 recipe =
 instance-promises =
-  ${proftpd-listen-promise:path}
+  ${proftpd-listen-promise:name}
 
 
 [publish-connection-parameter]

software/proftpd/instance.cfg.in

@@ -25,6 +25,7 @@ context =
   raw ftpdctl_bin {{ ftpdctl_bin }}
   raw ssh_keygen_bin {{ ssh_keygen_bin }}
   raw perl_bin {{ perl_bin }}
+  raw template_monitor {{ template_monitor }}
 
 [instance-default]
 <= instance-template

software/proftpd/software.cfg

 [buildout]
 extends =
   ../../stack/slapos.cfg
+  ../../stack/monitor/buildout.cfg
   ../../component/openssh/buildout.cfg
   ../../component/proftpd/buildout.cfg
   buildout.hash.cfg
@@ -38,7 +39,7 @@ context =
   key ftpdctl_bin proftpd-output:ftpdctl
   key ssh_keygen_bin openssh-output:keygen
   key perl_bin proftpd-output:perl
-
+  raw template_monitor ${monitor2-template:rendered}
 
 [versions]
 collective.recipe.environment = 1.1.0