monitor2: add monitor password promise configuration

stack/monitor2/buildout.cfg

@@ -106,7 +106,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 = 07504e9bccb50ff17945363f7440472e
+md5sum = 382f764b4d8fe203a9b2abe380323c03
 context =
     key apache_location apache:location
     key gzip_location gzip:location
@@ -124,8 +124,8 @@ context =
     raw dash_executable_location ${dash:location}/bin/dash
     raw dcron_executable_location ${dcron:location}/sbin/crond
     raw logrotate_executable_location ${logrotate:location}/usr/sbin/logrotate
-    raw monitor_httpd_promise_conf ${monitor-httpd-promise-conf:location}/${monitor-httpd-promise-conf:filename}
     raw monitor_httpd_template ${monitor-httpd-conf:location}/${monitor-httpd-conf:filename}
+    raw monitor_service_conf_template ${monitor-service-conf-template:location}/${monitor-service-conf-template:filename}
     raw monitor_service_run ${monitor-service-template-run:location}/${monitor-service-template-run:filename}
     raw openssl_executable_location ${openssl:location}/bin/openssl
     raw python_executable ${buildout:executable}
@@ -137,9 +137,9 @@ context =
 md5sum = 625d3d948c0af7b4848d7fad92bfb844
 filename = monitor-httpd.conf.in
 
-[monitor-httpd-promise-conf]
+[monitor-service-conf-template]
 <= monitor-download-base
-filename = monitor-httpd-promise.conf.in
+filename = monitor-service.cfg.in
 md5sum = 5913d2a0096b50537f394a49b762b3e5
 
 [monitor-service-template-run]

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

@@ -260,7 +260,7 @@ curl_path = {{ curl_executable_location }}
 [monitor-httpd-promise-conf]
 recipe = slapos.recipe.template:jinja2
 rendered = ${directory:monitor-promise}/${monitor-httpd-promise:filename}.cfg
-template = {{ monitor_httpd_promise_conf }}
+template = {{ monitor_service_conf_template }}
 mode = 0644
 context = section parameter_dict monitor-httpd-promise-conf-parameter
 
@@ -281,6 +281,17 @@ context =
   raw python_executable {{ python_executable }}
   raw password_changed_once_path ${directory:var}/monitor-password-changed-once
 
+[monitor-password-promise-conf-parameter]
+title = Monitor password
+frequency = */5 * * * *
+
+[monitor-password-promise-conf]
+recipe = slapos.recipe.template:jinja2
+template = {{ monitor_service_conf_template }}
+rendered = ${directory:monitor-promise}/${monitor-password-promise:filename}.cfg
+mode = 0644
+context = section parameter_dict monitor-password-promise-conf-parameter
+
 [publish]
 recipe = slapos.cookbook:publish
 monitor-url = ${monitor-httpd-conf-parameter:url}
@@ -305,4 +316,5 @@ parts =
   monitor-httpd-promise
   monitor-httpd-promise-conf
   monitor-password-promise
+  monitor-password-promise-conf
   publish