caddy-frontend: Honor monitor variables from request

software/caddy-frontend/buildout.hash.cfg

@@ -19,7 +19,7 @@ md5sum = 906e5bd66b1265b8109a86b6ab46e91f
 
 [template-apache-frontend]
 filename = instance-apache-frontend.cfg
-md5sum = 91330ba52f166341f99a4a1a868e6e7f
+md5sum = 789ceeff575cbc74426317bd76b0b08d
 
 [template-apache-replicate]
 filename = instance-apache-replicate.cfg.in

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

@@ -123,6 +123,10 @@ 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
+configuration.monitor-username =
+configuration.monitor-password =
 
 [frontend-configuration]
 template-log-access = ${template-log-access:target}
@@ -615,20 +619,16 @@ 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}
 
 #######
 # Monitoring sections
 #
 
 [monitor-instance-parameter]
-monitor-httpd-port = $${slap-parameter:monitor-httpd-port}
-cors-domains = $${slap-parameter:monitor-cors-domains}
-username = $${slap-parameter:monitor-username}
-password = $${slap-parameter:monitor-password}
+monitor-httpd-port = $${instance-parameter:configuration.monitor-httpd-port}
+cors-domains = $${instance-parameter:configuration.monitor-cors-domains}
+username = $${instance-parameter:configuration.monitor-username}
+password = $${instance-parameter:configuration.monitor-password}
 
 [monitor-conf-parameters]
 private-path-list +=