fixup! theia: include more fonts

software/theia/buildout.hash.cfg

@@ -15,7 +15,7 @@
 
 [instance]
 filename = instance.cfg.in
-md5sum = a92a80a92afcf3fab6c0c25a506b87cf
+md5sum = a5c23358b8435b516e9e78bd71b5b819
 
 [yarn.lock]
 filename = yarn.lock
@@ -27,4 +27,4 @@ md5sum = d2ce161244ce9ebce5295302a1b2a7df
 
 [preloadTemplate.html]
 filename = preloadTemplate.html
-md5sum = bee842f5b0761eba23fa012d0ef52a50
+md5sum = 8f5758f2e0ff7c4600c73ce54c9a70aa

software/theia/instance.cfg.in

@@ -54,7 +54,7 @@ template = inline:
     root $${directory:frontend-static}
     browse
     proxy / $${theia-instance:base-url} {
-      except public $${favicon.ico:filename}
+      except $${frontend-instance-fonts:folder-name} public $${favicon.ico:filename}
     }
     proxy /services $${theia-instance:base-url} {
       websocket
@@ -62,12 +62,6 @@ template = inline:
     proxy /file-upload $${theia-instance:base-url} {
       websocket
     }
-    fonts/source-code-pro/* {
-      root ${source-code-pro-fonts:location}
-    }
-    fonts/jetbrains-mono/* {
-      root ${jetbrains-mono-fonts:location}
-    }
     basicauth $${frontend-instance-password:username} $${frontend-instance-password:passwd} {
       realm "Theia"
       /
@@ -89,6 +83,16 @@ port = $${frontend-instance-config:port}
 pidfile = $${directory:pidfiles}/$${:_buildout_section_name_}.pid
 url = https://$${:hostname}:$${:port}/
 
+[frontend-instance-fonts]
+recipe = plone.recipe.command
+location = $${directory:frontend-static}/$${:folder-name}
+folder-name = fonts
+command =
+  mkdir $${:location}
+  ln -s ${source-code-pro-fonts:location} $${:location}/source-code-pro
+  ln -s ${jetbrains-mono-fonts:location} $${:location}/jetbrains-mono
+stop-on-error = true
+
 [frontend-reload]
 recipe = slapos.cookbook:wrapper
 wrapper-path = $${directory:services}/$${:_buildout_section_name_}

software/theia/software.cfg

@@ -199,8 +199,12 @@ template =
                       "gitlens.remotes": [{ "domain": "lab.nexedi.com", "type": "GitLab" }],
                       "java.home": "${java-jdk:location}"
                   }
-              },
-              "preloadTemplate": ${preloadTemplate.html:output}
+              }
+          },
+          "generator": {
+              "config": {
+                  "preloadTemplate": "${preloadTemplate.html:output}"
+              }
           }
       },
       "dependencies": {