caddy-frontend: Honor monitor variables from request

software/caddy-frontend/buildout.hash.cfg

@@ -18,7 +18,7 @@ md5sum = 906e5bd66b1265b8109a86b6ab46e91f
 
 [template-apache-frontend]
 filename = instance-apache-frontend.cfg
-md5sum = 2db996d2c48c0fe03c05f051e7a914bc
+md5sum = 1f7bd1a8e1fd3d77470bc36dcd68a023
 
 [template-apache-replicate]
 filename = instance-apache-replicate.cfg.in

software/caddy-frontend/instance-apache-frontend.cfg

@@ -123,6 +123,8 @@ configuration.trafficserver-mgmt-port = 8084
 configuration.re6st-verification-url = http://[2001:67c:1254:4::1]/index.html
 configuration.enable-http2-by-default = true
 configuration.mpm-graceful-shutdown-timeout = 5
+configuration.monitor-cors-domains =
+configuration.monitor-httpd-port = 8072
 
 [frontend-configuration]
 template-log-access = ${template-log-access:target}
@@ -610,8 +612,6 @@ apache-certificate =
 open-port = 80 443
 extra_slave_instance_list =
 frontend-name =
-monitor-cors-domains =
-monitor-httpd-port = 8072
 monitor-username = $${monitor-instance-parameter:username}
 monitor-password = $${monitor-htpasswd:passwd}
 
@@ -620,8 +620,8 @@ monitor-password = $${monitor-htpasswd:passwd}
 #
 
 [monitor-instance-parameter]
-monitor-httpd-port = $${slap-parameter:monitor-httpd-port}
-cors-domains = $${slap-parameter:monitor-cors-domains}
+monitor-httpd-port = $${instance-parameter:configuration.monitor-httpd-port}
+cors-domains = $${instance-parameter:configuration.monitor-cors-domains}
 username = $${slap-parameter:monitor-username}
 password = $${slap-parameter:monitor-password}