monitor: restore monitor httpd promise

stack/monitor/buildout.cfg

@@ -89,7 +89,7 @@ recipe = slapos.recipe.template:jinja2
 filename = template-monitor.cfg
 template = ${:_profile_base_location_}/instance-monitor.cfg.jinja2.in
 rendered = ${buildout:directory}/template-monitor.cfg
-md5sum = 1c731d879992c218bc6823e88c33f3b3
+md5sum = 794e7fd74bca86ea5e74a29cde21b836
 context =
     key apache_location apache:location
     key gzip_location gzip:location

stack/monitor/instance-monitor.cfg.jinja2.in

@@ -229,49 +229,14 @@ mode = 700
 context = 
   raw python_executable {{ python_executable }}
 
-[monitor-promise]
+[monitor-httpd-promise]
 recipe = slapos.cookbook:check_url_available
-path = ${directory:promises}/monitor
+path = ${directory:promises}/monitor-httpd-listening-on-tcp
 url = ${monitor-httpd-conf-parameter:url}
 check-secure = 1
 dash_path = {{ dash_executable_location }}
 curl_path = {{ curl_executable_location }}
 
-[promise-parameters-dict]
-
-[monitor-base-promise-conf]
-recipe = slapos.recipe.template:jinja2
-template = {{ monitor_service_template_conf }}
-public-path = 
-context =
-  key name :name
-  key script_path :executable-file
-  key title :title
-  key frequency :frequency
-  key public_path_list :public-path
-  key private_path_list :public-path
-  section parameters promise-parameters-dict
-
-# Create monitor directory for this promise
-[promise-directory]
-recipe = slapos.cookbook:mkdirectory
-monitor-httpd = ${monitor-directory:public}/monitor-httpd
-
-[monitor-monitor-promise]
-recipe = slapos.cookbook:wrapper
-pid-file = ${monitor-directory:pids}/monitor-promise.pid
-status-file = ${promise-directory:monitor-httpd}/status.json
-command-line = ${monitor-run-promise:rendered} ${:pid-file} ${:status-file} ${monitor-promise:path}
-wrapper-path = ${monitor-directory:promises}/monitor-httpd
-
-[conf-monitor-promise]
-<= monitor-base-promise-conf
-rendered = ${monitor-directory:services-conf}/monitor-httpd-promise.conf
-name = monitor-httpd-promise
-title = Monitor promise httpd
-executable-file = ${monitor-monitor-promise:wrapper-path}
-frequency = */5 * * * *
-
 [monitor-publish]
 recipe = slapos.cookbook:publish
 monitor_url_v6 = ${monitor-httpd-conf-parameter:url}
@@ -291,5 +256,5 @@ parts =
   monitor-conf
   start-monitor
   ca-httpd
-#  conf-monitor-promise
+  monitor-httpd-promise
   monitor-publish