software/seleniumrunner: Replace caddy with haproxy

software/seleniumserver/buildout.hash.cfg

@@ -19,4 +19,4 @@ md5sum = 10e19df182c692b71ea552da183a0bcf
 
 [template-selenium]
 filename = instance-selenium.cfg.in
-md5sum = 9b4742e8a249aef38c7c8c12d74b0605
+md5sum = 2d84d5fb9306b88ef71e101acb46f684

software/seleniumserver/instance-selenium.cfg.in

@@ -145,44 +145,74 @@ username = selenium
 bytes = 12
 
 
-[selenium-server-frontend-config]
-recipe = slapos.recipe.template
-output = $${directory:etc}/$${:_buildout_section_name_}
-inline =
-  https://[$${:ip}]:$${:port} {
-    bind $${:ip}
-    tls self_signed # TODO
-    proxy / $${selenium-server-hub-instance:base-url} {
-      transparent
-    }
-    basicauth $${selenium-server-admin-password:username} $${selenium-server-admin-password:passwd} {
-      realm "Grid Admin"
-      $${:path-admin}
-    }
-    basicauth $${selenium-server-selenium-password:username} $${selenium-server-selenium-password:passwd} {
-      realm "Selenium Server"
-      $${:path-hub}
-    }
-  }
+[selenium-server-frontnend-certificate]
+recipe = plone.recipe.command
+command =
+  if [ ! -e $${:cert-file} ]
+  then
+    ${openssl-output:openssl} req -x509 -nodes -days 3650 \
+      -subj "/C=AA/ST=X/L=X/O=Dis/CN=$${:common-name}" \
+      -newkey rsa:2048 -keyout $${:cert-file} \
+      -out $${:cert-file}
+  fi
+update-command = $${:command}
+cert-file = $${directory:var}/$${:_buildout_section_name_}.pem
+common-name = $${selenium-server-frontend-configuration:ip}
+location =
+  $${:cert-file}
+
+[selenium-server-frontend-configuration]
 ip = $${slap-configuration:ipv6-random}
 hostname = [$${:ip}]
 port = 9443
 path-admin = /grid/console
 path-hub = /wd/hub
+pidfile = $${directory:run}/haproxy.pid
 
+[selenium-server-frontend-config]
+recipe = slapos.recipe.template:jinja2
+url = ${stack-haproxy-default-backend-config:target}
+output = $${directory:etc}/$${:_buildout_section_name_}
+context =
+  key pidfile selenium-server-frontend-configuration:pidfile
+  key content :content
+
+content =
+  frontend app
+    log global
+    bind $${selenium-server-frontend-configuration:ip}:$${selenium-server-frontend-configuration:port} ssl crt $${selenium-server-frontnend-certificate:cert-file} alpn h2,http/1.1
+    use_backend hub if { path_beg $${selenium-server-frontend-configuration:path-hub} }
+    use_backend admin if { path_beg $${selenium-server-frontend-configuration:path-admin} }
+
+  userlist hub
+    user $${selenium-server-selenium-password:username} insecure-password $${selenium-server-selenium-password:passwd}
+  backend hub
+    acl auth_ok http_auth(hub)
+    http-request auth realm "Selenium Server" unless auth_ok
+    server hub $${selenium-server-hub-instance:hostname}:$${selenium-server-hub-instance:port}
+
+  userlist admin
+    user $${selenium-server-admin-password:username} insecure-password $${selenium-server-admin-password:passwd}
+  backend admin
+    acl auth_ok http_auth(admin)
+    http-request auth realm "Grid Admin" unless auth_ok
+    server admin $${selenium-server-hub-instance:hostname}:$${selenium-server-hub-instance:port}
 
 [selenium-server-frontend-instance]
 recipe = slapos.cookbook:wrapper
 wrapper-path = $${directory:services}/$${:_buildout_section_name_}
 command-line =
-  ${caddy:output} -conf $${selenium-server-frontend-config:output}
+  ${haproxy:location}/sbin/haproxy -f $${selenium-server-frontend-config:output}
+hash-existing-files = $${buildout:directory}/software_release/buildout.cfg
+hash-files =
+  $${selenium-server-frontend-config:output}
 
-ip = $${selenium-server-frontend-config:ip}
-hostname = $${selenium-server-frontend-config:hostname}
-port = $${selenium-server-frontend-config:port}
+ip = $${selenium-server-frontend-configuration:ip}
+hostname = $${selenium-server-frontend-configuration:hostname}
+port = $${selenium-server-frontend-configuration:port}
 
-admin-url = https://$${selenium-server-admin-password:username}:$${selenium-server-admin-password:passwd}@$${:hostname}:$${:port}$${selenium-server-frontend-config:path-admin}
-url = https://$${selenium-server-selenium-password:username}:$${selenium-server-selenium-password:passwd}@$${:hostname}:$${:port}$${selenium-server-frontend-config:path-hub}
+admin-url = https://$${selenium-server-admin-password:username}:$${selenium-server-admin-password:passwd}@$${:hostname}:$${:port}$${selenium-server-frontend-configuration:path-admin}
+url = https://$${selenium-server-selenium-password:username}:$${selenium-server-selenium-password:passwd}@$${:hostname}:$${:port}$${selenium-server-frontend-configuration:path-hub}
 
 
 [userinfo]

software/seleniumserver/software.cfg

@@ -10,11 +10,11 @@ extends =
    ../../component/chromedriver/buildout.cfg
    ../../component/coreutils/buildout.cfg
    ../../component/java/buildout.cfg
-   ../../component/caddy/buildout.cfg
    ../../component/openssh/buildout.cfg
    ../../component/fonts/buildout.cfg
    ../../component/fontconfig/buildout.cfg
    ../../stack/slapos.cfg
+   ../../stack/haproxy/default-backend.cfg
    ./buildout.hash.cfg
    ../../stack/monitor/buildout.cfg