slaprunner: backward compatibility, keep previous httpd port and frontend url

software/slaprunner/common.cfg

@@ -54,7 +54,7 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-runner.cfg
 output = ${buildout:directory}/template-runner.cfg.in
-md5sum = 8fedcc83e2ecb488910ddd8a1c82fe24
+md5sum = 66dba3331f49492d317e9c14d68d1bcb
 mode = 0644
 
 [template-runner-import-script]
@@ -69,7 +69,7 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-runner-import.cfg.in
 output = ${buildout:directory}/instance-runner-import.cfg
-md5sum = 8ae80f9a9d5523219e1c9065f1cab6d8
+md5sum = 673c30e5e7f9b7bb543f79465a56e43d
 mode = 0644
 
 [template-runner-export-script]
@@ -84,13 +84,13 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-runner-export.cfg.in
 output = ${buildout:directory}/instance-runner-export.cfg
-md5sum = 8f4912ca04a650298c3c260689109c2e
+md5sum = 4b0ab39bc655ae0b865207147cb2e5bf
 mode = 0644
 
 [template-resilient]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/instance-resilient.cfg.jinja2
-md5sum = 160bf71d8a15f1359d80eb5586109781
+md5sum = 6373b2cf3c0cee78bd858959976271d3
 filename = instance-resilient.cfg.jinja2
 mode = 0644
 

software/slaprunner/instance-resilient.cfg.jinja2

@@ -43,11 +43,6 @@ username = admin
 recipe = slapos.cookbook:mkdirectory
 etc = ${buildout:directory}/etc
 
-# XXX Monitoring Main Instane
-[monitor-instance-parameter]
-monitor-httpd-port = 8160
-cors-domains = {{ monitor_parameter.get('monitor-cors-domains', '') }}
-
 
 # Bubble up the parameters
 [request-runner]

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

@@ -35,6 +35,7 @@ parts +=
   httpd-graceful-wrapper
 ## Monitoring part
 ## Monitor for runner
+  monitor-base
   monitor-check-resilient-feed-file
   monitor-check-webrunner-internal-instance
 
@@ -66,7 +67,7 @@ instance-configuration =
 [monitor-check-resilient-feed-file]
 recipe = slapos.recipe.template:jinja2
 template = ${template-monitor-check-resilient-feed:location}/${template-monitor-check-resilient-feed:filename}
-rendered = $${monitor-directory:promises}/check-create-resilient-feed-files
+rendered = $${monitor-directory:reports}/check-create-resilient-feed-files
 mode = 700
 context =
   key input_feed_directory directory:notifier-feeds

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

@@ -29,6 +29,8 @@ parts +=
 # have to repeat the next one, as it's not inherited from pbsready-import
   import-on-notification
 
+  monitor-base
+
 # For the needs of importer, we run the full slaprunner
 # In case both exporter and importer (aka main instance and clone instance)
 # run with the same IP (usually for testing purposes),

software/slaprunner/instance-runner.cfg

@@ -34,7 +34,7 @@ parts =
   custom-frontend-promise
 {% endif %}
 ## Monitoring part
-
+  monitor-base
   monitor-check-webrunner-internal-instance
 
 extends = ${monitor2-template:rendered}
@@ -308,9 +308,7 @@ path_access_log = $${directory:log}/httpd-access.log
 cert_file = $${ca-nginx:cert-file}
 key_file = $${ca-nginx:key-file}
 global_ip = $${slap-network-information:global-ipv6}
-global_port = 8386
-#httpd_port = $${monitor-parameters:port}
-#monitor_index = $${deploy-index:rendered}
+global_port = $${slap-parameter:slaprunner-httpd-port}
 working_directory = $${slaprunner:working-directory}
 dav_lock = $${directory:var}/WebDavLock
 htpasswd_file = $${monitor-httpd-conf-parameter:htpasswd-file}
@@ -441,7 +439,9 @@ return = site_url domain
 [request-httpd-frontend]
 <= slap-connection
 recipe = slapos.cookbook:requestoptional
-name = SlapRunner httpd Frontend
+# XXX - Unfortunately, we still call webrunner httpd frontend "Monitor Frontend" otherwise 
+# buildout will ignore previous frontend that was created and create a new one (in case of upgrade)
+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
@@ -469,7 +469,7 @@ backend_url = $${slaprunner:access-url}
 access_url = $${:url}/login
 url =  https://$${request-frontend:connection-domain}
 ssh_command = ssh $${dropbear-runner-server:host} -p $${dropbear-runner-server:port}
-webdav_url = $${request-httpd-frontend:connection-secure_access}/shared/
+webdav_url = $${request-httpd-frontend:connection-secure_access}/share/
 public_url =  $${request-httpd-frontend:connection-secure_access}/public/
 git_public_url = https://[$${httpd-parameters:global_ip}]:$${httpd-parameters:global_port}/git-public/
 git_private_url = https://[$${httpd-parameters:global_ip}]:$${httpd-parameters:global_port}/git/
@@ -524,10 +524,14 @@ slapos-reference = master
 auto-deploy = false
 auto-deploy-instance = true
 autorun = false
-monitor-port = 9687
+slaprunner-httpd-port = $${:monitor-port}
+# XXX - for backward compatibility, monitor-port was for slaprunner httpd server
+monitor-port = 9684
 instance-name =
 monitor-cors-domains = 
 monitor-interface-url = 
+# XXX - define a new port for monitor here and use monitor-port for backward compatibility
+monitor-httpd-port = 8386
 
 [monitor-parameters]
 port = $${slap-parameter:monitor-port}
@@ -718,7 +722,7 @@ port = $${supervisord:port}
 
 # XXX Monitor 
 [monitor-instance-parameter]
-monitor-httpd-port = $${slap-parameter:monitor-port}
+monitor-httpd-port = $${slap-parameter:monitor-httpd-port}
 {% if slapparameter_dict.get('name', '') -%}
 monitor-title = {{ slapparameter_dict['name'] }}
 {% endif -%}
@@ -732,8 +736,8 @@ password = {{ slapparameter_dict['monitor-password'] }}
 {% if slapparameter_dict.get('monitor-url-list', '') -%}
 opml-url-list = {{ slapparameter_dict['monitor-url-list'] }}
 {% endif -%}
+# check if not resilient runner
 {% if not slapparameter_dict.get('authorized-key', '') -%}
-# Parameter for resilient
 # Pass some parameter to dispay in monitoring interface
 instance-configuration =
   file recovery-code $${recovery-code:storage-path}
@@ -745,7 +749,7 @@ configuration-file-path = $${buildout:directory}/knowledge0.cfg
 [monitor-check-webrunner-internal-instance]
 recipe = slapos.recipe.template:jinja2
 template = ${monitor-check-webrunner-internal-instance:location}/${monitor-check-webrunner-internal-instance:filename}
-rendered = $${monitor-directory:promises}/$${:filename}
+rendered = $${monitor-directory:reports}/$${:filename}
 filename = monitor-check-webrunner-internal-instance
 mode = 0744