Switching frontend to mandatory request

software/davstorage/common.cfg

@@ -76,7 +76,7 @@ mode = 0644
 [instance-davstorage]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-davstorage.cfg
-md5sum = b60ef53023921a2e6d072e31b52f555e
+md5sum = 699ecf4678386667f58a3391bab7af0f
 output = ${buildout:directory}/template-davstorage.cfg
 mode = 0644
 

software/davstorage/instance-davstorage.cfg

@@ -16,8 +16,8 @@ offline = true
 
 [publish-connection-informations]
 recipe = slapos.cookbook:publish
-webdav_access = $${request-frontend:connection-site_url}
-url = $${request-frontend-ajaxupload:connection-site_url}
+webdav_access = https://$${request-frontend:connection-domain}
+url = https://$${request-frontend-ajaxupload:connection-domain}
 webdav_user = $${davstorage:user}
 webdav_password = $${davstorage:password}
 
@@ -161,18 +161,19 @@ tmp-php = $${rootdirectory:tmp}/php
 # Request frontend
 [request-frontend-ajaxupload]
 <= slap-connection
-recipe = slapos.cookbook:requestoptional
+recipe = slapos.cookbook:request
 name = Frontend Ajax
 # 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
-config = url
+config = url https-only
+config-https-only = true
 config-url = https://[$${davstorage:ip}]:$${davstorage:port_ajax}/
-return = site_url
+return = domain
 
 [request-frontend]
 <= slap-connection
-recipe = slapos.cookbook:requestoptional
+recipe = slapos.cookbook:request
 name = Frontend Webdav
 # XXX We have hardcoded SR URL here.
 software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
@@ -180,7 +181,7 @@ slave = true
 config = url https-only
 config-https-only = true
 config-url = https://$${davstorage:user}:$${davstorage:password}@[$${davstorage:ip}]:$${davstorage:port_webdav}/
-return = site_url
+return = domain
 
 # XXX Vivien: promise not working for now
 #[frontend-ajaxupload-promise]