cdn-me: Include checkers and request a distributed monitor.

software/cdn-me/instance-cdn-request.cfg.jinja2

 [buildout]
 parts =
-  request-re6stnet-token-slave
-  request-frontend-token-slave
+  request-monitor-test-distributor-slave 
+  publish-connection-informations
+  connection-parameter-http-checker
+  connection-parameter-checker
 
 eggs-directory = ${buildout:eggs-directory}
 develop-eggs-directory = ${buildout:develop-eggs-directory}
@@ -21,14 +23,15 @@ tmp = $${:home}/tmp/
 <= slap-connection
 recipe = slapos.cookbook:requestoptional
 name = WebSite Frontend
-# XXX We have hardcoded SR URL here.
 software-url = product.frontend
+software-type = custom-personal
 slave = true
-{% if slapparameter_dict.get('frontend-custom_domain', '80') != '443' %}
+
+{% if slapparameter_dict.get('port', '80') != '443' %}
 config-url = https://[$${request-re6stnet-token-slave:connection-ipv6}1]:{{ slapparameter_dict.get('port', '80') }}/
 {% endif -%}
 
-{% if slapparameter_dict.get('frontend-custom_domain', '80') == '443' %}
+{% if slapparameter_dict.get('port', '80') == '443' %}
 config-url = https://[$${request-re6stnet-token-slave:connection-ipv6}1]:{{ slapparameter_dict.get('port', '443') }}/
 {% endif -%}
 
@@ -96,7 +99,6 @@ config-prefer-gzip-encoding-to-backend = {{ slapparameter_dict.get('frontend-pre
 config-disabled-cookie-list = {{ slapparameter_dict.get('frontend-disabled-cookie-list', '') }}
 {% endif -%}
 
-
 return = site_url domain
 
 [request-re6stnet-token-slave]
@@ -106,13 +108,53 @@ name = Re6st token Frontend
 # XXX We have hardcoded SR URL here.
 software-url = product.re6st
 slave = true
-return = token info_1 ipv6
+return = token info_1 ipv6 ipv4
+
+[request-monitor-test-distributor-slave]
+<= slap-connection
+recipe = slapos.cookbook:requestoptional
+name = Monitor Test
+# XXX We have hardcoded SR URL here.
+software-url = product.monitor
+software-type = distributor
+slave = true
+config-ping6_ip_list = $${request-re6stnet-token-slave:connection-ipv6}
+config-ping_ip_list = $${request-re6stnet-token-slave:connection-ipv4}
+
+return = site_url
+
+[monitor-frontend]
+<= slap-connection
+recipe = slapos.cookbook:requestoptional
+name = Monitor Frontend
+# XXX We have hardcoded SR URL here.
+software-url = product.frontend
+software-type = custom-personal
+slave = true
+config-url = $${request-monitor-slave:connection-site_url}
+config-domain = $${slap-parameter:frontend-domain}
+return = site_url domain
 
 [publish-connection-informations]
 recipe = slapos.cookbook:publish
-url =  https://$${request-frontend-token-slave:connection-domain}
+url-https =  https://$${request-frontend-token-slave:connection-domain}
+url = http://$${request-frontend-token-slave:connection-domain}
 token = $${request-re6stnet-token-slave:connection-token}
 ipv6 = $${request-re6stnet-token-slave:connection-ipv6}
+ipv4 = $${request-re6stnet-token-slave:connection-ipv4}
+monitor_v6_url = $${request-monitor-slave:connection-site_url}
+monitor_url = https://$${monitor-frontend:connection-domain}
 info_1 = $${request-re6stnet-token-slave:info_1}
 
+[connection-parameter-checker]
+recipe = slapos.cookbook:check_parameter
+path = $${directory:promise}/check_re6stnet_ipv6
+value = $${request-re6stnet-token-slave:connection-ipv6}
+not-expected = ::
+
+[connection-parameter-http-checker]
+recipe = slapos.cookbook:check_parameter
+path = $${directory:promise}/check_re6stnet_http
+value = $${publish-connection-informations:url}
+not-expected = http://
 

software/cdn-me/software.cfg

@@ -21,12 +21,9 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-cdn-request.cfg.jinja2
 output = ${buildout:directory}/template-cdn-request.cfg.jinja2
-md5sum = b450c721194eb0834e3738158195975a
+md5sum = c16d7cd16bb8ef77f4a19b94b4253277 
 mode = 0644
 
-[slapos.cookbook-repository]
-branch = request.product
-
 [eggs]
 recipe = zc.recipe.egg
 eggs =