Fix webrunner ports + some monitor clean-up

software/monitor/instance-monitor.cfg.jinja2

@@ -68,16 +68,6 @@ mod-ssl = ${:cache}/httpd_mod_ssl
 system-log = ${:private}/system-log
 consumption = ${:log}/consumption
 
-[monitor-httpd-configuration-file]
-context =
-  import json_module json
-  section directory monitor-directory
-  section monitor_parameters monitor-parameters
-  section httpd_configuration monitor-httpd-configuration
-  section monitor_rewrite_rule monitor-rewrite-rule
-  section slave_information slap-configuration
-  key monitor_private_hash slap-configuration:private-hash  
-
 [python-symlink]
 recipe = plone.recipe.command
 command = ln -sf {{ buildout_bin }}/pythonwitheggs ${monitor-directory:bin}/python

software/monitor/software.cfg

@@ -28,7 +28,7 @@ mode = 0644
 recipe = slapos.recipe.build:download 
 url = ${:_profile_base_location_}/instance-monitor.cfg.jinja2
 destination = ${buildout:directory}/template-base-monitor.cfg
-md5sum = 2d9436dd6b116ee2e7cc7b30a6305475
+md5sum = dffe797be3a66d6838ffc70ee8f5f3ff
 mode = 0644
 
 [template-monitor-distributor]

software/powerdns/instance-powerdns.cfg

@@ -139,9 +139,6 @@ extra-context =
 {% endfor %}
 
 ####################
-# Monitoring
-[monitor-rewrite-rule]
-powerdns = http://$${pdns:local-ipv4}:$${pdns:webserver-port}/
 
 [buildout]
 parts =

software/powerdns/software.cfg

@@ -25,7 +25,7 @@ mode = 0644
 [template-powerdns]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-powerdns.cfg
-md5sum = e623ae588e14cbfda69e28a3002eaa29
+md5sum = b2301de110ba95be46121dc18d7ca544
 output = ${buildout:directory}/template-powerdns.cfg
 mode = 0644
 

software/slaprunner/buildout.hash.cfg

@@ -18,7 +18,7 @@ md5sum = c44a7481bb85e3258128afe3fcf23f44
 
 [template-runner]
 filename = instance-runner.cfg
-md5sum = 8f1da15d78ed08d9904ae94844a6893d
+md5sum = a5e2ae493b78a0f42d61cc79a0b2e686
 
 [template-runner-import-script]
 filename = template/runner-import.sh.jinja2

software/slaprunner/instance-runner-input-schema.json

@@ -115,12 +115,17 @@
       ],
       "default": "false"
     },
-    "monitor-port": {
+    "slaprunner-httpd-port": {
+      "title": "Webrunner Server Port",
+      "description": "Port of the Apache server serving the Webrunner interface.",
+      "type": "integer",
+      "default": 9686
+    },
+    "monitor-httpd-port": {
       "title": "Monitor Port",
-      "description": "Allow to manually change the port on wich the apache server running monitoring interface is listening. The default value for the webrunner is different from the default value of the standalone stack-monitor server (default 9684)",
+      "description": "Port of the Apache server serving the monitoring interface.",
       "type": "integer",
-      "minimum": 9683,
-      "exclusiveMinimum": true
+      "default": 8386
     },
     "monitor-interface-url": {
       "title": "Monitor Web Interface URL",

software/slaprunner/instance-runner.cfg

@@ -170,7 +170,7 @@ pidfile-instance = $${directory:run}/slapgrid-sr.pid
 ssh_client = ${openssh:location}/bin/ssh
 public_key = $${runner-sshd-raw-server:rsa-keyfile}.pub
 private_key = $${runner-sshd-raw-server:rsa-keyfile}
-instance-monitor-url = https://[$${:ipv6}]:$${monitor-parameters:port}
+instance-monitor-url = https://[$${:ipv6}]:$${slap-parameter:monitor-httpd-port}
 etc_dir = $${directory:etc}
 log_dir =  $${directory:log}
 run_dir = $${directory:run}
@@ -413,7 +413,6 @@ project_public_folder = $${runnerdirectory:public-project}
 runner_home = $${runnerdirectory:home}
 git_http_backend = ${git:location}/libexec/git-core/git-http-backend
 cgid_sock = $${directory:run}/cgid.sock
-#cgi_httpd_conf = $${monitor-httpd-configuration-file:rendered}
 httpd_cors_file = $${slaprunner-httpd-cors:location}
 
 [httpd-conf]
@@ -669,18 +668,12 @@ slapos-reference = 1.0
 auto-deploy = false
 auto-deploy-instance = true
 autorun = false
-slaprunner-httpd-port = $${:monitor-port}
-# XXX - for backward compatibility, monitor-port was for slaprunner httpd server
-monitor-port = 9686
+slaprunner-httpd-port = 9686
 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}
-
 [slapos-cfg]
 recipe = slapos.recipe.template:jinja2
 template = ${template-slapos-cfg:location}/${template-slapos-cfg:filename}