slaprunner: clone instances do not ask for the frontend anymore

software/slaprunner/common.cfg

@@ -44,7 +44,7 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-runner.cfg
 output = ${buildout:directory}/template-runner.cfg.in
-md5sum = 2ab6fdfb33a36d209c69bb04c4b1a983
+md5sum = c66f18b74b958805bb2196fb1c54683e
 mode = 0644
 
 [instance-runner-import]
@@ -58,7 +58,7 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-runner-export.cfg.in
 output = ${buildout:directory}/instance-runner-export.cfg
-md5sum = 084c768033141c6630df0ac45e205195
+md5sum = b7664995a6dd954f4f214252ffeaaa61
 mode = 0644
 
 [template-resilient]

software/slaprunner/instance-runner-export.cfg.in

@@ -57,7 +57,11 @@ backup-directory = $${directory:backup}
 shell-binary = ${dash:location}/bin/dash
 rsync-binary = ${rsync:location}/bin/rsync
 
+# XXX-Nicolas : this promise will test ipv4 frontend only if software-type is runner-export
+[monitor-promise]
+url = $${monitor-frontend:config-url}/$${deploy-index:filename}
 
 # Extends publish section with resilient parameters
 [publish-connection-informations]
 <= resilient-publish-connection-parameter
+monitor_url = https://$${monitor-frontend:connection-domain}/index.cgi

software/slaprunner/instance-runner.cfg

@@ -23,6 +23,7 @@ parts =
   slapos-repo-config
   cron-entry-prepare-software
   deploy-instance-parameters
+  publish-monitor-frontend
 {% if slapparameter_dict.get('custom-frontend-backend-url') %}
   custom-frontend-promise
 {% endif %}
@@ -39,7 +40,6 @@ parts =
   deploy-settings-cgi
   deploy-status-cgi
   make-rss
-  monitor-frontend
   monitor-promise
   setup-static-files
   certificate-authority
@@ -390,6 +390,22 @@ config-url = $${slaprunner:access-url}
 config-domain = $${slap-parameter:frontend-domain}
 return = site_url domain
 
+[monitor-frontend]
+<= slap-connection
+recipe = slapos.cookbook:requestoptional
+name = Monitor Frontend
+# XXX We have hardcoded SR URL here.
+software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
+slave = true
+config = url domain
+config-url = https://[$${cgi-httpd-configuration-file:listening-ip}]:$${monitor-parameters:port}
+config-domain = $${slap-parameter:frontend-domain}
+return = site_url domain
+
+[publish-monitor-frontend]
+recipe = slapos.cookbook:publish
+monitor_url = https://$${monitor-frontend:connection-domain}/index.cgi
+
 #--------------------------------------
 #--
 #-- Send informations to SlapOS Master

stack/monitor/monitor.cfg.in

@@ -250,18 +250,6 @@ cgid-pid-file = $${directory:run}/cgi-httpd-cgid.pid
 document-root = $${directory:www}
 error-log = $${directory:log}/cgi-httpd-error-log
 
-[monitor-frontend]
-<= slap-connection
-recipe = slapos.cookbook:requestoptional
-name = Monitor Frontend
-# XXX We have hardcoded SR URL here.
-software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
-slave = true
-config = url domain
-config-url = https://[$${cgi-httpd-configuration-file:listening-ip}]:$${monitor-parameters:port}
-config-domain = $${slap-parameter:frontend-domain}
-return = site_url domain
-
 [cgi-httpd-wrapper]
 recipe = slapos.cookbook:wrapper
 apache-executable = ${apache:location}/bin/httpd
@@ -271,12 +259,12 @@ wrapper-path = $${ca-httpd:executable}
 [monitor-promise]
 recipe = slapos.cookbook:check_url_available
 path = $${directory:promises}/monitor
-url = $${monitor-frontend:config-url}/$${deploy-index:filename}
+url = https://[$${cgi-httpd-configuration-file:listening-ip}]:$${monitor-parameters:port}/$${deploy-index:filename}
 check-secure = 1
 dash_path = ${dash:location}/bin/dash
 curl_path = ${curl:location}/bin/curl
 
 [publish-connection-informations]
 recipe = slapos.cookbook:publish
-monitor_url = https://$${monitor-frontend:connection-domain}/index.cgi
+monitor_url = https://[$${cgi-httpd-configuration-file:listening-ip}]:$${monitor-parameters:port}/$${deploy-index:filename}
 IMPORTANT_monitor_info = change the monitor_password as soon as possible ! Default is : $${public:monitor-password}