remove old trigger command

it has been deprecated for a while now
deprecate custom css
2026-10-17 08:40:54 +00:00 · 2020-12-05 13:55:11 +13:00 · 2020-12-05 13:54:35 +13:00 · 2020-12-05 13:52:40 +13:00 · 2020-12-05 13:51:25 +13:00 · 2020-12-05 13:49:13 +13:00
48 changed files with 1866 additions and 1297 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 ###
-### Copyright 2015-2019 Oliver Giles
+### Copyright 2015-2020 Oliver Giles
 ###
 ### This file is part of Laminar
 ###
@@ -22,9 +22,22 @@ cmake_policy(SET CMP0058 NEW)

 set(CMAKE_INCLUDE_CURRENT_DIR ON)

-add_definitions("-std=c++14 -Wall -Wextra -Wno-unused-parameter -Wno-sign-compare")
+add_definitions("-std=c++17 -Wall -Wextra -Wno-unused-parameter -Wno-sign-compare")
 set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Werror -DDEBUG")

+# Allow passing in the version string, for e.g. patched/packaged versions
+if(NOT LAMINAR_VERSION AND EXISTS ${CMAKE_SOURCE_DIR}/.git)
+    execute_process(COMMAND git describe --tags --abbrev=8 --dirty
+        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+        OUTPUT_VARIABLE LAMINAR_VERSION
+        OUTPUT_STRIP_TRAILING_WHITESPACE)
+endif()
+if(NOT LAMINAR_VERSION)
+    set(LAMINAR_VERSION xx-unversioned)
+endif()
+set_source_files_properties(src/version.cpp PROPERTIES COMPILE_DEFINITIONS
+	LAMINAR_VERSION=${LAMINAR_VERSION})
+
 # This macro takes a list of files, gzips them and converts the output into
 # object files so they can be linked directly into the application.
 # ld generates symbols based on the string argument given to its executable,
@@ -62,7 +75,7 @@ add_custom_command(OUTPUT laminar.capnp.c++ laminar.capnp.h

 # Zip and compile statically served resources
 generate_compressed_bins(${CMAKE_SOURCE_DIR}/src/resources index.html js/app.js
-    favicon.ico favicon-152.png icon.png)
+    style.css manifest.webmanifest favicon.ico favicon-152.png icon.png)

 # The code that allows dynamic modifying of index.html requires knowing its original size
 add_custom_command(OUTPUT index_html_size.h
@@ -70,19 +83,17 @@ add_custom_command(OUTPUT index_html_size.h
    DEPENDS src/resources/index.html)

 # Download 3rd-party frontend JS libs...
-file(DOWNLOAD https://cdnjs.cloudflare.com/ajax/libs/vue/2.3.4/vue.min.js
-        js/vue.min.js EXPECTED_MD5 ae2fca1cfa0e31377819b1b0ffef704c)
-file(DOWNLOAD https://cdnjs.cloudflare.com/ajax/libs/vue-router/2.7.0/vue-router.min.js
-        js/vue-router.min.js EXPECTED_MD5 5d3e35710dbe02de78c39e3e439b8d4e)
+file(DOWNLOAD https://cdnjs.cloudflare.com/ajax/libs/vue/2.6.12/vue.min.js
+	js/vue.min.js EXPECTED_MD5 fb192338844efe86ec759a40152fcb8e)
+file(DOWNLOAD https://cdnjs.cloudflare.com/ajax/libs/vue-router/3.4.8/vue-router.min.js
+	js/vue-router.min.js EXPECTED_MD5 5f51d4dbbf68fd6725956a5a2b865f3b)
 file(DOWNLOAD https://raw.githubusercontent.com/drudru/ansi_up/v1.3.0/ansi_up.js
        js/ansi_up.js EXPECTED_MD5 158566dc1ff8f2804de972f7e841e2f6)
 file(DOWNLOAD https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.7.2/Chart.min.js
        js/Chart.min.js EXPECTED_MD5 f6c8efa65711e0cbbc99ba72997ecd0e)
-file(DOWNLOAD https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css
-        css/bootstrap.min.css EXPECTED_MD5 5d5357cb3704e1f43a1f5bfed2aebf42)
 # ...and compile them
 generate_compressed_bins(${CMAKE_BINARY_DIR} js/vue-router.min.js js/vue.min.js
-    js/ansi_up.js js/Chart.min.js css/bootstrap.min.css)
+    js/ansi_up.js js/Chart.min.js)
 # (see resources.cpp where these are fetched)

 set(LAMINARD_CORE_SOURCES
@@ -95,6 +106,7 @@ set(LAMINARD_CORE_SOURCES
    src/rpc.cpp
    src/run.cpp
    src/server.cpp
+    src/version.cpp
    laminar.capnp.c++
    index_html_size.h
 )
@@ -104,9 +116,22 @@ add_executable(laminard ${LAMINARD_CORE_SOURCES} src/main.cpp ${COMPRESSED_BINS}
 target_link_libraries(laminard capnp-rpc capnp kj-http kj-async kj pthread sqlite3 z)

 ## Client
-add_executable(laminarc src/client.cpp laminar.capnp.c++)
+add_executable(laminarc src/client.cpp src/version.cpp laminar.capnp.c++)
 target_link_libraries(laminarc capnp-rpc capnp kj-async kj pthread)

+## Manpages
+macro(gzip SOURCE)
+    get_filename_component(OUT_FILE ${SOURCE} NAME)
+    add_custom_command(OUTPUT ${OUT_FILE}.gz
+        COMMAND gzip < ${CMAKE_CURRENT_SOURCE_DIR}/${SOURCE} > ${OUT_FILE}.gz
+        DEPENDS ${SOURCE})
+endmacro()
+add_custom_target(laminar-manpages ALL DEPENDS laminard.8.gz laminarc.1.gz)
+gzip(etc/laminard.8)
+gzip(etc/laminarc.1)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/laminard.8.gz DESTINATION share/man/man8)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/laminarc.1.gz DESTINATION share/man/man1)
+
 ## Tests
 set(BUILD_TESTS FALSE CACHE BOOL "Build tests")
 if(BUILD_TESTS)
@@ -116,12 +141,14 @@ if(BUILD_TESTS)
    target_link_libraries(laminar-tests ${GTEST_LIBRARY} capnp-rpc capnp kj-http kj-async kj pthread sqlite3 z)
 endif()

-set(SYSTEMD_UNITDIR lib/systemd/system CACHE PATH "Path to systemd unit files")
-set(BASH_COMPLETIONS_DIR usr/share/bash-completion/completions CACHE PATH "Path to bash completions directory")
-set(ZSH_COMPLETIONS_DIR usr/share/zsh/site-functions CACHE PATH "Path to zsh completions directory")
-install(TARGETS laminard RUNTIME DESTINATION usr/sbin)
-install(TARGETS laminarc RUNTIME DESTINATION usr/bin)
-install(FILES etc/laminar.service DESTINATION ${SYSTEMD_UNITDIR})
-install(FILES etc/laminar.conf DESTINATION etc)
+set(SYSTEMD_UNITDIR /lib/systemd/system CACHE PATH "Path to systemd unit files")
+set(BASH_COMPLETIONS_DIR /usr/share/bash-completion/completions CACHE PATH "Path to bash completions directory")
+set(ZSH_COMPLETIONS_DIR /usr/share/zsh/site-functions CACHE PATH "Path to zsh completions directory")
+install(TARGETS laminard RUNTIME DESTINATION sbin)
+install(TARGETS laminarc RUNTIME DESTINATION bin)
+install(FILES etc/laminar.conf DESTINATION /etc)
 install(FILES etc/laminarc-completion.bash DESTINATION ${BASH_COMPLETIONS_DIR} RENAME laminarc)
 install(FILES etc/laminarc-completion.zsh DESTINATION ${ZSH_COMPLETIONS_DIR} RENAME _laminarc)
+
+configure_file(etc/laminar.service.in laminar.service @ONLY)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/laminar.service DESTINATION ${SYSTEMD_UNITDIR})
--- a/README.md
+++ b/README.md
@@ -24,8 +24,9 @@ Then compile and install laminar with:
 ```bash
 git clone https://github.com/ohwgiles/laminar.git
 cd laminar
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr
 make -j4
+# Warning: the following will overwrite an existing /etc/laminar.conf
 sudo make install
 ```

@@ -37,4 +38,4 @@ The `pkg` directory contains shell scripts which use docker to build native pack

 ## Contributing

-Issues and pull requests via GitHub are most welcome. All pull requests must adhere to the [Developer Certificate of Origin](https://developercertificate.org/).
+Issues and pull requests via GitHub are most welcome. All pull requests must adhere to the [Developer Certificate of Origin](https://developercertificate.org/).
--- a/UserManual.md
+++ b/UserManual.md
@@ -52,15 +52,17 @@ You can build an image that runs `laminard` by default, and contains `laminarc`
 docker build [-t image:tag] -f docker/Dockerfile .
 ```

-Keep in mind that this is meant to be used as a base image to build from, so it contains only the minimum packages required to run laminar. The only shell available by default is sh and it does not even have ssh or git. You can use this image to run a basic build server, but it is recommended that you build a custom image from this base to better suit your needs.
+Keep in mind that this is meant to be used as a base image to build from, so it contains only the minimum packages required to run laminar. The only shell available by default is sh (so scripts with `#!/bin/bash` will fail to execute) and it does not have `ssh` or `git`. You can use this image to run a basic build server, but it is recommended that you build a custom image from this base to better suit your needs.

-The container will execute `laminard` by default. To start a laminar server with docker you can simply run the image as a daemon.
+The container will execute `laminard` by default. To start a laminar server with docker you can simply run the image as a daemon, for example:

 ```bash
-docker run -d --name laminar_server -p 8080:8080 [-v laminardir|laminar.conf] laminar:latest
+docker run -d --name laminar_server -p 8080:8080 -v path/to/laminardir:/var/lib/laminar --env-file path/to/laminar.conf laminar:latest
 ```

-You can customize laminar and persist your data by mounting your laminar directory to `/var/lib/laminar` and/or mounting a custom configuration file to `/etc/laminar.conf`.
+The [`-v` flag](https://docs.docker.com/storage/volumes/#choose-the--v-or---mount-flag) is necessary to persist job scripts and artefacts beyond the container lifetime.
+
+The [`--env-file` flag](https://docs.docker.com/engine/reference/commandline/run/#set-environment-variables--e---env---env-file) is necessary to pass configuration from `laminar.conf` to `laminard` because `laminard` does not read `/etc/laminar.conf` directly but expects variables within to be exported by `systemd` or other process supervisor.

 Executing `laminarc` may be done in any of the usual ways, for example:

@@ -127,30 +129,30 @@ chmod +x /var/lib/laminar/cfg/jobs/hello.run

 # Triggering a run

-When triggering a run, the job is first added to a queue of upcoming tasks. If the server is busy, the job may wait in this queue for a while. It will only be assigned a job number when it leaves this queue and starts executing. The job number may be useful to the client that triggers the run, so there are a few ways to trigger a run.
-
-To add the `hello` job to the queue ("fire-and-forget"), execute
+To queue execution of the `hello` job, run

 ```bash
 laminarc queue hello
 ```

-In this case, laminarc returns immediately, with its error code indicating whether adding the job to the queue was sucessful.
+In this case, `laminarc` returns immediately, with its error code indicating whether adding the job to the queue was sucessful. The run number will be printed to standard output.

-To queue the job and wait until it leaves the queue and starts executing, use
+If the server is busy, a run may wait in the queue for some time. To have `laminarc` instead block until the run leaves the queue and starts executing, use

 ```bash
 laminarc start hello
 ```

-In this case, laminarc blocks until the job starts executing, or returns immediately if queueing failed. The run number will be printed to standard output.
+In this case, `laminarc` blocks until the job starts executing, or returns immediately if queueing failed. The run number will be printed to standard output.

-To launch and run the `hello` job to completion, execute
+Finally, to launch and run the `hello` job to completion, execute

 ```bash
 laminarc run hello
 ```

+In this case, laminarc's return value indicates whether the run completed successfully.
+
 In all cases, a started run means the `/var/lib/laminar/cfg/jobs/hello.run` script will be executed, with a working directory of `/var/lib/laminar/run/hello/1` (or current run number)

 The result and log output should be visible in the Web UI at http://localhost:8080/jobs/hello/1
@@ -373,6 +375,8 @@ author_email=$(git show -s --format='%ae' $rev)
 laminarc set RECIPIENTS $author_email
 ```

+See [notify-email-pretty.sh](https://github.com/ohwgiles/laminar/blob/master/examples/notify-email-pretty.sh) and [notify-email-text-log.sh](https://github.com/ohwgiles/laminar/blob/master/examples/notify-email-text-log.sh).
+
 ---

 # Helper scripts
@@ -502,13 +506,23 @@ EXECUTORS=1

 ## Associating a job with a context

-When trying to start a job, laminar will wait until the job can be matched to a context which has at least one free executor. You can define which contexts the job will associate with by setting, for example,
+When trying to start a job, laminar will wait until the job can be matched to a context which has at least one free executor. There are two ways to associate jobs and contexts. You can specify a comma-separated list of patterns `JOBS` in the context configuration file `/var/lib/laminar/cfg/contexts/CONTEXT.conf`:
+
+```
+JOBS=amd64-target-*,usage-monitor
+```
+
+This approach is often preferred when you have many jobs that need to share limited resources.
+
+Alternatively, you can set

 ```
 CONTEXTS=my-env-*,special_context
 ```

-in `/var/lib/laminar/cfg/jobs/JOB.conf`. For each of the patterns in the comma-separated list `CONTEXTS`, Laminar will iterate over the known contexts and associate the run with the first context with free executors. Patterns are [glob expressions](http://man7.org/linux/man-pages/man7/glob.7.html).
+in `/var/lib/laminar/cfg/jobs/JOB.conf`. This approach is often preferred when you have a small number of jobs that require exclusive access to an environment and you can supply alternative environments (e.g. target devices), because new contexts can be added without modifying the job configuration.
+
+In both cases, Laminar will iterate over the known contexts and associate the run with the first matching context with free executors. Patterns are [glob expressions](http://man7.org/linux/man-pages/man7/glob.7.html).

 If `CONTEXTS` is empty or absent (or if `JOB.conf` doesn't exist), laminar will behave as if `CONTEXTS=default` were defined.

@@ -521,7 +535,7 @@ DUT_IP=192.168.3.2
 FOO=bar
 ```

-This environment will then be available the run script of jobs associated with this context.
+This environment will then be available the run script of jobs associated with this context. Note that these definitions are not expanded by a shell, so `FOO="bar"` would result in a variable `FOO` whose contents *include* double-quotes.

 ---

@@ -616,11 +630,11 @@ DESCRIPTION=Anything here will appear on the job page in the frontend <em>unesca

 Change `LAMINAR_TITLE` in `/etc/laminar.conf` to your preferred page title. Laminar must be restarted for this change to take effect.

-## Custom stylesheet
+## Custom HTML template

-If it exists, the file `/var/lib/laminar/custom/style.css` will be served by laminar and may be used to change the appearance of Laminar's WebUI.
+If it exists, the file `/var/lib/laminar/custom/index.html` will be served by laminar instead of the default markup that is bundled into the Laminar binary. This file can be used to change any aspect of Laminar's WebUI, for example adding menu links or adding a custom stylesheet. Any required assets will need to be served directly from your [HTTP reverse proxy](#Service-configuration) or other HTTP server.

-This directory is also a good place to add any extra assets needed for this customization, but note that in this case you will need to serve this directory directly from your [HTTP reverse proxy](#Service-configuration) (highly recommended).
+An example customization can be found at [cweagans/semantic-laminar-theme](https://github.com/cweagans/semantic-laminar-theme).

 ---

@@ -680,6 +694,8 @@ Laminar will also export variables in the form `KEY=VALUE` found in these files:
 - `contexts/$CONTEXT.env`
 - `jobs/$JOB.env`

+Note that definitions in these files are not expanded by a shell, so `FOO="bar"` would result in a variable `FOO` whose contents *include* double-quotes.
+
 Finally, variables supplied on the command-line call to `laminarc queue`, `laminarc start` or `laminarc run` will be available. See [parameterized runs](#Parameterized-runs)

 ## laminarc
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -28,7 +28,7 @@ RUN apk add --no-cache --virtual .build -X http://dl-3.alpinelinux.org/alpine/ed
        zlib-dev \
        rapidjson-dev && \
    cd /build/laminar && \
-    cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/ && \
+    cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr && \
    make -j4 && \
    make install && \
    apk del .build && \
--- a/etc/laminar.service.in
+++ b/etc/laminar.service.in
@@ -5,7 +5,7 @@ After=network.target
 [Service]
 User=laminar
 EnvironmentFile=-/etc/laminar.conf
-ExecStart=/usr/sbin/laminard
+ExecStart=@CMAKE_INSTALL_PREFIX@/sbin/laminard

 [Install]
 WantedBy=multi-user.target
--- a/etc/laminarc.1
+++ b/etc/laminarc.1
@@ -0,0 +1,71 @@
+.Dd Apr 04, 2019
+.Dt LAMINARC 1
+.Sh NAME
+.Nm laminarc
+\-
+Laminar CI client application
+.Sh SYNOPSIS
+.Nm laminarc Li queue \fIJOB\fR [\fIPARAM=VALUE...\fR] ...
+.Nm laminarc Li queue \fIJOB\fR [\fIPARAM=VALUE...\fR] ...
+.Nm laminarc Li queue \fIJOB\fR [\fIPARAM=VALUE...\fR] ...
+.Nm laminarc Li set \fIPARAM=VALUE...\fR
+.Nm laminarc Li show-jobs
+.Nm laminarc Li show-running
+.Nm laminarc Li show-queued
+.Nm laminarc Li abort \fIJOB\fR \fINUMBER\fR
+.Sh DESCRIPTION
+The
+.Nm laminarc
+program connects to a Laminar server and perform one of following operations:
+.Bl -tag
+.It Sy queue
+adds job(s) (with optional parameters) to the queue and returns immediately.
+.It Sy start
+adds job(s) (with optional parameters) to the queue and returns when the jobs
+begin execution.
+.It Sy run
+adds job(s) (with optional parameters) to the queue and returns when the jobs
+complete execution. The exit code will be non-zero if any of the runs does
+not complete successfully.
+.It Sy set
+sets one or more parameters to be exported as environment variables in subsequent
+scripts for the run identified by the $JOB and $RUN environment variables.
+This is primarily intended for use from within a job execution, where those
+variables are already set by the server.
+.It Sy show-jobs
+list jobs known to the server.
+.It Sy show-running
+list the currently running jobs with their numbers.
+.It Sy show-queued
+list the names and numbers of the jobs waiting in the queue.
+.It Sy abort
+manually abort a currently running job by name and number.
+.El
+.Pp
+The laminar server to connect to is read from the
+.Ev LAMINAR_HOST
+environment variable. If empty, it falls back to
+.Ev LAMINAR_BIND_RPC
+and finally defaults to
+.Ad
+unix-abstract:laminar.
+.Sh ENVIRONMENT
+.Bl -tag
+.It Ev LAMINAR_HOST
+address of server to connect. May be of the form
+.Ad IP:PORT,
+.Ad unix:PATH/TO/SOCKET or
+.Ad unix-abstract:NAME
+.It Ev LAMINAR_BIND_RPC
+fallback server address variable. It is set by
+.Nm laminard
+during execution of scripts.
+.El
+.Sh SEE ALSO
+.Xr laminard 8
+.Sh AUTHORS
+.An Oliver Giles
+created Laminar CI.
+.An Dmitry Bogatov
+created this manual page for the Debian project (but it can be used
+by others).
--- a/etc/laminard.8
+++ b/etc/laminard.8
@@ -0,0 +1,56 @@
+.Dd Apr 03, 2019
+.Dt LAMINARD 1
+.Sh NAME
+.Nm laminard
+\-
+Laminar CI server
+.Sh SYNOPSIS
+.Nm laminard Op Fl v
+.Sh DESCRIPTION
+Start Laminar CI server in the foreground. If option
+.Fl v
+is specified, verbose logging is enabled. Other aspects of
+operation are controlled by environment variables.
+.Sh ENVIRONMENT
+.Bl -tag
+.It Ev LAMINAR_HOME
+Root location containing laminar configuration, database, build
+workspaces and archive.
+.Pp
+Default: /var/lib/laminar
+.It Ev LAMINAR_BIND_HTTP
+Interface on which laminard will bind to serve the Web UI.
+May be of the form IP:PORT, unix:PATH/TO/SOCKET or unix-abstract:NAME
+.Pp
+Default: *:8080
+.It Ev LAMINAR_BIND_HRPC
+Interface on which laminard will bind to accept RPC from laminarc.
+May be of the form IP:PORT, unix:PATH/TO/SOCKET or unix-abstract:NAME
+.Pp
+Default: unix-abstract:laminar
+.It Ev LAMINAR_TITLE
+Page title to show in web frontend
+.It Ev LAMINAR_KEEP_RUNDIRS
+Setting this prevents the immediate deletion of job rundirs
+$LAMINAR_HOME/run/$JOB/$RUN. Value should be an integer represeting
+the number of rundirs to keep.
+.Pp
+Default: 0
+.It Ev LAMINAR_ARCHIVE_URL
+Base url used to request artifacts. Laminar can serve build artifacts
+(and it will if you leave this unset), but it uses a very naive and
+inefficient method. Best to let a real webserver handle serving those
+requests.
+.El
+.Sh FILES
+.Bl -tag
+.It Pa /etc/laminar.conf
+Variable assignments in this file are exported by systemd or other
+init system before launching the system-wide installation of Laminar.
+.El
+.Sh AUTHORS
+.An Oliver Giles
+created Laminar CI.
+.An Dmitry Bogatov
+created this manual page for Debian project (but it can be used
+by others).
--- a/example-scripts/format-test-results
+++ b/example-scripts/format-test-results
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-cat <<EOF
-<!doctype html>
-<head>
-<meta charset="utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-<meta name="viewport" content="width=device-width, initial-scale=1">
-<title>Laminar</title>
-<link href="/css/bootstrap.min.css" rel="stylesheet">
-</head>
-<body>
-<div class="col-xs-12">
-<h2>Test report for $lJobName #$lBuildNum</h2>
-EOF
-xsltproc "$(dirname ${BASH_SOURCE[0]})/testreport.xsl" "$1";
-cat <<EOF
-</div>
-</body>
-</html>
-EOF
--- a/example-scripts/junit-bs-style.xsl
+++ b/example-scripts/junit-bs-style.xsl
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-<xsl:output method="html" indent="no"/>
-<xsl:template match="testsuite">
-<h3>Test Suite: <xsl:value-of select="@name" /></h3>
-<dl class="dl-horizontal">
- <dt>Tests run:</dt><dd><xsl:value-of select="@tests" /></dd>
- <dt>Failures:</dt><dd><xsl:value-of select="@failures" /></dd>
- <dt>Errors:</dt><dd><xsl:value-of select="@errors" /></dd>
- <dt>Elapsed time:</dt><dd><xsl:value-of select="@time" /></dd>
-</dl>
-<ul class="list-group">
-<xsl:apply-templates select="testcase" />
-</ul>
-<xsl:apply-templates select="system-out" />
-<xsl:apply-templates select="system-err" />
-</xsl:template>
-
-<xsl:template match="testcase">
-<xsl:choose>
- <xsl:when test="*">
-  <li class="list-group-item list-group-item-danger"><xsl:value-of select="@name" />
-   <xsl:apply-templates select="failure" />
-  </li>
- </xsl:when>
- <xsl:otherwise>
-  <li class="list-group-item list-group-item-success"><xsl:value-of select="@name" /></li>
- </xsl:otherwise>
-</xsl:choose>
-</xsl:template>
-
-<xsl:template match="failure">
-<pre>
-<xsl:value-of select="@message"/>
-</pre>
-</xsl:template>
-
-<xsl:template match="system-out"><h5>Standard output:</h5><pre><xsl:value-of select="." /></pre></xsl:template>
-<xsl:template match="system-err"><h5>Standard error:</h5><pre><xsl:value-of select="." /></pre></xsl:template>
-
-</xsl:stylesheet>
-
--- a/examples/format-test-results
+++ b/examples/format-test-results
@@ -0,0 +1,117 @@
+#!/bin/bash
+
+# This example script takes the XML output of a gtest run and formats
+# it as HTML. It can easily be adapted to other XML test output formats
+# such as JUnit or CTest
+
+# Prepare xml with ./path/to/test --gtest_output=xml:path/to/output.xml
+
+# Usage: format-test-results test_result.xml > output.html
+
+if [ ! -f "$1" ]; then
+  echo "File not found: \"$1\""
+  exit 1
+fi
+
+xsltproc --stringparam JOB $JOB --stringparam RUN $RUN <(cat <<\EOF
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:output method="html" indent="yes" />
+
+<xsl:template match="/">
+<html>
+ <head>
+  <meta charset="utf-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1" />
+  <title>Test report for <xsl:value-of select="$JOB" /> #<xsl:value-of select="$RUN" /></title>
+  <style>
+   body { font-family: Helvetica Neue, Helvetica, Arial, sans-serif; }
+   label:hover { cursor: pointer; }
+   label:before { content: '+ ' }
+   input[type=checkbox].toggle-collapse { display: none; }
+   input[type=checkbox].toggle-collapse~.collapsible { display: none; }
+   input[type=checkbox].toggle-collapse:checked~.collapsible { display: block; }
+   code { white-space: pre-wrap; color: white; }
+   .failure { background-color: #c73030; color: white; }
+   table { min-width: 720px; border-collapse: collapse; }
+   td, th { padding: 5px; }
+   tr:nth-child(even) td { padding: 0; }
+   tr:nth-child(even) { border-bottom: 1px solid #b3abab; }
+   .testcase { padding: 5px; }
+   .testcase.success:before { content: '✔ '; color: green; }
+  </style>
+ </head>
+ <body>
+  <h1><xsl:value-of select="$JOB" /> #<xsl:value-of select="$RUN" /></h1>
+  <h2>Test Report</h2>
+  <table>
+   <thead>
+    <tr>
+     <th>Suite</th>
+     <th>Tests run</th>
+     <th>Failures</th>
+     <th>Errors</th>
+     <th>Elapsed time</th>
+    </tr>
+   </thead>
+  <xsl:apply-templates select="testsuites" />
+  </table>
+ </body>
+</html>
+</xsl:template>
+
+<xsl:template match="testsuite">
+<xsl:variable name="result">
+ <xsl:choose>
+  <xsl:when test="(@failures &gt; 0) or (@errors &gt; 0)">failure</xsl:when>
+  <xsl:otherwise>success</xsl:otherwise>
+ </xsl:choose>
+</xsl:variable>
+<tr class="{$result}">
+ <td>
+  <label for="suite-{@name}"><xsl:value-of select="@name" /></label>
+ </td>
+ <td><xsl:value-of select="@tests" /></td>
+ <td><xsl:value-of select="@failures" /></td>
+ <td><xsl:value-of select="@errors" /></td>
+ <td><xsl:value-of select="@time" /></td>
+</tr>
+<tr class="toggle-target">
+ <td colspan="5">
+  <input class="toggle-collapse" id="suite-{@name}" type="checkbox" />
+  <div class="collapsible" style="padding-left: 15px;">
+   <xsl:apply-templates select="testcase" />
+  </div>
+ </td>
+</tr>
+</xsl:template>
+
+<xsl:template match="testcase">
+<xsl:choose>
+ <!-- has child nodes? -->
+ <xsl:when test="*">
+  <div class="testcase failure">
+   <xsl:value-of select="@name" /><br />
+   <xsl:apply-templates select="failure" />
+  </div>
+ </xsl:when>
+ <xsl:otherwise>
+  <div class="testcase success">
+   <xsl:value-of select="@name" />
+  </div>
+ </xsl:otherwise>
+</xsl:choose>
+</xsl:template>
+
+<xsl:template match="failure">
+<div style="padding: 5px; background-color: #313235">
+ <code>
+  <xsl:value-of select="@message"/>
+ </code>
+</div>
+</xsl:template>
+
+</xsl:stylesheet>
+
+EOF
+) "$1"
--- a/examples/notify-email-pretty.sh
+++ b/examples/notify-email-pretty.sh
@@ -0,0 +1,55 @@
+#!/bin/bash -e
+
+# IMPORTANT: change these to appropriate values, or fetch them, for example
+# from the environment or from $(git show -s --format='%ae' $rev)
+TO_EMAIL=engineering@example.com
+FROM_EMAIL=laminar@example.com
+
+LAMINAR_URL=${LAMINAR_BASE_URL:-http://localhost:8080}
+LAMINAR_TITLE=${LAMINAR_TITLE:-Laminar CI}
+
+if [[ $RESULT = "success" ]]; then
+ SVGICON=$(cat <<-EOF
+	<svg viewBox="0 0 100 100" width="24px">
+	<path fill="#74af77" d="m 23,46 c -6,0 -17,3 -17,11 0,8 9,30 12,32 3,2 14,5 20,-2 6,-6 24,-36
+	                          56,-71 5,-3 -9,-8 -23,-2 -13,6 -33,42 -41,47 -6,-3 -5,-12 -8,-15 z" />
+	</svg>
+	EOF
+ )
+else
+ SVGICON=$(cat <<-EOF
+	<svg viewBox="0 0 100 100" width="24px">
+	<path fill="#883d3d" d="m 19,20 c 2,8 12,29 15,32 -5,5 -18,21 -21,26 2,3 8,15 11,18 4,-6 17,-21
+	           21,-26 5,5 11,15 15,20 8,-2 15,-9 20,-15 -3,-3 -17,-18 -20,-24 3,-5 23,-26 30,-33 -3,-5 -8,-9
+	           -12,-12 -6,5 -26,26 -29,30 -6,-8 -11,-15 -15,-23 -3,0 -12,5 -15,7 z" />
+	</svg>
+	EOF
+ )
+fi
+
+sendmail -t <<EOF
+From: $FROM_EMAIL
+To: $TO_EMAIL
+Subject: $JOB #$RUN: $RESULT
+Mime-Version: 1.0
+Content-Type: text/html; charset=utf-8
+
+<html lang="en">
+ <body bgcolor="#efefef" style="margin: 0; font-family: Helvetica Neue, Helvetica, Arial, sans-serif">
+  <table width="100%" border="0" cellspacing="0" cellpadding="0">
+   <tr><td align="center">
+    <table border="0" cellspacing="0" cellpadding="15" bgcolor="#ffffff">
+     <tr bgcolor="#2f3340">
+      <td style="font-size: 28px; color: #ffffff;">$LAMINAR_TITLE</td></tr>
+     <tr>
+      <td style="font-size: 26px">
+       $SVGICON
+       <a href="$LAMINAR_URL/jobs/$JOB/$RUN">$JOB #$RUN</a>
+      </td>
+     </tr>
+    </table>
+   </td></tr>
+  </table>
+ </body>
+</html>
+EOF
--- a/examples/notify-email-text-log.sh
+++ b/examples/notify-email-text-log.sh
@@ -0,0 +1,18 @@
+#!/bin/bash -e
+
+# IMPORTANT: change these to appropriate values, or fetch them, for example
+# from the environment or from $(git show -s --format='%ae' $rev)
+TO_EMAIL=engineering@example.com
+FROM_EMAIL=laminar@example.com
+
+LAMINAR_URL=${LAMINAR_BASE_URL:-http://localhost:8080}
+
+sendmail -t <<EOF
+From: $FROM_EMAIL
+To: $TO_EMAIL
+Subject: $JOB #$RUN: $RESULT
+Mime-Version: 1.0
+Content-Type: text/plain; charset=utf-8
+
+$(curl -s $LAMINAR_URL/log/$JOB/$RUN)
+EOF
--- a/examples/notify-telegram.sh
+++ b/examples/notify-telegram.sh
@@ -0,0 +1,18 @@
+#!/bin/bash -e
+
+# Sends a message from a specified bot to a specific telegram chat ID.
+# See https://core.telegram.org/bots
+
+# IMPORTANT: modify this to your real bot token and chat ID
+BOT_TOKEN=123456:ABC-DEF1234ghIkl-zyx57W2v1u123ew11
+CHAT_ID=10000000
+
+LAMINAR_URL=${LAMINAR_BASE_URL:-http://localhost:8080}
+
+[[ $(curl -sS https://api.telegram.org/bot$BOT_TOKEN/sendMessage \
+	-d chat_id=$CHAT_ID \
+	-d parse_mode=HTML \
+	-d text="<a href=\"$LAMINAR_URL/jobs/$JOB/$RUN\">$JOB #$RUN</a> $RESULT" \
+	| jq .ok) == true ]]
+
+
--- a/examples/plot-build-time-dist
+++ b/examples/plot-build-time-dist
@@ -0,0 +1,46 @@
+#!/usr/bin/env gnuplot
+
+# Deeper insights can be obtained by querying Laminar's database directly.
+# This example uses gnuplot to create a graph of the distribution of the
+# average run time of jobs.
+
+# The following will output a png...
+set terminal pngcairo size 800,580 enhanced font 'Helvetica,10'
+set output 'build-time-distribution.png'
+# ..comment it out to use an interactive widget
+
+# plot style
+set tics font "Helvetica,10"
+set title font "Helvetica,11"
+set xtics nomirror
+set ytics nomirror
+set border 3 back lt 1 lc rgb "#808080"
+set grid back lt 0 lc rgb "#d0d0d0" lw 0.5
+set style line 1 lt 1 lc rgb "#7483af" lw 2
+
+# Fetch the path to Laminar's sqlite database
+db = system("echo $LAMINAR_HOME") . '/laminar.sqlite'
+
+# Label the axes
+set xtics ("<30s" 0, "30s-1m" 1, "1m-5m" 2, "5m-10m" 3, "10m-20m" 4, "20m-40m" 5, "40m-60m" 6, ">60m" 7)
+set ylabel "Number of jobs"
+set xlabel "Average run time"
+set title "Distribution of average run times"
+
+plot '< sqlite3 -separator $''\n'' ' . db . ' \
+  "WITH ba AS (SELECT name,AVG(completedAt-startedAt) a FROM builds GROUP BY name) SELECT \
+    COUNT(CASE WHEN               a <    30 THEN 1 END), \
+    COUNT(CASE WHEN a >=   30 AND a <    60 THEN 1 END), \
+    COUNT(CASE WHEN a >=   60 AND a <   300 THEN 1 END), \
+    COUNT(CASE WHEN a >=  300 AND a <   600 THEN 1 END), \
+    COUNT(CASE WHEN a >=  600 AND a <  1200 THEN 1 END), \
+    COUNT(CASE WHEN a >= 1200 AND a <  2400 THEN 1 END), \
+    COUNT(CASE WHEN a >= 2400 AND a <  3600 THEN 1 END), \
+    COUNT(CASE WHEN a >= 3600               THEN 1 END) FROM ba;"' \
+  using 0:1 with linespoints title '' ls 1
+
+# uncomment this if using an interactive window
+#pause mouse close
+
+# Release the output
+set output
--- a/pkg/centos7-x86_64.sh
+++ b/pkg/centos7-x86_64.sh
@@ -54,7 +54,7 @@ Lightweight Continuous Integration Service
 %prep

 %build
-cmake3 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/ -DSYSTEMD_UNITDIR=%{_unitdir} %{_sourcedir}/laminar-$VERSION
+cmake3 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DLAMINAR_VERSION=$VERSION -DSYSTEMD_UNITDIR=%{_unitdir} %{_sourcedir}/laminar-$VERSION
 pwd
 make

@@ -68,6 +68,8 @@ make
 %config(noreplace) %{_sysconfdir}/laminar.conf
 %{_datarootdir}/bash-completion/completions/laminarc
 %{_datarootdir}/zsh/site-functions/_laminarc
+%{_mandir}/man8/laminard.8.gz
+%{_mandir}/man1/laminarc.1.gz

 %post
 echo Creating laminar user with home in %{_sharedstatedir}/laminar
--- a/pkg/centos8-x86_64.sh
+++ b/pkg/centos8-x86_64.sh
@@ -51,7 +51,7 @@ Lightweight Continuous Integration Service
 %prep

 %build
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/ -DSYSTEMD_UNITDIR=%{_unitdir} %{_sourcedir}/laminar-$VERSION
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DLAMINAR_VERSION=$VERSION -DSYSTEMD_UNITDIR=%{_unitdir} %{_sourcedir}/laminar-$VERSION
 pwd
 make

@@ -65,6 +65,8 @@ make
 %config(noreplace) %{_sysconfdir}/laminar.conf
 %{_datarootdir}/bash-completion/completions/laminarc
 %{_datarootdir}/zsh/site-functions/_laminarc
+%{_mandir}/man8/laminard.8.gz
+%{_mandir}/man1/laminarc.1.gz

 %post
 echo Creating laminar user with home in %{_sharedstatedir}/laminar
--- a/pkg/debian10-amd64.sh
+++ b/pkg/debian10-amd64.sh
@@ -17,7 +17,7 @@ docker run --rm -i -v $SOURCE_DIR:/laminar:ro -v $OUTPUT_DIR:/output $DOCKER_TAG
 mkdir /build
 cd /build

-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/ -DZSH_COMPLETIONS_DIR=/usr/share/zsh/functions/Completion/Unix /laminar
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DLAMINAR_VERSION=$VERSION -DZSH_COMPLETIONS_DIR=/usr/share/zsh/functions/Completion/Unix /laminar
 make -j4
 mkdir laminar
 make DESTDIR=laminar install/strip
--- a/pkg/debian10-armhf.sh
+++ b/pkg/debian10-armhf.sh
@@ -30,7 +30,8 @@ cmake \
 	-DCMAKE_OBJCOPY=/usr/bin/arm-linux-gnueabihf-objcopy \
 	-DCMAKE_STRIP=/usr/bin/arm-linux-gnueabihf-strip \
 	-DCMAKE_BUILD_TYPE=Release \
-	-DCMAKE_INSTALL_PREFIX=/ \
+	-DCMAKE_INSTALL_PREFIX=/usr \
+	-DLAMINAR_VERSION=$VERSION \
 	-DZSH_COMPLETIONS_DIR=/usr/share/zsh/functions/Completion/Unix \
 	/laminar
 make -j4
--- a/pkg/debian9-amd64.sh
+++ b/pkg/debian9-amd64.sh
@@ -1,68 +0,0 @@
-#!/bin/bash -e
-
-OUTPUT_DIR=$PWD
-
-SOURCE_DIR=$(readlink -f $(dirname ${BASH_SOURCE[0]})/..)
-
-VERSION=$(cd "$SOURCE_DIR" && git describe --tags --abbrev=8 --dirty)-1~upstream-debian9
-
-DOCKER_TAG=$(docker build -q - <<EOS
-FROM debian:9-slim
-RUN apt-get update && apt-get install -y wget cmake g++ libsqlite3-dev libboost-dev zlib1g-dev
-EOS
-)
-
-docker run --rm -i -v $SOURCE_DIR:/laminar:ro -v $OUTPUT_DIR:/output $DOCKER_TAG bash -xe <<EOS
-
-mkdir /build
-cd /build
-
-wget -O capnproto.tar.gz https://github.com/capnproto/capnproto/archive/v0.7.0.tar.gz
-wget -O rapidjson.tar.gz https://github.com/miloyip/rapidjson/archive/v1.1.0.tar.gz
-md5sum -c <<EOF
-a9de5f042f4cf05515c2d7dfc7f5df21  capnproto.tar.gz
-badd12c511e081fec6c89c43a7027bce  rapidjson.tar.gz
-EOF
-
-tar xzf capnproto.tar.gz
-tar xzf rapidjson.tar.gz
-
-cd /build/capnproto-0.7.0/c++/
-cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=off .
-make -j4
-make install
-
-cd /build/rapidjson-1.1.0/
-cmake -DRAPIDJSON_BUILD_EXAMPLES=off .
-make install
-
-cd /build
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/ -DZSH_COMPLETIONS_DIR=/usr/share/zsh/functions/Completion/Unix /laminar
-make -j4
-mkdir laminar
-make DESTDIR=laminar install/strip
-
-mkdir laminar/DEBIAN
-cat <<EOF > laminar/DEBIAN/control
-Package: laminar
-Version: $VERSION
-Section: 
-Priority: optional
-Architecture: amd64
-Maintainer: Oliver Giles <web ohwg net>
-Depends: libsqlite3-0, zlib1g
-Description: Lightweight Continuous Integration Service
-EOF
-echo /etc/laminar.conf > laminar/DEBIAN/conffiles
-cat <<EOF > laminar/DEBIAN/postinst
-#!/bin/bash
-echo Creating laminar user with home in /var/lib/laminar
-useradd -r -d /var/lib/laminar -s /usr/sbin/nologin laminar
-mkdir -p /var/lib/laminar/cfg/{jobs,contexts,scripts}
-chown -R laminar: /var/lib/laminar
-EOF
-chmod +x laminar/DEBIAN/postinst
-
-dpkg-deb --build laminar
-mv laminar.deb /output/laminar_${VERSION}_amd64.deb
-EOS
--- a/pkg/debian9-armhf.sh
+++ b/pkg/debian9-armhf.sh
@@ -1,88 +0,0 @@
-#!/bin/bash -e
-
-OUTPUT_DIR=$PWD
-
-SOURCE_DIR=$(readlink -f $(dirname ${BASH_SOURCE[0]})/..)
-
-VERSION=$(cd "$SOURCE_DIR" && git describe --tags --abbrev=8 --dirty)-1~upstream-debian9
-
-DOCKER_TAG=$(docker build -q - <<EOS
-FROM debian:9-slim
-RUN dpkg --add-architecture armhf && apt-get update && apt-get install -y wget cmake crossbuild-essential-armhf libsqlite3-dev:armhf libboost-dev:armhf zlib1g-dev:armhf
-EOS
-)
-
-docker run --rm -i -v $SOURCE_DIR:/laminar:ro -v $OUTPUT_DIR:/output $DOCKER_TAG bash -xe <<EOS
-
-mkdir /build
-cd /build
-
-cat > toolchain.cmake <<EOF
-SET(CMAKE_C_COMPILER arm-linux-gnueabihf-gcc)
-SET(CMAKE_CXX_COMPILER arm-linux-gnueabihf-g++)
-set(CMAKE_LIBRARY_ARCHITECTURE arm-linux-gnueabihf)
-EOF
-
-wget -O capnproto.tar.gz https://github.com/capnproto/capnproto/archive/v0.7.0.tar.gz
-wget -O rapidjson.tar.gz https://github.com/miloyip/rapidjson/archive/v1.1.0.tar.gz
-md5sum -c <<EOF
-a9de5f042f4cf05515c2d7dfc7f5df21  capnproto.tar.gz
-badd12c511e081fec6c89c43a7027bce  rapidjson.tar.gz
-EOF
-
-tar xzf capnproto.tar.gz
-tar xzf rapidjson.tar.gz
-
-mkdir capnproto-host
-cd capnproto-host
-cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=off /build/capnproto-0.7.0/c++/
-make -j4
-make install
-
-cd /build/capnproto-0.7.0/c++/
-cmake -DCMAKE_TOOLCHAIN_FILE=../../toolchain.cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF -DCMAKE_INSTALL_PREFIX=/usr/arm-linux-gnueabihf/ .
-make -j4
-make install
-
-cd /build/rapidjson-1.1.0/
-cmake -DRAPIDJSON_BUILD_EXAMPLES=off -DCMAKE_INSTALL_PREFIX=/usr/arm-linux-gnueabihf/ .
-make install
-
-cd /build
-cmake \
-	-DCMAKE_TOOLCHAIN_FILE=toolchain.cmake \
-	-DCMAKE_LINKER=/usr/bin/arm-linux-gnueabihf-ld \
-	-DCMAKE_OBJCOPY=/usr/bin/arm-linux-gnueabihf-objcopy \
-	-DCMAKE_STRIP=/usr/bin/arm-linux-gnueabihf-strip \
-	-DCMAKE_BUILD_TYPE=Release \
-	-DCMAKE_INSTALL_PREFIX=/ \
-	-DZSH_COMPLETIONS_DIR=/usr/share/zsh/functions/Completion/Unix \
-	/laminar
-make -j4
-mkdir laminar
-make DESTDIR=laminar install/strip
-
-mkdir laminar/DEBIAN
-cat <<EOF > laminar/DEBIAN/control
-Package: laminar
-Version: $VERSION
-Section: 
-Priority: optional
-Architecture: armhf
-Maintainer: Oliver Giles <web ohwg net>
-Depends: libsqlite3-0, zlib1g
-Description: Lightweight Continuous Integration Service
-EOF
-echo /etc/laminar.conf > laminar/DEBIAN/conffiles
-cat <<EOF > laminar/DEBIAN/postinst
-#!/bin/bash
-echo Creating laminar user with home in /var/lib/laminar
-useradd -r -d /var/lib/laminar -s /usr/sbin/nologin laminar
-mkdir -p /var/lib/laminar/cfg/{jobs,contexts,scripts}
-chown -R laminar: /var/lib/laminar
-EOF
-chmod +x laminar/DEBIAN/postinst
-
-dpkg-deb --build laminar
-mv laminar.deb /output/laminar_${VERSION}_armhf.deb
-EOS
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -1,5 +1,5 @@
 ///
-/// Copyright 2015-2018 Oliver Giles
+/// Copyright 2015-2020 Oliver Giles
 ///
 /// This file is part of Laminar
 ///
@@ -17,10 +17,12 @@
 /// along with Laminar.  If not, see <http://www.gnu.org/licenses/>
 ///
 #include "laminar.capnp.h"
+#include "log.h"

 #include <capnp/ez-rpc.h>
 #include <kj/vector.h>

+#include <iostream>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -72,18 +74,57 @@ static int setParams(int argc, char** argv, T& request) {
 }

 static void printTriggerLink(const char* job, uint run) {
-    // use a private ANSI CSI sequence to mark the JOB:NUM so the
-    // frontend can recognise it and generate a hyperlink.
-    printf("\033[{%s:%d\033\\\n", job, run);
+    if(getenv("__LAMINAR_SETENV_PIPE")) {
+        // use a private ANSI CSI sequence to mark the JOB:NUM so the
+        // frontend can recognise it and generate a hyperlink.
+        printf("\033[{%s:%d\033\\\n", job, run);
+    } else {
+        // not called from within a laminar job, let's not confuse
+        // scripts with ANSI sequences.
+        printf("%s:%d\n", job, run);
+    }
+}
+
+static void usage(std::ostream& out) {
+    out << "laminarc version " << laminar_version() << "\n";
+    out << "Usage: laminarc [-h|--help] COMMAND [PARAMETERS...]]\n";
+    out << "  -h|--help       show this help message\n";
+    out << "where COMMAND is:\n";
+    out << "  queue JOB_LIST...     queues one or more jobs for execution and returns immediately.\n";
+    out << "  start JOB_LIST...     queues one or more jobs for execution and blocks until it starts.\n";
+    out << "  run JOB_LIST...       queues one or more jobs for execution and blocks until it finishes.\n";
+    out << "  set PARAMETER_LIST... sets the given parameters as environment variables in the currently\n";
+    out << "                        runing job. Fails if run outside of a job context.\n";
+    out << "  abort NAME NUMBER     aborts the run identified by NAME and NUMBER.\n";
+    out << "  show-jobs             lists all known jobs.\n";
+    out << "  show-queued           lists currently queued jobs.\n";
+    out << "  show-running          lists currently running jobs.\n";
+    out << "JOB_LIST is of the form:\n";
+    out << "  [JOB_NAME [PARAMETER_LIST...]]...\n";
+    out << "PARAMETER_LIST is of the form:\n";
+    out << "  [KEY=VALUE]...\n";
+    out << "Example:\n";
+    out << "  laminarc start \\\n";
+    out << "    nightly-build branch=master type=release \\\n";
+    out << "    nightly-build branch=master type=debug\n";
 }

 int main(int argc, char** argv) {
-    if(argc < 2) {
-        fprintf(stderr, "Usage: %s <command> [parameters...]\n", argv[0]);
-        return EXIT_BAD_ARGUMENT;
-    }
+    if(argc < 2)
+        return usage(std::cerr), EXIT_BAD_ARGUMENT;
+    else if(strcmp("-h", argv[1]) == 0 || strcmp("--help", argv[1]) == 0)
+        return usage(std::cout), EXIT_SUCCESS;
+
+    struct: public kj::TaskSet::ErrorHandler {
+        void taskFailed(kj::Exception&& e) override {
+            fprintf(stderr, "%s\n", e.getDescription().cStr());
+            ret = EXIT_OPERATION_FAILED;
+        }
+        int ret = 0;
+    } errorHandler;
+    kj::TaskSet ts(errorHandler);
+    int& ret = errorHandler.ret;

-    int ret = 0;
    const char* address = getenv("LAMINAR_HOST") ?: getenv("LAMINAR_BIND_RPC") ?: "unix-abstract:laminar";

    capnp::EzRpcClient client(address);
@@ -96,35 +137,27 @@ int main(int argc, char** argv) {
            fprintf(stderr, "Usage %s queue <jobName>\n", argv[0]);
            return EXIT_BAD_ARGUMENT;
        }
-        kj::Vector<capnp::RemotePromise<LaminarCi::QueueResults>> promises;
        int jobNameIndex = 2;
        // make a request for each job specified on the commandline
        do {
            auto req = laminar.queueRequest();
            req.setJobName(argv[jobNameIndex]);
            int n = setParams(argc - jobNameIndex - 1, &argv[jobNameIndex + 1], req);
-            promises.add(req.send());
+            ts.add(req.send().then([&ret,argv,jobNameIndex](capnp::Response<LaminarCi::QueueResults> resp){
+                if(resp.getResult() != LaminarCi::MethodResult::SUCCESS) {
+                    fprintf(stderr, "Failed to queue job '%s'\n", argv[jobNameIndex]);
+                    ret = EXIT_OPERATION_FAILED;
+                } else
+                    printTriggerLink(argv[jobNameIndex], resp.getBuildNum());
+            }));
            jobNameIndex += n + 1;
        } while(jobNameIndex < argc);
-        // pend on the promises
-        for(auto& p : promises) {
-            if(p.wait(waitScope).getResult() != LaminarCi::MethodResult::SUCCESS) {
-                fprintf(stderr, "Failed to queue job '%s'\n", argv[2]);
-                return EXIT_OPERATION_FAILED;
-            }
-        }
-    } else if(strcmp(argv[1], "start") == 0 || strcmp(argv[1], "trigger") == 0) {
-        if(strcmp(argv[1], "trigger") == 0)
-            fprintf(stderr, "Warning: 'trigger' is deprecated, use 'queue' for the old behavior\n");
+    } else if(strcmp(argv[1], "start") == 0) {
        if(argc < 3) {
            fprintf(stderr, "Usage %s queue <jobName>\n", argv[0]);
            return EXIT_BAD_ARGUMENT;
        }
        kj::Vector<capnp::RemotePromise<LaminarCi::StartResults>> promises;
-        struct: public kj::TaskSet::ErrorHandler {
-            void taskFailed(kj::Exception&&) override {}
-        } ignoreFailed;
-        kj::TaskSet ts(ignoreFailed);
        int jobNameIndex = 2;
        // make a request for each job specified on the commandline
        do {
@@ -135,21 +168,16 @@ int main(int argc, char** argv) {
                if(resp.getResult() != LaminarCi::MethodResult::SUCCESS) {
                    fprintf(stderr, "Failed to start job '%s'\n", argv[2]);
                    ret = EXIT_OPERATION_FAILED;
-                }
-                printTriggerLink(argv[jobNameIndex], resp.getBuildNum());
+                } else
+                    printTriggerLink(argv[jobNameIndex], resp.getBuildNum());
            }));
            jobNameIndex += n + 1;
        } while(jobNameIndex < argc);
-        ts.onEmpty().wait(waitScope);
    } else if(strcmp(argv[1], "run") == 0) {
        if(argc < 3) {
            fprintf(stderr, "Usage %s run <jobName>\n", argv[0]);
            return EXIT_BAD_ARGUMENT;
        }
-        struct: public kj::TaskSet::ErrorHandler {
-            void taskFailed(kj::Exception&&) override {}
-        } ignoreFailed;
-        kj::TaskSet ts(ignoreFailed);
        int jobNameIndex = 2;
        // make a request for each job specified on the commandline
        do {
@@ -157,21 +185,22 @@ int main(int argc, char** argv) {
            req.setJobName(argv[jobNameIndex]);
            int n = setParams(argc - jobNameIndex - 1, &argv[jobNameIndex + 1], req);
            ts.add(req.send().then([&ret,argv,jobNameIndex](capnp::Response<LaminarCi::RunResults> resp){
-                printTriggerLink(argv[jobNameIndex], resp.getBuildNum());
-                if(resp.getResult() != LaminarCi::JobResult::SUCCESS) {
+                if(resp.getResult() == LaminarCi::JobResult::UNKNOWN)
+                    fprintf(stderr, "Failed to start job '%s'\n", argv[2]);
+		else
+		    printTriggerLink(argv[jobNameIndex], resp.getBuildNum());
+                if(resp.getResult() != LaminarCi::JobResult::SUCCESS)
                    ret = EXIT_RUN_FAILED;
-                }
            }));
            jobNameIndex += n + 1;
        } while(jobNameIndex < argc);
-        ts.onEmpty().wait(waitScope);
    } else if(strcmp(argv[1], "set") == 0) {
        if(argc < 3) {
            fprintf(stderr, "Usage %s set param=value\n", argv[0]);
            return EXIT_BAD_ARGUMENT;
        }
        if(char* pipeNum = getenv("__LAMINAR_SETENV_PIPE")) {
-            write(atoi(pipeNum), argv[2], strlen(argv[2]));
+            LSYSCALL(write(atoi(pipeNum), argv[2], strlen(argv[2])));
        } else {
            fprintf(stderr, "Must be run from within a laminar job\n");
            return EXIT_BAD_ARGUMENT;
@@ -184,14 +213,17 @@ int main(int argc, char** argv) {
        auto req = laminar.abortRequest();
        req.getRun().setJob(argv[2]);
        req.getRun().setBuildNum(atoi(argv[3]));
-        if(req.send().wait(waitScope).getResult() != LaminarCi::MethodResult::SUCCESS)
-            ret = EXIT_OPERATION_FAILED;
+        ts.add(req.send().then([&ret](capnp::Response<LaminarCi::AbortResults> resp){
+            if(resp.getResult() != LaminarCi::MethodResult::SUCCESS)
+                ret = EXIT_OPERATION_FAILED;
+        }));
    } else if(strcmp(argv[1], "show-jobs") == 0) {
        if(argc != 2) {
            fprintf(stderr, "Usage: %s show-jobs\n", argv[0]);
            return EXIT_BAD_ARGUMENT;
        }
-        for(auto it : laminar.listKnownRequest().send().wait(waitScope).getResult()) {
+        auto jobs = laminar.listKnownRequest().send().wait(waitScope);
+        for(auto it : jobs.getResult()) {
            printf("%s\n", it.cStr());
        }
    } else if(strcmp(argv[1], "show-queued") == 0) {
@@ -199,7 +231,8 @@ int main(int argc, char** argv) {
            fprintf(stderr, "Usage: %s show-queued\n", argv[0]);
            return EXIT_BAD_ARGUMENT;
        }
-        for(auto it : laminar.listQueuedRequest().send().wait(waitScope).getResult()) {
+        auto queued = laminar.listQueuedRequest().send().wait(waitScope);
+        for(auto it : queued.getResult()) {
            printf("%s\n", it.cStr());
        }
    } else if(strcmp(argv[1], "show-running") == 0) {
@@ -207,7 +240,8 @@ int main(int argc, char** argv) {
            fprintf(stderr, "Usage: %s show-running\n", argv[0]);
            return EXIT_BAD_ARGUMENT;
        }
-        for(auto it : laminar.listRunningRequest().send().wait(waitScope).getResult()) {
+        auto running = laminar.listRunningRequest().send().wait(waitScope);
+        for(auto it : running.getResult()) {
            printf("%s:%d\n", it.getJob().cStr(), it.getBuildNum());
        }
    } else {
@@ -215,5 +249,7 @@ int main(int argc, char** argv) {
        return EXIT_BAD_ARGUMENT;
    }

+    ts.onEmpty().wait(waitScope);
+
    return ret;
 }
--- a/src/conf.h
+++ b/src/conf.h
@@ -19,6 +19,7 @@
 #ifndef LAMINAR_CONF_H_
 #define LAMINAR_CONF_H_

+#include <string>
 #include <unordered_map>

 class StringMap : public std::unordered_map<std::string, std::string> {
--- a/src/context.h
+++ b/src/context.h
@@ -1,5 +1,5 @@
 ///
-/// Copyright 2015-2019 Oliver Giles
+/// Copyright 2015-2020 Oliver Giles
 ///
 /// This file is part of Laminar
 ///
@@ -19,7 +19,6 @@
 #ifndef LAMINAR_CONTEXT_H_
 #define LAMINAR_CONTEXT_H_

-#include <fnmatch.h>
 #include <string>
 #include <set>
 class Run;
@@ -34,17 +33,7 @@ public:
    std::string name;
    int numExecutors;
    int busyExecutors = 0;
-
-    bool canQueue(std::set<std::string>& patterns) {
-        if(busyExecutors >= numExecutors)
-            return false;
-
-        for(std::string pattern : patterns) {
-            if(fnmatch(pattern.c_str(), name.c_str(), FNM_EXTMATCH) == 0)
-                return true;
-        }
-        return false;
-    }
+    std::set<std::string> jobPatterns;
 };


--- a/src/http.cpp
+++ b/src/http.cpp
@@ -78,14 +78,14 @@ kj::Maybe<MonitorScope> fromUrl(std::string resource, char* query) {
        return kj::mv(scope);
    }

-    if(resource.substr(0, 5) != "/jobs")
-        return nullptr;
-
-    if(resource.length() == 5) {
+    if(resource == "/jobs" || resource == "/wallboard") {
        scope.type = MonitorScope::ALL;
        return kj::mv(scope);
    }

+    if(resource.substr(0, 5) != "/jobs")
+        return nullptr;
+
    resource = resource.substr(5);
    size_t split = resource.find('/',1);
    std::string job = resource.substr(1,split-1);
@@ -203,6 +203,8 @@ kj::Promise<void> Http::request(kj::HttpMethod method, kj::StringPtr url, const
    if(is_sse) {
        KJ_IF_MAYBE(s, fromUrl(url.cStr(), queryString)) {
            responseHeaders.set(kj::HttpHeaderId::CONTENT_TYPE, "text/event-stream");
+            // Disables nginx reverse-proxy's buffering. Necessary for streamed events.
+            responseHeaders.add("X-Accel-Buffering", "no");
            auto peer = kj::heap<WithSetRef<EventPeer>>(eventPeers);
            peer->scope = *s;
            std::string st = "data: " + laminar.getStatus(peer->scope) + "\n\n";
@@ -236,12 +238,6 @@ kj::Promise<void> Http::request(kj::HttpMethod method, kj::StringPtr url, const
                return writeLogChunk(c, s);
            }).attach(kj::mv(output)).attach(kj::mv(stream)).attach(kj::mv(lw));
        }
-    } else if(url == "/custom/style.css") {
-        responseHeaders.set(kj::HttpHeaderId::CONTENT_TYPE, "text/css; charset=utf-8");
-        responseHeaders.add("Content-Transfer-Encoding", "binary");
-        std::string css = laminar.getCustomCss();
-        auto stream = response.send(200, "OK", responseHeaders, css.size());
-        return stream->write(css.data(), css.size()).attach(kj::mv(css)).attach(kj::mv(stream));
    } else if(resources->handleRequest(url.cStr(), &start, &end, &content_type)) {
        responseHeaders.set(kj::HttpHeaderId::CONTENT_TYPE, content_type);
        responseHeaders.add("Content-Encoding", "gzip");
@@ -297,3 +293,8 @@ void Http::notifyLog(std::string job, uint run, std::string log_chunk, bool eot)
        }
    }
 }
+
+void Http::setHtmlTemplate(std::string tmpl)
+{
+    resources->setHtmlTemplate(tmpl);
+}
--- a/src/http.h
+++ b/src/http.h
@@ -1,5 +1,5 @@
 ///
-/// Copyright 2019 Oliver Giles
+/// Copyright 2019-2020 Oliver Giles
 ///
 /// This file is part of Laminar
 ///
@@ -28,8 +28,8 @@
 typedef unsigned int uint;
 typedef unsigned long ulong;

-struct Laminar;
-struct Resources;
+class Laminar;
+class Resources;
 struct LogWatcher;
 struct EventPeer;

@@ -43,6 +43,9 @@ public:
    void notifyEvent(const char* data, std::string job = nullptr);
    void notifyLog(std::string job, uint run, std::string log_chunk, bool eot);

+    // Allows supplying a custom HTML template. Pass an empty string to use the default.
+    void setHtmlTemplate(std::string tmpl = std::string());
+
 private:
    virtual kj::Promise<void> request(kj::HttpMethod method, kj::StringPtr url, const kj::HttpHeaders& headers,
                                      kj::AsyncInputStream& requestBody, Response& response) override;
--- a/src/laminar.capnp
+++ b/src/laminar.capnp
@@ -2,7 +2,7 @@

 interface LaminarCi {

-    queue @0 (jobName :Text, params :List(JobParam)) -> (result :MethodResult);
+    queue @0 (jobName :Text, params :List(JobParam)) -> (result :MethodResult, buildNum :UInt32);
    start @1 (jobName :Text, params :List(JobParam)) -> (result :MethodResult, buildNum :UInt32);
    run @2 (jobName :Text, params :List(JobParam)) -> (result :JobResult, buildNum :UInt32);
    listQueued @3 () -> (result :List(Text));
--- a/src/laminar.cpp
+++ b/src/laminar.cpp
@@ -1,5 +1,5 @@
 ///
-/// Copyright 2015-2019 Oliver Giles
+/// Copyright 2015-2020 Oliver Giles
 ///
 /// This file is part of Laminar
 ///
@@ -28,6 +28,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
+#include <fnmatch.h>
 #include <fstream>
 #include <zlib.h>

@@ -36,6 +37,11 @@
 #include <rapidjson/stringbuffer.h>
 #include <rapidjson/writer.h>

+// FNM_EXTMATCH isn't supported under musl
+#if !defined(FNM_EXTMATCH)
+#define FNM_EXTMATCH 0
+#endif
+
 // rapidjson::Writer with a StringBuffer is used a lot in Laminar for
 // preparing JSON messages to send to HTTP clients. A small wrapper
 // class here reduces verbosity later for this common use case.
@@ -67,7 +73,6 @@ inline kj::Path operator/(const std::string& p, const T& ext) {
 typedef std::string str;

 Laminar::Laminar(Server &server, Settings settings) :
-    settings(settings),
    srv(server),
    homePath(kj::Path::parse(&settings.home[1])),
    fsHome(kj::newDiskFilesystem()->getRoot().openSubdir(homePath, kj::WriteMode::MODIFY)),
@@ -113,6 +118,12 @@ Laminar::Laminar(Server &server, Settings settings) :
      .addPath((homePath/"cfg"/"jobs").toString(true).cStr())
      .addPath((homePath/"cfg").toString(true).cStr()); // for groups.conf

+    loadCustomizations();
+    srv.watchPaths([this]{
+        LLOG(INFO, "Reloading customizations");
+        loadCustomizations();
+    }).addPath((homePath/"custom").toString(true).cStr());
+
    srv.listenRpc(*rpc, settings.bind_rpc);
    srv.listenHttp(*http, settings.bind_http);

@@ -121,21 +132,20 @@ Laminar::Laminar(Server &server, Settings settings) :
    loadConfiguration();
 }

-uint Laminar::latestRun(std::string job) {
-    auto it = activeJobs.byJobName().equal_range(job);
-    if(it.first == it.second) {
-        uint result = 0;
-        db->stmt("SELECT MAX(number) FROM builds WHERE name = ?")
-                .bind(job)
-                .fetch<uint>([&](uint x){
-            result = x;
-        });
-        return result;
+void Laminar::loadCustomizations() {
+    KJ_IF_MAYBE(templ, fsHome->tryOpenFile(kj::Path{"custom","index.html"})) {
+        http->setHtmlTemplate((*templ)->readAllText().cStr());
    } else {
-        return (*--it.second)->build;
+        http->setHtmlTemplate();
    }
 }

+uint Laminar::latestRun(std::string job) {
+    if(auto it = buildNums.find(job); it != buildNums.end())
+        return it->second;
+    return 0;
+}
+
 bool Laminar::handleLogRequest(std::string name, uint num, std::string& output, bool& complete) {
    if(Run* run = activeRun(name, num)) {
        output = run->log;
@@ -213,37 +223,33 @@ std::string Laminar::getStatus(MonitorScope scope) {
    Json j;
    j.set("type", "status");
    j.set("title", getenv("LAMINAR_TITLE") ?: "Laminar");
+    j.set("version", laminar_version());
    j.set("time", time(nullptr));
    j.startObject("data");
    if(scope.type == MonitorScope::RUN) {
-        db->stmt("SELECT queuedAt,startedAt,completedAt,result,reason,parentJob,parentBuild FROM builds WHERE name = ? AND number = ?")
+        db->stmt("SELECT queuedAt,startedAt,completedAt,result,reason,parentJob,parentBuild,q.lr IS NOT NULL,q.lr FROM builds "
+                 "LEFT JOIN (SELECT name n, MAX(number), completedAt-startedAt lr FROM builds WHERE result IS NOT NULL GROUP BY n) q ON q.n = name "
+                 "WHERE name = ? AND number = ?")
        .bind(scope.job, scope.num)
-        .fetch<time_t, time_t, time_t, int, std::string, std::string, uint>([&](time_t queued, time_t started, time_t completed, int result, std::string reason, std::string parentJob, uint parentBuild) {
-            j.set("queued", started-queued);
+        .fetch<time_t, time_t, time_t, int, std::string, std::string, uint, uint, uint>([&](time_t queued, time_t started, time_t completed, int result, std::string reason, std::string parentJob, uint parentBuild, uint lastRuntimeKnown, uint lastRuntime) {
+            j.set("queued", queued);
            j.set("started", started);
-            j.set("completed", completed);
-            j.set("result", to_string(RunState(result)));
+            if(completed)
+              j.set("completed", completed);
+            j.set("result", to_string(completed ? RunState(result) : started ? RunState::RUNNING : RunState::QUEUED));
            j.set("reason", reason);
            j.startObject("upstream").set("name", parentJob).set("num", parentBuild).EndObject(2);
+            if(lastRuntimeKnown)
+              j.set("etc", started + lastRuntime);
        });
-        if(const Run* run = activeRun(scope.job, scope.num)) {
-            j.set("queued", run->startedAt - run->queuedAt);
-            j.set("started", run->startedAt);
-            j.set("result", to_string(RunState::RUNNING));
-            j.set("reason", run->reason());
-            j.startObject("upstream").set("name", run->parentName).set("num", run->parentBuild).EndObject(2);
-            db->stmt("SELECT completedAt - startedAt FROM builds WHERE name = ? ORDER BY completedAt DESC LIMIT 1")
-             .bind(run->name)
-             .fetch<uint>([&](uint lastRuntime){
-                j.set("etc", run->startedAt + lastRuntime);
-            });
-        }
-        j.set("latestNum", int(buildNums[scope.job]));
+        if(auto it = buildNums.find(scope.job); it != buildNums.end())
+            j.set("latestNum", int(it->second));
+
        j.startArray("artifacts");
        populateArtifacts(j, scope.job, scope.num);
        j.EndArray();
    } else if(scope.type == MonitorScope::JOB) {
-        const uint runsPerPage = 10;
+        const uint runsPerPage = 20;
        j.startArray("recent");
        // ORDER BY param cannot be bound
        std::string order_by;
@@ -258,7 +264,8 @@ std::string Laminar::getStatus(MonitorScope scope) {
            order_by = "(completedAt-startedAt) " + direction + ", number DESC";
        else
            order_by = "number DESC";
-        std::string stmt = "SELECT number,startedAt,completedAt,result,reason FROM builds WHERE name = ? ORDER BY "
+        std::string stmt = "SELECT number,startedAt,completedAt,result,reason FROM builds "
+                "WHERE name = ? AND result IS NOT NULL ORDER BY "
                + order_by + " LIMIT ?,?";
        db->stmt(stmt.c_str())
        .bind(scope.job, scope.page * runsPerPage, runsPerPage)
@@ -272,7 +279,7 @@ std::string Laminar::getStatus(MonitorScope scope) {
             .EndObject();
        });
        j.EndArray();
-        db->stmt("SELECT COUNT(*),AVG(completedAt-startedAt) FROM builds WHERE name = ?")
+        db->stmt("SELECT COUNT(*),AVG(completedAt-startedAt) FROM builds WHERE name = ? AND result IS NOT NULL")
        .bind(scope.job)
        .fetch<uint,uint>([&](uint nRuns, uint averageRuntime){
            j.set("averageRuntime", averageRuntime);
@@ -303,14 +310,17 @@ std::string Laminar::getStatus(MonitorScope scope) {
            }
        }
        j.set("nQueued", nQueued);
-        db->stmt("SELECT number,startedAt FROM builds WHERE name = ? AND result = ? ORDER BY completedAt DESC LIMIT 1")
+        db->stmt("SELECT number,startedAt FROM builds WHERE name = ? AND result = ? "
+                 "ORDER BY completedAt DESC LIMIT 1")
        .bind(scope.job, int(RunState::SUCCESS))
        .fetch<int,time_t>([&](int build, time_t started){
            j.startObject("lastSuccess");
            j.set("number", build).set("started", started);
            j.EndObject();
        });
-        db->stmt("SELECT number,startedAt FROM builds WHERE name = ? AND result <> ? ORDER BY completedAt DESC LIMIT 1")
+        db->stmt("SELECT number,startedAt FROM builds "
+                 "WHERE name = ? AND result <> ? "
+                 "ORDER BY completedAt DESC LIMIT 1")
        .bind(scope.job, int(RunState::SUCCESS))
        .fetch<int,time_t>([&](int build, time_t started){
            j.startObject("lastFailed");
@@ -321,14 +331,17 @@ std::string Laminar::getStatus(MonitorScope scope) {
        j.set("description", desc == jobDescriptions.end() ? "" : desc->second);
    } else if(scope.type == MonitorScope::ALL) {
        j.startArray("jobs");
-        db->stmt("SELECT name,number,startedAt,completedAt,result FROM builds b JOIN (SELECT name n,MAX(number) l FROM builds GROUP BY n) q ON b.name = q.n AND b.number = q.l")
-        .fetch<str,uint,time_t,time_t,int>([&](str name,uint number, time_t started, time_t completed, int result){
+        db->stmt("SELECT name,number,startedAt,completedAt,result,reason FROM builds b "
+                 "JOIN (SELECT name n,MAX(number) latest FROM builds WHERE result IS NOT NULL GROUP BY n) q "
+                 "ON b.name = q.n AND b.number = latest")
+        .fetch<str,uint,time_t,time_t,int,str>([&](str name,uint number, time_t started, time_t completed, int result, str reason){
            j.StartObject();
            j.set("name", name);
            j.set("number", number);
            j.set("result", to_string(RunState(result)));
            j.set("started", started);
            j.set("completed", completed);
+            j.set("reason", reason);
            j.EndObject();
        });
        j.EndArray();
@@ -348,7 +361,7 @@ std::string Laminar::getStatus(MonitorScope scope) {
        j.EndObject();
    } else { // Home page
        j.startArray("recent");
-        db->stmt("SELECT * FROM builds ORDER BY completedAt DESC LIMIT 15")
+        db->stmt("SELECT * FROM builds WHERE completedAt IS NOT NULL ORDER BY completedAt DESC LIMIT 20")
        .fetch<str,uint,str,time_t,time_t,time_t,int>([&](str name,uint build,str context,time_t,time_t started,time_t completed,int result){
            j.StartObject();
            j.set("name", name)
@@ -367,7 +380,9 @@ std::string Laminar::getStatus(MonitorScope scope) {
            j.set("number", run->build);
            j.set("context", run->context->name);
            j.set("started", run->startedAt);
-            db->stmt("SELECT completedAt - startedAt FROM builds WHERE name = ? ORDER BY completedAt DESC LIMIT 1")
+            db->stmt("SELECT completedAt - startedAt FROM builds "
+                     "WHERE completedAt IS NOT NULL AND name = ? "
+                     "ORDER BY completedAt DESC LIMIT 1")
             .bind(run->name)
             .fetch<uint>([&](uint lastRuntime){
                j.set("etc", run->startedAt + lastRuntime);
@@ -412,7 +427,7 @@ std::string Laminar::getStatus(MonitorScope scope) {
        j.startObject("timePerJob");
        db->stmt("SELECT name, AVG(completedAt-startedAt) av FROM builds WHERE completedAt > ? GROUP BY name ORDER BY av DESC LIMIT 8")
                .bind(time(nullptr) - 7 * 86400)
-                .fetch<str, uint>([&](str job, uint time){
+                .fetch<str, double>([&](str job, double time){
            j.set(job.c_str(), time);
        });
        j.EndObject();
@@ -450,29 +465,6 @@ std::string Laminar::getStatus(MonitorScope scope) {
            j.EndObject();
        });
        j.EndArray();
-
-        j.startArray("buildTimeDist");
-        db->stmt("WITH ba AS (SELECT name,AVG(completedAt-startedAt) a FROM builds GROUP BY name) SELECT "
-                 "COUNT(CASE WHEN               a <    30 THEN 1 END),"
-                 "COUNT(CASE WHEN a >=   30 AND a <    60 THEN 1 END),"
-                 "COUNT(CASE WHEN a >=   60 AND a <   300 THEN 1 END),"
-                 "COUNT(CASE WHEN a >=  300 AND a <   600 THEN 1 END),"
-                 "COUNT(CASE WHEN a >=  600 AND a <  1200 THEN 1 END),"
-                 "COUNT(CASE WHEN a >= 1200 AND a <  2400 THEN 1 END),"
-                 "COUNT(CASE WHEN a >= 2400 AND a <  3600 THEN 1 END),"
-                 "COUNT(CASE WHEN a >= 3600               THEN 1 END) FROM ba")
-                .fetch<uint,uint,uint,uint,uint,uint,uint,uint>([&](uint c1, uint c2, uint c3, uint c4, uint c5, uint c6, uint c7, uint c8){
-            j.Int(c1);
-            j.Int(c2);
-            j.Int(c3);
-            j.Int(c4);
-            j.Int(c5);
-            j.Int(c6);
-            j.Int(c7);
-            j.Int(c8);
-        });
-        j.EndArray();
-
    }
    j.EndObject();
    return j.str();
@@ -504,6 +496,16 @@ bool Laminar::loadConfiguration() {
            context->name = name;
            context->numExecutors = conf.get<int>("EXECUTORS", 6);

+            std::string jobPtns = conf.get<std::string>("JOBS");
+            std::set<std::string> jobPtnsList;
+            if(!jobPtns.empty()) {
+                std::istringstream iss(jobPtns);
+                std::string job;
+                while(std::getline(iss, job, ','))
+                    jobPtnsList.insert(job);
+            }
+            context->jobPatterns.swap(jobPtnsList);
+
            knownContexts.insert(name);
        }
    }
@@ -536,14 +538,20 @@ bool Laminar::loadConfiguration() {

            std::string ctxPtns = conf.get<std::string>("CONTEXTS");

+            std::set<std::string> ctxPtnList;
            if(!ctxPtns.empty()) {
                std::istringstream iss(ctxPtns);
-                std::set<std::string> ctxPtnList;
                std::string ctx;
                while(std::getline(iss, ctx, ','))
                    ctxPtnList.insert(ctx);
-                jobContexts[jobName].swap(ctxPtnList);
            }
+            // Must be present both here and in queueJob because otherwise if a context
+            // were created while a job is already queued, the default context would be
+            // dropped when the set of contexts is updated here.
+            if(ctxPtnList.empty())
+                ctxPtnList.insert("default");
+            jobContexts[jobName].swap(ctxPtnList);
+
            std::string desc = conf.get<std::string>("DESCRIPTION");
            if(!desc.empty()) {
                jobDescriptions[jobName] = desc;
@@ -566,18 +574,23 @@ std::shared_ptr<Run> Laminar::queueJob(std::string name, ParamMap params) {
        return nullptr;
    }

-    // If the job has no contexts (maybe there is no .conf file at all), add the default context
+    // jobContexts[name] can be empty if there is no .conf file at all
    if(jobContexts[name].empty())
        jobContexts.at(name).insert("default");

-    std::shared_ptr<Run> run = std::make_shared<Run>(name, kj::mv(params), homePath.clone());
+    std::shared_ptr<Run> run = std::make_shared<Run>(name, ++buildNums[name], kj::mv(params), homePath.clone());
    queuedJobs.push_back(run);

+    db->stmt("INSERT INTO builds(name,number,queuedAt,parentJob,parentBuild,reason) VALUES(?,?,?,?,?,?)")
+     .bind(run->name, run->build, run->queuedAt, run->parentName, run->parentBuild, run->reason())
+     .exec();
+
    // notify clients
    Json j;
    j.set("type", "job_queued")
        .startObject("data")
        .set("name", name)
+        .set("number", run->build)
        .EndObject();
    http->notifyEvent(j.str(), name.c_str());

@@ -597,21 +610,48 @@ void Laminar::abortAll() {
    }
 }

+bool Laminar::canQueue(const Context& ctx, const Run& run) const {
+    if(ctx.busyExecutors >= ctx.numExecutors)
+        return false;
+
+    // match may be jobs as defined by the context...
+    for(std::string p : ctx.jobPatterns) {
+        if(fnmatch(p.c_str(), run.name.c_str(), FNM_EXTMATCH) == 0)
+            return true;
+    }
+
+    // ...or context as defined by the job.
+    for(std::string p : jobContexts.at(run.name)) {
+        if(fnmatch(p.c_str(), ctx.name.c_str(), FNM_EXTMATCH) == 0)
+            return true;
+    }
+
+    return false;
+}
+
 bool Laminar::tryStartRun(std::shared_ptr<Run> run, int queueIndex) {
    for(auto& sc : contexts) {
        std::shared_ptr<Context> ctx = sc.second;

-        if(ctx->canQueue(jobContexts.at(run->name))) {
-            kj::Promise<RunState> onRunFinished = run->start(buildNums[run->name] + 1, ctx, *fsHome,[this](kj::Maybe<pid_t>& pid){return srv.onChildExit(pid);});
+        if(canQueue(*ctx, *run)) {
+            RunState lastResult = RunState::UNKNOWN;

-            ctx->busyExecutors++;
-            // set the last known result if exists
+            // set the last known result if exists. Runs which haven't started yet should
+            // have completedAt == NULL and thus be at the end of a DESC ordered query
            db->stmt("SELECT result FROM builds WHERE name = ? ORDER BY completedAt DESC LIMIT 1")
             .bind(run->name)
-             .fetch<int>([=](int result){
-                run->lastResult = RunState(result);
+             .fetch<int>([&](int result){
+                lastResult = RunState(result);
            });

+            kj::Promise<RunState> onRunFinished = run->start(lastResult, ctx, *fsHome,[this](kj::Maybe<pid_t>& pid){return srv.onChildExit(pid);});
+
+            db->stmt("UPDATE builds SET node = ?, startedAt = ? WHERE name = ? AND number = ?")
+             .bind(ctx->name, run->startedAt, run->name, run->build)
+             .exec();
+
+            ctx->busyExecutors++;
+
            kj::Promise<void> exec = srv.readDescriptor(run->output_fd, [this, run](const char*b, size_t n){
                // handle log output
                std::string s(b, n);
@@ -631,16 +671,13 @@ bool Laminar::tryStartRun(std::shared_ptr<Run> run, int queueIndex) {
            srv.addTask(kj::mv(exec));
            LLOG(INFO, "Started job", run->name, run->build, ctx->name);

-            // update next build number
-            buildNums[run->name]++;
-
            // notify clients
            Json j;
            j.set("type", "job_started")
             .startObject("data")
             .set("queueIndex", queueIndex)
             .set("name", run->name)
-             .set("queued", run->startedAt - run->queuedAt)
+             .set("queued", run->queuedAt)
             .set("started", run->startedAt)
             .set("number", run->build)
             .set("reason", run->reason());
@@ -689,10 +726,8 @@ void Laminar::handleRunFinished(Run * r) {
        }
    }

-    std::string reason = r->reason();
-    db->stmt("INSERT INTO builds VALUES(?,?,?,?,?,?,?,?,?,?,?,?)")
-     .bind(r->name, r->build, ctx->name, r->queuedAt, r->startedAt, completedAt, int(r->result),
-           maybeZipped, logsize, r->parentName, r->parentBuild, reason)
+    db->stmt("UPDATE builds SET completedAt = ?, result = ?, output = ?, outputLen = ? WHERE name = ? AND number = ?")
+     .bind(completedAt, int(r->result), maybeZipped, logsize, r->name, r->build)
     .exec();

    // notify clients
@@ -701,7 +736,7 @@ void Laminar::handleRunFinished(Run * r) {
            .startObject("data")
            .set("name", r->name)
            .set("number", r->build)
-            .set("queued", r->startedAt - r->queuedAt)
+            .set("queued", r->queuedAt)
            .set("completed", completedAt)
            .set("started", r->startedAt)
            .set("result", to_string(r->result))
@@ -749,7 +784,7 @@ kj::Maybe<kj::Own<const kj::ReadableFile>> Laminar::getArtefact(std::string path

 bool Laminar::handleBadgeRequest(std::string job, std::string &badge) {
    RunState rs = RunState::UNKNOWN;
-    db->stmt("SELECT result FROM builds WHERE name = ? ORDER BY number DESC LIMIT 1")
+    db->stmt("SELECT result FROM builds WHERE name = ? AND result IS NOT NULL ORDER BY number DESC LIMIT 1")
            .bind(job)
            .fetch<int>([&](int result){
        rs = RunState(result);
@@ -764,7 +799,7 @@ bool Laminar::handleBadgeRequest(std::string job, std::string &badge) {
    const char* gradient1 = (rs == RunState::SUCCESS) ? "#2aff4d" : "#ff2a2a";
    const char* gradient2 = (rs == RunState::SUCCESS) ? "#24b43c" : "#b42424";
    char* svg = NULL;
-    asprintf(&svg,
+    if(asprintf(&svg,
 R"x(
 <svg xmlns="http://www.w3.org/2000/svg" width="%d" height="20">
  <clipPath id="clip">
@@ -784,15 +819,10 @@ R"x(
    <rect x="%d" width="%d" height="20" fill="url(#status)"/>
    <text x="%d" y="14" fill="#000">%s</text>
  </g>
-</svg>)x", jobNameWidth+statusWidth, jobNameWidth+statusWidth, gradient1, gradient2, jobNameWidth, jobNameWidth/2+1, job.data(), jobNameWidth, statusWidth, jobNameWidth+statusWidth/2, status.data());
+</svg>)x", jobNameWidth+statusWidth, jobNameWidth+statusWidth, gradient1, gradient2, jobNameWidth, jobNameWidth/2+1, job.data(), jobNameWidth, statusWidth, jobNameWidth+statusWidth/2, status.data()) < 0)
+        return false;
+
    badge = svg;
    return true;
 }

-std::string Laminar::getCustomCss() {
-    KJ_IF_MAYBE(cssFile, fsHome->tryOpenFile(kj::Path{"custom","style.css"})) {
-        return (*cssFile)->readAllText().cStr();
-    } else {
-        return std::string();
-    }
-}
--- a/src/laminar.h
+++ b/src/laminar.h
@@ -1,5 +1,5 @@
 ///
-/// Copyright 2015-2019 Oliver Giles
+/// Copyright 2015-2020 Oliver Giles
 ///
 /// This file is part of Laminar
 ///
@@ -31,7 +31,7 @@
 // Context name to context object map
 typedef std::unordered_map<std::string, std::shared_ptr<Context>> ContextMap;

-struct Server;
+class Server;
 class Json;

 class Http;
@@ -90,11 +90,6 @@ public:
    // if the job is unknown.
    bool handleBadgeRequest(std::string job, std::string& badge);

-    // Fetches the content of $LAMINAR_HOME/custom/style.css or an empty
-    // string. Ideally, this would instead be served by a proper web server
-    // which handles this url.
-    std::string getCustomCss();
-
    // Aborts a single job
    bool abort(std::string job, uint buildNum);

@@ -103,7 +98,9 @@ public:

 private:
    bool loadConfiguration();
+    void loadCustomizations();
    void assignNewJobs();
+    bool canQueue(const Context& ctx, const Run& run) const;
    bool tryStartRun(std::shared_ptr<Run> run, int queueIndex);
    void handleRunFinished(Run*);
    // expects that Json has started an array
@@ -124,7 +121,6 @@ private:

    std::unordered_map<std::string, std::string> jobGroups;

-    Settings settings;
    RunSet activeJobs;
    Database* db;
    Server& srv;
--- a/src/leader.cpp
+++ b/src/leader.cpp
@@ -1,5 +1,5 @@
 ///
-/// Copyright 2019 Oliver Giles
+/// Copyright 2019-2020 Oliver Giles
 ///
 /// This file is part of Laminar
 ///
@@ -20,6 +20,7 @@
 #include <string>
 #include <unistd.h>
 #include <queue>
+#include <dirent.h>
 #include <sys/prctl.h>
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -45,6 +46,39 @@ struct Script {
    bool runOnAbort;
 };

+static void aggressive_recursive_kill(pid_t parent) {
+    DIR* proc = opendir("/proc");
+    if(!proc)
+        return;
+
+    while(struct dirent* de = readdir(proc)) {
+        if(!isdigit(*de->d_name))
+            continue;
+
+        char status_file[640];
+        sprintf(status_file, "/proc/%s/status", de->d_name);
+
+        FILE* status_fp = fopen(status_file, "rb");
+        if(!status_fp)
+            continue;
+
+        char status_buffer[512];
+        int n = fread(status_buffer, 1, 512, status_fp);
+        if(char* p = (char*)memmem(status_buffer, n, "PPid:\t", 6)) {
+            pid_t ppid = strtol(p + 6, NULL, 10);
+            if(ppid == parent) {
+                pid_t pid = atoi(de->d_name);
+                aggressive_recursive_kill(pid);
+                fprintf(stderr, "[laminar] sending SIGKILL to pid %d\n", pid);
+                kill(pid, SIGKILL);
+            }
+        }
+        fclose(status_fp);
+    }
+    closedir(proc);
+}
+
+
 class Leader final : public kj::TaskSet::ErrorHandler {
 public:
    Leader(kj::AsyncIoContext& ioContext, kj::Filesystem& fs, const char* jobName, uint runNumber);
@@ -67,6 +101,7 @@ private:
    pid_t currentScriptPid;
    std::queue<Script> scripts;
    int setEnvPipe[2];
+    bool aborting;
 };

 Leader::Leader(kj::AsyncIoContext &ioContext, kj::Filesystem &fs, const char *jobName, uint runNumber) :
@@ -76,17 +111,21 @@ Leader::Leader(kj::AsyncIoContext &ioContext, kj::Filesystem &fs, const char *jo
    home(fs.getCurrent()),
    rootPath(fs.getCurrentPath()),
    jobName(jobName),
-    runNumber(runNumber)
+    runNumber(runNumber),
+    aborting(false)
 {
    tasks.add(ioContext.unixEventPort.onSignal(SIGTERM).then([this](siginfo_t) {
        while(scripts.size() && (!scripts.front().runOnAbort))
            scripts.pop();
        // TODO: probably shouldn't do this if we are already in a runOnAbort script
        kill(-currentGroupId, SIGTERM);
-        // TODO: wait a few seconds for exit, then send KILL?
+        return this->ioContext.provider->getTimer().afterDelay(2*kj::SECONDS).then([this]{
+            aborting = true;
+            aggressive_recursive_kill(getpid());
+        });
    }));

-    pipe(setEnvPipe);
+    LSYSCALL(pipe(setEnvPipe));
    auto event = ioContext.lowLevelProvider->wrapInputFd(setEnvPipe[0], kj::LowLevelAsyncIoProvider::TAKE_OWNERSHIP);
    auto buffer = kj::heapArrayBuilder<char>(1024);
    tasks.add(readEnvPipe(event, buffer.asPtr().begin()).attach(kj::mv(event), kj::mv(buffer)));
@@ -220,14 +259,18 @@ kj::Promise<void> Leader::reapChildProcesses()
                    // waiting for is done
                    return reapChildProcesses();
                }
+                // we were aborted by the primary process already, just wait until all
+                // SIGKILLs are processed
+                if(aborting) {
+                    return reapChildProcesses();
+                }
                // Otherwise, reparented orphans are on borrowed time
                // TODO list wayward processes?
                fprintf(stderr, "[laminar] sending SIGHUP to adopted child processes\n");
                kill(-currentGroupId, SIGHUP);
                return ioContext.provider->getTimer().afterDelay(5*kj::SECONDS).then([this]{
-                    fprintf(stderr, "[laminar] sending SIGKILL to process group %d\n", currentGroupId);
                    // TODO: should we mark the job as failed if we had to kill reparented processes?
-                    kill(-currentGroupId, SIGKILL);
+                    aggressive_recursive_kill(getpid());
                    return reapChildProcesses();
                }).exclusiveJoin(reapChildProcesses());
            } else if(pid == currentScriptPid) {
--- a/src/log.h
+++ b/src/log.h
@@ -1,5 +1,5 @@
 ///
-/// Copyright 2015-2019 Oliver Giles
+/// Copyright 2015-2020 Oliver Giles
 ///
 /// This file is part of Laminar
 ///
@@ -67,5 +67,7 @@ namespace _ {
    for (::kj::_::Debug::Fault f(__FILE_BASE__, __LINE__, \
      _kjSyscallResult.getErrorNumber(), #call, #__VA_ARGS__, ##__VA_ARGS__);; f.fatal())

+const char* laminar_version();
+
 #endif // LAMINAR_LOG_H_

--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,5 +1,5 @@
 ///
-/// Copyright 2015-2016 Oliver Giles
+/// Copyright 2015-2020 Oliver Giles
 ///
 /// This file is part of Laminar
 ///
@@ -20,9 +20,14 @@
 #include "leader.h"
 #include "server.h"
 #include "log.h"
-#include <signal.h>
+
+#include <fcntl.h>
+#include <iostream>
 #include <kj/async-unix.h>
 #include <kj/filesystem.h>
+#include <signal.h>
+#include <sys/types.h>
+#include <sys/stat.h>

 static Laminar* laminar;
 static Server* server;
@@ -41,6 +46,13 @@ constexpr const char* INTADDR_HTTP_DEFAULT = "*:8080";
 constexpr const char* ARCHIVE_URL_DEFAULT = "/archive/";
 }

+static void usage(std::ostream& out) {
+    out << "laminard version " << laminar_version() << "\n";
+    out << "Usage:\n";
+    out << "  -h|--help       show this help message\n";
+    out << "  -v              enable verbose output\n";
+}
+
 int main(int argc, char** argv) {
    if(argv[0][0] == '{')
        return leader_main();
@@ -48,9 +60,22 @@ int main(int argc, char** argv) {
    for(int i = 1; i < argc; ++i) {
        if(strcmp(argv[i], "-v") == 0) {
            kj::_::Debug::setLogLevel(kj::_::Debug::Severity::INFO);
+        } else if(strcmp(argv[i], "-h") == 0 || strcmp(argv[i], "--help") == 0) {
+            return usage(std::cout), EXIT_SUCCESS;
+        } else {
+            std::cerr << "Unknown argument " << argv[i] << "\n";
+            return usage(std::cerr), EXIT_FAILURE;
        }
    }

+    // The parent process hopefully connected stdin to /dev/null, but
+    // do it again here just in case. This is important because stdin
+    // is inherited to job runs via the leader process, and some
+    // processes misbehave if they can successfully block on reading
+    // from stdin.
+    close(STDIN_FILENO);
+    LASSERT(open("/dev/null", O_RDONLY) == STDIN_FILENO);
+
    auto ioContext = kj::setupAsyncIo();

    Settings settings;
@@ -68,6 +93,8 @@ int main(int argc, char** argv) {
    signal(SIGINT, &laminar_quit);
    signal(SIGTERM, &laminar_quit);

+    printf("laminard version %s started\n", laminar_version());
+
    server->start();

    delete laminar;
--- a/src/resources.cpp
+++ b/src/resources.cpp
@@ -1,5 +1,5 @@
 ///
-/// Copyright 2015-2019 Oliver Giles
+/// Copyright 2015-2020 Oliver Giles
 ///
 /// This file is part of Laminar
 ///
@@ -27,17 +27,17 @@
    extern const char _binary_##name##_z_end[]; \
    resources.emplace(route, Resource{_binary_ ## name ## _z_start, _binary_ ## name ## _z_end, content_type})

-#define CONTENT_TYPE_HTML "text/html; charset=utf-8"
-#define CONTENT_TYPE_ICO  "image/x-icon"
-#define CONTENT_TYPE_PNG  "image/png"
-#define CONTENT_TYPE_JS   "application/javascript; charset=utf-8"
-#define CONTENT_TYPE_CSS  "text/css; charset=utf-8"
+#define CONTENT_TYPE_HTML     "text/html; charset=utf-8"
+#define CONTENT_TYPE_ICO      "image/x-icon"
+#define CONTENT_TYPE_PNG      "image/png"
+#define CONTENT_TYPE_JS       "application/javascript; charset=utf-8"
+#define CONTENT_TYPE_CSS      "text/css; charset=utf-8"
+#define CONTENT_TYPE_MANIFEST "application/manifest+json; charset=utf-8"

 #define GZIP_FORMAT 16

 Resources::Resources()
 {
-    INIT_RESOURCE("/", index_html, CONTENT_TYPE_HTML);
    INIT_RESOURCE("/favicon.ico", favicon_ico, CONTENT_TYPE_ICO);
    INIT_RESOURCE("/favicon-152.png", favicon_152_png, CONTENT_TYPE_PNG);
    INIT_RESOURCE("/icon.png", icon_png, CONTENT_TYPE_PNG);
@@ -47,47 +47,72 @@ Resources::Resources()
    INIT_RESOURCE("/js/vue-router.min.js", js_vue_router_min_js, CONTENT_TYPE_JS);
    INIT_RESOURCE("/js/ansi_up.js", js_ansi_up_js, CONTENT_TYPE_JS);
    INIT_RESOURCE("/js/Chart.min.js", js_Chart_min_js, CONTENT_TYPE_JS);
-    INIT_RESOURCE("/css/bootstrap.min.css", css_bootstrap_min_css, CONTENT_TYPE_CSS);
+    INIT_RESOURCE("/style.css", style_css, CONTENT_TYPE_CSS);
+    INIT_RESOURCE("/manifest.webmanifest", manifest_webmanifest, CONTENT_TYPE_MANIFEST);
+    // Configure the default template
+    setHtmlTemplate(std::string());
+}

-    if(const char* baseUrl = getenv("LAMINAR_BASE_URL")) {
-        // The administrator needs to customize the <base href>. Unfortunately this seems
-        // to be the only thing that needs to be customizable but cannot be done via dynamic
-        // DOM manipulation without heavy compromises. So replace the static char array with
-        // a modified buffer accordingly.
-        z_stream strm;
-        memset(&strm, 0, sizeof(z_stream));
-        std::string tmp;
-        tmp.resize(INDEX_HTML_UNCOMPRESSED_SIZE);
-        // inflate
-        inflateInit2(&strm, MAX_WBITS|GZIP_FORMAT);
-        strm.next_in = (unsigned char*) _binary_index_html_z_start;
-        strm.avail_in = _binary_index_html_z_end - _binary_index_html_z_start;
-        strm.next_out = (unsigned char*) tmp.data();
-        strm.avail_out = INDEX_HTML_UNCOMPRESSED_SIZE;
-        if(inflate(&strm, Z_FINISH) != Z_STREAM_END) {
-            LLOG(FATAL, "Failed to uncompress index_html");
-        }
-        // replace
-        // There's no validation on the replacement string, so you can completely mangle
-        // the html if you like. This isn't really an issue because if you can modify laminar's
-        // environment you already have elevated permissions
-        if(auto it = tmp.find("base href=\"/"))
-            tmp.replace(it+11, 1, baseUrl);
+void Resources::setHtmlTemplate(std::string tmpl) {
+    extern const char _binary_index_html_z_start[];
+    extern const char _binary_index_html_z_end[];
+
+    z_stream strm;
+    memset(&strm, 0, sizeof(z_stream));
+
+    if(!tmpl.empty()) {
        // deflate
-        index_html.resize(tmp.size());
+        index_html.resize(tmpl.size());
        deflateInit2(&strm, Z_DEFAULT_COMPRESSION, Z_DEFLATED, MAX_WBITS|GZIP_FORMAT, 8, Z_DEFAULT_STRATEGY);
-        strm.next_in = (unsigned char*) tmp.data();
-        strm.avail_in = tmp.size();
+        strm.next_in = (unsigned char*) tmpl.data();
+        strm.avail_in = tmpl.size();
        strm.next_out = (unsigned char*) index_html.data();
-        strm.avail_out = tmp.size();
+        strm.avail_out = tmpl.size();
        if(deflate(&strm, Z_FINISH) != Z_STREAM_END) {
            LLOG(FATAL, "Failed to compress index.html");
        }
        index_html.resize(strm.total_out);
-        // update resource map
-        resources["/"].start = index_html.data();
-        resources["/"].end = index_html.data() + index_html.size();
+    } else {
+        // use the default template from compile-time asset
+        if(const char* baseUrl = getenv("LAMINAR_BASE_URL")) {
+            // The administrator needs to customize the <base href>. Unfortunately this seems
+            // to be the only thing that needs to be customizable but cannot be done via dynamic
+            // DOM manipulation without heavy compromises. So replace the static char array with
+            // a modified buffer accordingly.
+            std::string tmp;
+            tmp.resize(INDEX_HTML_UNCOMPRESSED_SIZE);
+            // inflate
+            inflateInit2(&strm, MAX_WBITS|GZIP_FORMAT);
+            strm.next_in = (unsigned char*) _binary_index_html_z_start;
+            strm.avail_in = _binary_index_html_z_end - _binary_index_html_z_start;
+            strm.next_out = (unsigned char*) tmp.data();
+            strm.avail_out = INDEX_HTML_UNCOMPRESSED_SIZE;
+            if(inflate(&strm, Z_FINISH) != Z_STREAM_END) {
+                LLOG(FATAL, "Failed to uncompress index_html");
+            }
+            // replace
+            // There's no validation on the replacement string, so you can completely mangle
+            // the html if you like. This isn't really an issue because if you can modify laminar's
+            // environment you already have elevated permissions
+            if(auto it = tmp.find("base href=\"/"))
+                tmp.replace(it+11, 1, baseUrl);
+            // deflate
+            index_html.resize(tmp.size());
+            deflateInit2(&strm, Z_DEFAULT_COMPRESSION, Z_DEFLATED, MAX_WBITS|GZIP_FORMAT, 8, Z_DEFAULT_STRATEGY);
+            strm.next_in = (unsigned char*) tmp.data();
+            strm.avail_in = tmp.size();
+            strm.next_out = (unsigned char*) index_html.data();
+            strm.avail_out = tmp.size();
+            if(deflate(&strm, Z_FINISH) != Z_STREAM_END) {
+                LLOG(FATAL, "Failed to compress index.html");
+            }
+            index_html.resize(strm.total_out);
+        } else {
+            index_html = std::string(_binary_index_html_z_start, _binary_index_html_z_end);
+        }
    }
+    // update resource map
+    resources["/"] = Resource{index_html.data(), index_html.data() + index_html.size(), CONTENT_TYPE_HTML};
 }

 inline bool beginsWith(std::string haystack, const char* needle) {
@@ -97,7 +122,7 @@ inline bool beginsWith(std::string haystack, const char* needle) {
 bool Resources::handleRequest(std::string path, const char** start, const char** end, const char** content_type) {
    // need to keep the list of "application links" synchronised with the angular
    // application. We cannot return a 404 for any of these
-    auto it = beginsWith(path,"/jobs")
+    auto it = beginsWith(path,"/jobs") || path == "/wallboard"
            ? resources.find("/")
            : resources.find(path);

--- a/src/resources.h
+++ b/src/resources.h
@@ -34,6 +34,9 @@ public:
    // type. Function returns false if no resource for the given path exists
    bool handleRequest(std::string path, const char** start, const char** end, const char** content_type);

+    // Allows providing a custom HTML template. Pass an empty string to use the default.
+    void setHtmlTemplate(std::string templ = std::string());
+
 private:
    struct Resource {
        const char* start;
--- a/src/resources/index.html
+++ b/src/resources/index.html
@@ -1,5 +1,5 @@
 <!doctype html>
-<html>
+<html lang="en">
 <head>
 <base href="/">
 <meta charset="utf-8">
@@ -8,334 +8,218 @@
 <meta name="apple-mobile-web-app-capable" content="yes" />
 <link rel="apple-touch-icon-precomposed" href="favicon-152.png">
 <link rel="icon" href="favicon.ico">
+ <link rel="manifest" href="/manifest.webmanifest">
 <title>Laminar</title>
 <script src="js/vue.min.js"></script>
 <script src="js/vue-router.min.js"></script>
 <script src="js/ansi_up.js"></script>
 <script src="js/Chart.min.js"></script>
- <link href="css/bootstrap.min.css" rel="stylesheet">
- <link href="custom/style.css" rel="stylesheet">
 <script src="js/app.js" defer></script>
- <style>
-  body, html { height: 100%; }
-  .navbar { margin-bottom: 0; border-radius: 0; }
-  .navbar-brand { margin: 0 -15px; padding: 7px 15px }
-  .navbar-brand>img { display: inline; }
-  a.navbar-btn { color: #9d9d9d; }
-  a.navbar-btn.active { color: #fff; }
-  a.navbar-btn:hover { color: #fff; text-decoration: none; }
-  a.navbar-btn:focus { color: #fff; }
-  .bell { margin: 8px 15px; color: #9d9d9d; }
-  .bell:hover { text-decoration: none; color: #9d9d9d; cursor: pointer; }
-  .bell.active { color: #333; }
-  dt,dd { line-height: 2; }
-  canvas {
-   width: 100% !important;
-   max-width: 800px;
-   height: auto !important;
-  }
-  .progress {
-   height: 10px;
-   margin-top: 5px;
-   margin-bottom: 0;
-  }
-  table#joblist tr:first-child td { border-top: 0; }
-  #popup-connecting {
-    position: fixed;
-    background: white;
-    border: 1px solid #ddd;
-    bottom: 10px;
-    right: 10px;
-    padding: 20px;
-  }
-  /* status icons */
-  span.status {
-    display: inline-block;
-    width: 1em;
-    text-align: center;
-    font-family: sans-serif;
-  }
-  span.success { color: forestgreen; }
-  span.failed { color: firebrick; }
-  span.aborted { color: indigo; }
-  span.spin {
-    color: steelblue;
-    animation: 2s linear infinite spin;
-  }
-  @keyframes spin {
-    to { transform: rotate(360deg); }
-  }
-  /* chart overlay */
-  li.chart-overlay {
-    position: absolute;
-    display: inline-block;
-    background: white;
-    border: 1px solid lightgray;
-    padding: 3px;
-  }
-  /* sort indicators */
-  a.sort {
-    position: relative;
-    margin-left: 7px;
-  }
-  a.sort:before, a.sort:after {
-    border: 4px solid transparent;
-    content: "";
-    position: absolute;
-    display: block;
-    height: 0;
-    width: 0;
-    right: 0;
-    top: 50%;
-  }
-  a.sort:before {
-    border-bottom-color: #ccc;
-    margin-top: -9px;
-  }
-  a.sort:after {
-    border-top-color: #ccc;
-    margin-top: 1px;
-  }
-  a.sort.dsc:after { border-top-color: #000; }
-  a.sort.asc:before { border-bottom-color: #000; }
-  a.sort:hover { text-decoration: none; cursor:pointer; }
-  a.sort:not(.asc):hover:before { border-bottom-color: #777;  }
-  a.sort:not(.dsc):hover:after { border-top-color: #777;  }

- </style>
+ <link href="style.css" rel="stylesheet">
+ <link href="custom/style.css" rel="stylesheet">
 </head>
 <body>
- <template id="home"><div>
-  <ol class="breadcrumb"><li class="active">Home</li></ol>
-  <div class="container-fluid"><div class="row">
-   <div class="col-sm-5 col-md-4 col-lg-3 dash">
-    <table class="table table-bordered">
-     <tr v-for="job in jobsQueued">
-      <td><router-link :to="'/jobs/'+job.name">{{job.name}}</router-link> <i>queued</i></td>
-     </tr>
-     <tr v-for="job in jobsRunning">
-      <td><span v-html="runIcon(job.result)"></span> <router-link :to="'/jobs/'+job.name">{{job.name}}</router-link> <router-link :to="'/jobs/'+job.name+'/'+job.number">#{{job.number}}</router-link>
-       <small class="pull-right">{{formatDuration(job.started, job.completed)}}</small>
-       <div class="progress">
-         <div class="progress-bar progress-bar-striped" :class="'progress-bar-'+(job.overtime?'warning':'info')" :class="job.etc?'':'active'" :style="'width:'+(!job.etc?'100':job.progress)+'%'"></div>
-       </div>
-      </td>
-     </tr>
-     <tr v-for="job in jobsRecent">
-      <td><span v-html="runIcon(job.result)"></span> <router-link :to="'/jobs/'+job.name">{{job.name}}</router-link> <router-link :to="'/jobs/'+job.name+'/'+job.number">#{{job.number}}</router-link><br><small>Took {{formatDuration(job.started, job.completed)}} at {{formatDate(job.started)}}</small></td>
-     </tr>
-    </table>
+ <template id="home"><div id="page-home-main">
+  <nav>
+   <table class="table striped">
+    <tr v-for="job in jobsQueued">
+     <td><router-link  :to="'/jobs/'+job.name">{{job.name}}</router-link> <i>queued</i></td>
+    </tr>
+    <tr v-for="job in jobsRunning">
+     <td>
+      <span v-html="runIcon(job.result)"></span>
+      <router-link :to="'/jobs/'+job.name">{{job.name}}</router-link>
+      <router-link :to="'/jobs/'+job.name+'/'+job.number">#{{job.number}}</router-link>
+      <small style="float:right;">{{formatDuration(job.started, job.completed)}}</small>
+      <div class="progress" style="margin-top: 5px;">
+       <div class="progress-bar" :class="{overtime:job.overtime,indeterminate:!job.etc}" :style="job.etc && {width:job.progress+'%'}"></div>
+      </div>
+     </td>
+    </tr>
+    <tr v-for="job in jobsRecent">
+     <td>
+      <span v-html="runIcon(job.result)"></span>
+      <router-link :to="'/jobs/'+job.name">{{job.name}}</router-link>
+      <router-link :to="'/jobs/'+job.name+'/'+job.number">#{{job.number}}</router-link><br>
+      <small>Took {{formatDuration(job.started, job.completed)}} at {{formatDate(job.started)}}</small>
+     </td>
+    </tr>
+   </table>
+  </nav>
+  <section style="border-left: 1px solid #d0d0d0;">
+   <div id="page-home-stats">
+    <div>
+     <h3>Recent regressions</h3>
+     <table>
+      <tr v-for="job in resultChanged" v-if="job.lastFailure>job.lastSuccess"><td><router-link :to="'/jobs/'+job.name+'/'+job.lastFailure">{{job.name}} #{{job.lastFailure}}</router-link> since <router-link :to="'/jobs/'+job.name+'/'+job.lastSuccess">#{{job.lastSuccess}}</router-link></tr>
+     </table>
+    </div>
+    <div>
+     <h3>Low pass rates</h3>
+     <table>
+      <tr v-for="job in lowPassRates"><td><router-link :to="'/jobs/'+job.name">{{job.name}}</router-link></td><td>{{Math.round(job.passRate*100)}}&nbsp;%</td></tr>
+     </table>
+    </div>
+    <div>
+     <h3>Utilization</h3>
+     <div><canvas id="chartUtil"></canvas></div>
+    </div>
   </div>
-   <div class="col-sm-7 col-md-8 col-lg-9"><div class="row">
-    <div class="col-md-6">
-     <div class="panel panel-default">
-      <div class="panel-heading">Total runs per day this week</div>
-      <div class="panel-body">
-       <canvas id="chartBpd"></canvas>
-      </div>
-     </div>
-    </div>
-    <div class="col-md-6">
-     <div class="panel panel-default">
-      <div class="panel-heading">Most runs per job in the last 24 hours</div>
-      <div class="panel-body" id="chartStatus">
-       <canvas id="chartBpj"></canvas>
-      </div>
-     </div>
-    </div></div><div class="row">
-    <div class="col-md-6">
-     <div class="panel panel-default">
-      <div class="panel-heading">Longest average run time per job this week</div>
-      <div class="panel-body">
-       <canvas id="chartTpj"></canvas>
-      </div>
-     </div>
-    </div>
-    <div class="col-md-6">
-     <div class="panel panel-default">
-      <div class="panel-heading">Current executor utilization</div>
-      <div class="panel-body">
-       <canvas id="chartUtil"></canvas>
-      </div>
-     </div>
-    </div></div><div class="row">
-    <div class="col-md-6">
-     <div class="panel panel-default">
-      <div class="panel-heading">Regressions and recoveries</div>
-      <div class="panel-body"><div style="position:relative">
-       <canvas id="chartResultChanges"></canvas>
-       <ul v-for="job in resultChanged">
-         <li v-if="job.lastFailure>job.lastSuccess" :id="'rcd_'+job.name" class="chart-overlay"><router-link :to="'/jobs/'+job.name">{{job.name}}</router-link>: <span v-html="runIcon('failed')"></span> <router-link :to="'/jobs/'+job.name+'/'+job.lastFailure">#{{job.lastFailure}}</router-link> since <span v-html="runIcon('success')"></span> <router-link :to="'/jobs/'+job.name+'/'+job.lastSuccess">#{{job.lastSuccess}}</router-link></li>
-         <li v-if="job.lastFailure<job.lastSuccess" :id="'rcd_'+job.name" class="chart-overlay"><router-link :to="'/jobs/'+job.name">{{job.name}}</router-link>: <span v-html="runIcon('success')"></span> <router-link :to="'/jobs/'+job.name+'/'+job.lastSuccess">#{{job.lastSuccess}}</router-link> since <span v-html="runIcon('failed')"></span> <router-link :to="'/jobs/'+job.name+'/'+job.lastFailure">#{{job.lastFailure}}</router-link></li>
-       </ul>
-      </div></div>
-     </div>
-    </div>
-    <div class="col-md-6">
-     <div class="panel panel-default">
-      <div class="panel-heading">Low pass rates</div>
-      <div class="panel-body">
-       <canvas id="chartPassRates"></canvas>
-      </div>
-     </div>
-    </div></div><div class="row">
-    <div class="col-md-6">
-     <div class="panel panel-default">
-      <div class="panel-heading">Run time changes</div>
-      <div class="panel-body">
-       <canvas id="chartBuildTimeChanges"></canvas>
-      </div>
-     </div>
-    </div>
-    <div class="col-md-6">
-     <div class="panel panel-default">
-      <div class="panel-heading">Average run time distribution</div>
-      <div class="panel-body">
-       <canvas id="chartBuildTimeDist"></canvas>
-      </div>
-     </div>
-    </div>
-   </div></div>
-  </div></div> 
+   <div id="page-home-plots">
+    <div><canvas id="chartBpd"></canvas></div>
+    <div><canvas id="chartBpj"></canvas></div>
+    <div><canvas id="chartTpj"></canvas></div>
+    <div><canvas id="chartBuildTimeChanges"></canvas></div>
+   </div>
+  </section>
 </div></template>
- 
+  
 <template id="jobs"><div>
-  <ol class="breadcrumb"><li><router-link to="/">Home</router-link></li><li class="active">Jobs</li></ol>
-  <div class="container-fluid"><div class="row">
-   <div class="col-xs-12">
-    <div class="pull-right">
-     <input class="form-control" id="jobFilter" v-model="search" placeholder="Filter...">
-    </div>
-    <ul class="nav nav-tabs">
-     <li v-show="ungrouped.length" :class="{'active':group==null}"><a href v-on:click.prevent="group = null">Ungrouped Jobs</a></li>
-     <li v-for="g in Object.keys(groups)" :class="{'active':g==group}"><a href v-on:click.prevent="group = g">{{g}}</a></li>
-    </ul>
-    <table class="table table-striped" id="joblist">
-     <tr   v-for="job in filteredJobs()">
-      <td><router-link :to="'/jobs/'+job.name">{{job.name}}</router-link></td>
-      <td class="text-center"><span v-html="runIcon(job.result)"></span> <router-link :to="'/jobs/'+job.name+'/'+job.number">#{{job.number}}</router-link></td>
-      <td class="text-center">{{formatDate(job.started)}}</td>
-      <td class="text-center">{{formatDuration(job.started,job.completed)}}</td>
-     </tr>
-    </table>
+  <nav style="display: grid; grid-auto-flow: column; justify-content: space-between; align-items: end; padding: 10px 15px;">
+   <div style="display:grid; grid-auto-flow: column; grid-gap: 15px; padding: 5px 0;">
+    <a v-show="ungrouped.length" :class="{'active':group==null}" href v-on:click.prevent="group = null">Ungrouped Jobs</a>
+    <a v-for="g in Object.keys(groups)" :class="{'active':g==group}" href v-on:click.prevent="group = g">{{g}}</a>
   </div>
-  </div></div>
+   <div style="display: grid; grid-auto-flow: column; align-items: center; gap: 15px">
+    <router-link :to="wallboardLink()" style="display: inherit;" title="Wallboard">
+     <svg width="18" viewBox="0 0 13 13">
+      <g fill="#728494">
+       <rect x="0" y="2" width="6" height="4" />
+       <rect x="0" y="7" width="6" height="4" />
+       <rect x="7" y="2" width="6" height="4" />
+       <rect x="7" y="7" width="6" height="4" />
+      </g>
+     </svg>
+    </router-link>
+    <input class="form-control" id="jobFilter" v-model="search" placeholder="Filter...">
+   </div>
+  </nav>
+  <table class="striped" id="job-list">
+    <tr v-for="job in filteredJobs()">
+    <td><router-link :to="'/jobs/'+job.name">{{job.name}}</router-link></td>
+    <td style="white-space: nowrap;"><span v-html="runIcon(job.result)"></span> <router-link :to="'/jobs/'+job.name+'/'+job.number">#{{job.number}}</router-link></td>
+    <td>{{formatDate(job.started)}}</td>
+    <td>{{formatDuration(job.started,job.completed)}}</td>
+    </tr>
+  </table>
 </div></template>
 
- <template id="job"><div>
-  <ol class="breadcrumb"><li><router-link to="/">Home</router-link></li><li><router-link to="/jobs">Jobs</router-link></li><li class="active">{{$route.params.name}}</li></ol></ol>
-  <div class="container-fluid">
-   <div class="row">
-    <div class="col-sm-5 col-md-6 col-lg-7">
-    <h3>{{$route.params.name}}</h3>
-    <div v-html="description"></div>
-    <dl class="dl-horizontal">
-     <dt>Last Successful Run</dt>
-     <dd><router-link v-if="lastSuccess" :to="'/jobs/'+$route.params.name+'/'+lastSuccess.number">#{{lastSuccess.number}}</router-link> {{lastSuccess?' - at '+formatDate(lastSuccess.started):'never'}}</dd>
-     <dt>Last Failed Run</dt>
-     <dd><router-link v-if="lastFailed" :to="'/jobs/'+$route.params.name+'/'+lastFailed.number">#{{lastFailed.number}}</router-link> {{lastFailed?' - at '+formatDate(lastFailed.started):'never'}}</dd>
-    </dl>
-    </div>
-    <div class="col-sm-7 col-md-6 col-lg-5">
-    <div class="panel panel-default">
-      <div class="panel-heading">Build time</div>
-      <div class="panel-body">
-      <canvas id="chartBt"></canvas>
-      </div>
-    </div>
-    </div>
+ <template id="wallboard"><div class="wallboard">
+  <router-link :to="'/jobs/'+job.name+'/'+job.number" tag="div" v-for="job in wallboardJobs()" :data-result="job.result">
+   <span style="font-size: 36px; font-weight: bold;">{{job.name}} #{{job.number}}</span><br>
+   <span style="font-size: 30px;">{{formatDate(job.started)}}</span><br>
+   <span style="font-size: 26px;">{{job.reason}}</span>
+  </router-link>
+ </div></template>
+
+ <template id="job"><div id="page-job-main">
+  <div style="padding: 15px;">
+   <h2>{{$route.params.name}}</h2>
+   <div v-html="description"></div>
+   <dl>
+    <dt>Last Successful Run</dt>
+    <dd><router-link v-if="lastSuccess" :to="'/jobs/'+$route.params.name+'/'+lastSuccess.number">#{{lastSuccess.number}}</router-link> {{lastSuccess?' - at '+formatDate(lastSuccess.started):'never'}}</dd>
+    <dt>Last Failed Run</dt>
+    <dd><router-link v-if="lastFailed" :to="'/jobs/'+$route.params.name+'/'+lastFailed.number">#{{lastFailed.number}}</router-link> {{lastFailed?' - at '+formatDate(lastFailed.started):'never'}}</dd>
+   </dl>
+  </div>
+  <div style="display: grid; justify-content: center; padding: 15px;">
+   <canvas id="chartBt"></canvas>
+  </div>
+  <div style="grid-column: 1/-1">
+   <table class="striped">
+    <thead><tr>
+     <th><a class="sort" :class="(sort.field=='result'?sort.order:'')" v-on:click="do_sort('result')">&nbsp;</a></th>
+     <th>Run <a class="sort" :class="(sort.field=='number'?sort.order:'')" v-on:click="do_sort('number')">&nbsp;</a></th>
+     <th class="text-center">Started <a class="sort" :class="(sort.field=='started'?sort.order:'')" v-on:click="do_sort('started')">&nbsp;</a></th>
+     <th class="text-center">Duration <a class="sort" :class="(sort.field=='duration'?sort.order:'')" v-on:click="do_sort('duration')">&nbsp;</a></th>
+     <th class="text-center vp-sm-hide">Reason <a class="sort" :class="(sort.field=='reason'?sort.order:'')" v-on:click="do_sort('reason')">&nbsp;</a></th>
+    </tr></thead>
+    <tr v-show="nQueued">
+     <td style="width:1px"><span v-html="runIcon('queued')"></span></td>
+     <td colspan="4"><i>{{nQueued}} run(s) queued</i></td>
+    </tr>
+    <tr v-for="job in jobsRunning.concat(jobsRecent)" track-by="$index">
+     <td style="width:1px"><span v-html="runIcon(job.result)"></span></td>
+     <td><router-link :to="'/jobs/'+$route.params.name+'/'+job.number">#{{job.number}}</router-link></td>
+     <td class="text-center">{{formatDate(job.started)}}</td>
+     <td class="text-center">{{formatDuration(job.started, job.completed)}}</td>
+     <td class="text-center vp-sm-hide">{{job.reason}}</td>
+    </tr>
+   </table>
+   <div style="float: right; margin: 15px; display: inline-grid; grid-auto-flow: column; gap: 10px; align-items: center">
+    <button v-on:click="page_prev" :disabled="sort.page==0">&laquo;</button>
+    <span>Page {{sort.page+1}} of {{pages}}</span>
+    <button class="btn" v-on:click="page_next" :disabled="sort.page==pages-1">&raquo;</button>
   </div>
-   <div class="row"><div class="col-xs-12">
-    <table class="table table-striped">
-     <thead><tr>
-      <th><a class="sort" :class="(sort.field=='result'?sort.order:'')" v-on:click="do_sort('result')">&nbsp;</a></th>
-      <th>Run <a class="sort" :class="(sort.field=='number'?sort.order:'')" v-on:click="do_sort('number')">&nbsp;</a></th>
-      <th class="text-center">Started <a class="sort" :class="(sort.field=='started'?sort.order:'')" v-on:click="do_sort('started')">&nbsp;</a></th>
-      <th class="text-center">Duration <a class="sort" :class="(sort.field=='duration'?sort.order:'')" v-on:click="do_sort('duration')">&nbsp;</a></th>
-      <th class="text-center hidden-xs">Reason <a class="sort" :class="(sort.field=='reason'?sort.order:'')" v-on:click="do_sort('reason')">&nbsp;</a></th>
-     </tr></thead>
-     <tr v-show="nQueued">
-      <td colspan="5"><i>{{nQueued}} run(s) queued</i></td>
-     </tr>
-     <tr v-for="job in jobsRunning" track-by="$index">
-      <td style="width:1px"><span v-html="runIcon(job.result)"></span></td>
-      <td><router-link :to="'/jobs/'+$route.params.name+'/'+job.number">#{{job.number}}</router-link></td>
-      <td class="text-center">{{formatDate(job.started)}}</td>
-      <td class="text-center">{{formatDuration(job.started, job.completed)}}</td>
-      <td class="text-center hidden-xs">{{job.reason}}</td>
-     </tr>
-     <tr v-for="job in jobsRecent" track-by="$index">
-      <td style="width:1px"><span v-html="runIcon(job.result)"></span></td>
-      <td><router-link :to="'/jobs/'+$route.params.name+'/'+job.number">#{{job.number}}</router-link></td>
-      <td class="text-center">{{formatDate(job.started)}}</td>
-      <td class="text-center">{{formatDuration(job.started, job.completed)}}</td>
-      <td class="text-center hidden-xs">{{job.reason}}</td>
-     </tr>
-    </table>
-    <ul class="pagination pull-right">
-      <li><button class="btn btn-default" v-on:click="page_prev" :disabled="sort.page==0">&laquo;</button></li>
-      <li>Page {{sort.page+1}} of {{pages}}</li>
-      <li><button class="btn btn-default" v-on:click="page_next" :disabled="sort.page==pages-1">&raquo;</button></li>
-    </ul>
-   </div></div>
  </div>
 </div></template>
 
- <template id="run"><div>
-  <ol class="breadcrumb"><li><router-link to="/">Home</router-link></li><li><router-link to="/jobs">Jobs</router-link></li><li><router-link :to="'/jobs/'+$route.params.name">{{$route.params.name}}</router-link></li><li class="active">#{{$route.params.number}}</li></ol></ol>
-  <div class="container-fluid">
-   <div class="row">
-    <div class="col-sm-5 col-md-6 col-lg-7">
-     <h3 style="float:left"><span v-html="runIcon(job.result)"></span> {{$route.params.name}} #{{$route.params.number}}</h3>
-     <nav class="pull-left">
-      <ul class="pagination" style="margin:15px 20px">
-       <li v-show="$route.params.number > 1"><router-link :to="'/jobs/'+$route.params.name+'/'+($route.params.number-1)">&laquo;</router-link></li>
-       <li v-show="latestNum > $route.params.number"><router-link :to="'/jobs/'+$route.params.name+'/'+(parseInt($route.params.number)+1)">&raquo;</router-link></li>
-      </ul>
-     </nav>
-     <div style="clear:both;"></div>
-     <dl class="dl-horizontal">
-      <dt>Reason</dt><dd>{{job.reason}}</dd>
-      <dt v-show="job.upstream.num > 0">Upstream</dt><dd v-show="job.upstream.num > 0"><router-link :to="'/jobs/'+job.upstream.name">{{job.upstream.name}}</router-link> <router-link :to="'/jobs/'+job.upstream.name+'/'+job.upstream.num">#{{job.upstream.num}}</router-link></li></dd>
-      <dt>Queued for</dt><dd>{{job.queued}}s</dd>
-      <dt>Started</dt><dd>{{formatDate(job.started)}}</dd>
-      <dt v-show="runComplete(job)">Completed</dt><dd v-show="job.completed">{{formatDate(job.completed)}}</dd>
-      <dt>Duration</dt><dd>{{formatDuration(job.started, job.completed)}}</dd>
-     </dl>
-    </div>
-    <div class="col-sm-7 col-md-6 col-lg-5">
-     <div class="progress" v-show="job.result == 'running'">
-      <div class="progress-bar  progress-bar-striped" :class="'progress-bar-'+(job.overtime?'warning':'info')" :class="job.etc?'':'active'" :style="{width:!job.etc?100:job.progress + '%'}"></div>
-     </div>
-     <div class="panel panel-default" v-show="job.artifacts.length">
-      <div class="panel-heading">Artifacts</div>
-      <div class="panel-body">
-       <ul class="list-unstyled" style="margin-bottom: 0">
-        <li v-for="art in job.artifacts"><a :href="art.url" target="_self">{{art.filename}}</a> [{{ art.size | iecFileSize }}]</li>
-       </ul>
-      </div>
-     </div>
+ <template id="run"><div style="display: grid; grid-template-rows: auto 1fr">
+  <div style="padding: 15px">
+   <div style="display: grid; grid-template-columns: auto 25px auto auto 1fr 400px; gap: 5px; align-items: center">
+    <h2 style="white-space: nowrap"><span v-html="runIcon(job.result)"></span> {{$route.params.name}} #{{$route.params.number}}</h2>
+    <span></span>
+    <router-link :disabled="$route.params.number == 1" :to="'/jobs/'+$route.params.name+'/'+($route.params.number-1)" tag="button">&laquo;</router-link>
+    <router-link :disabled="$route.params.number == latestNum" :to="'/jobs/'+$route.params.name+'/'+(parseInt($route.params.number)+1)" tag="button">&raquo;</router-link>
+    <span></span>
+    <div class="progress" v-show="job.result == 'running'">
+     <div class="progress-bar" :class="{overtime:job.overtime,indeterminate:!job.etc}" :style="job.etc && {width:job.progress+'%'}"></div>
    </div>
   </div>
-   <div class="row"><div class="col-xs-12">
-    <button type="button" class="btn btn-default btn-xs pull-right" :class="{'active':autoscroll}" v-on:click="autoscroll = !autoscroll" style="margin-top:10px">Autoscroll</button>
-    <h4>Console output</h4>
-    <pre v-html="log"></pre>
-   </div></div>
+   <div id="page-run-detail">
+    <dl>
+     <dt>Reason</dt><dd>{{job.reason}}</dd>
+     <dt v-show="job.upstream.num > 0">Upstream</dt><dd v-show="job.upstream.num > 0"><router-link :to="'/jobs/'+job.upstream.name">{{job.upstream.name}}</router-link> <router-link :to="'/jobs/'+job.upstream.name+'/'+job.upstream.num">#{{job.upstream.num}}</router-link></li></dd>
+     <dt>Queued for</dt><dd>{{formatDuration(job.queued, job.started ? job.started : Math.floor(Date.now()/1000))}}</dd>
+     <dt v-show="job.started">Started</dt><dd v-show="job.started">{{formatDate(job.started)}}</dd>
+     <dt v-show="runComplete(job)">Completed</dt><dd v-show="job.completed">{{formatDate(job.completed)}}</dd>
+     <dt v-show="job.started">Duration</dt><dd v-show="job.started">{{formatDuration(job.started, job.completed)}}</dd>
+    </dl>
+    <dl v-show="job.artifacts.length">
+     <dt>Artifacts</dt>
+     <dd>
+      <ul style="margin-bottom: 0">
+       <li v-for="art in job.artifacts"><a :href="art.url" target="_self">{{art.filename}}</a> [{{ art.size | iecFileSize }}]</li>
+      </ul>
+     </dd>
+    </dl>
+   </div>
+  </div>
+  <div class="console-log">
+   <code v-html="log"></code>
+   <span v-show="job.result == 'running'" v-html="runIcon('running')" style="display: block;"></span>
  </div>
 </div></template>

- <div id="app">
-  <nav class="navbar navbar-inverse">
-   <div>
-    <router-link to="/" class="navbar-brand"><img src="icon.png">{{title}}</router-link>
-    <router-link to="/jobs" class="btn navbar-btn pull-right">Jobs</router-link>
+ <main id="app" style="display: grid; grid-template-rows: auto 1fr auto; height: 100%;">
+  <nav id="nav-top" style="display: grid; grid-template-columns: auto auto 1fr auto auto; grid-gap: 15px;">
+   <router-link to="/" style="display: grid; grid-auto-flow: column; align-items: center; margin: 5px; font-size: 20px;">
+    <img src="icon.png"> {{title}}
+   </router-link>
+   <div id="nav-top-links" style="display: grid; grid-auto-flow: column; justify-content: start; gap: 15px; padding: 0 15px; align-items: center; font-size: 16px;">
+    <router-link to="/jobs">Jobs</router-link>
+    <router-link v-for="(crumb,i) in _route.path.slice(1).split('/').slice(1,-1)" :to="_route.path.split('/').slice(0,i+3).join('/')">{{crumb}}</router-link>
+   </div>
+   <div></div>
+   <span class="version">{{version}}</span>
+   <div style="display: grid; align-items: center; padding: 0 15px">
+    <a v-on:click="toggleNotifications(!notify)" class="nav-icon" :class="{active:notify}" v-show="supportsNotifications" :title="(notify?'Disable':'Enable')+' notifications'">
+     <svg width="18" viewBox="0 0 12 12">
+      <g stroke-width="0.5">
+       <path d="m 6,9 c -1,0 -1,0 -1,1 0,1 2,1 2,0 0,-1 0,-1 -1,-1 z" />
+       <path d="m 1,10 c 3,-3 1,-9 5,-9 4,0 2,6 5,9 1,1 -3,-1 -5,-1 -2,0 -6,2 -5,1 z" />
+      </g>
+     </svg>
+    </a>
   </div>
  </nav>
-  <a v-on:click="toggleNotifications(!notify)" v-show="supportsNotifications" class="bell pull-right" :class="{'active':notify}" :title="(notify?'Disable':'Enable')+' notifications'">&#128276;</a>
  <router-view></router-view>
-  <div v-show="!connected" id="popup-connecting"><span class="status spin">⚙&#xfe0e;</span>&nbsp;Connecting...</div>
- </div>
+  <div id="connecting-overlay" :class="{shown:!connected}">
+   <div><span v-html="runIcon('running')"></span> Connecting...</div>
+  </div>
+ </main>
 </body>
 </html>

--- a/src/resources/js/app.js
+++ b/src/resources/js/app.js
--- a/src/resources/manifest.webmanifest
+++ b/src/resources/manifest.webmanifest
@@ -0,0 +1,21 @@
+{
+  "short_name": "Laminar",
+  "name": "Laminar",
+  "description": "Lightweight Continuous Integration",
+  "icons": [
+    {
+      "src": "/icon.png",
+      "type": "image/png",
+      "sizes": "36x36"
+    },
+    {
+      "src": "/favicon-152.png",
+      "type": "image/png",
+      "sizes": "152x152"
+    }
+  ],
+  "start_url": "/",
+  "background_color": "#2F3340",
+  "display": "standalone",
+  "scope": "/"
+}
--- a/src/resources/style.css
+++ b/src/resources/style.css
@@ -0,0 +1,293 @@
+/* colour scheme */
+:root {
+ --main-bg: #fff;
+ --main-fg: #333;
+ --nav-bg: #2F3340;
+ --nav-bg-darker: #292b33;
+ --nav-fg: #d0d0d0;
+ --nav-fg-light: #fafafa;
+ --icon-enabled: #d8cb83;
+ --success: #74af77;
+ --failure: #883d3d;
+ --running: #4786ab;
+ --warning: #de9a34;
+ --link-fg: #2f4579;
+ --console-bg: #313235;
+ --console-fg: #fff;
+ --alt-row-bg: #fafafa;
+ --border-grey: #d0d0d0;
+}
+
+/* basic resets */
+html { box-sizing: border-box; }
+*, *:before, *:after { box-sizing: inherit; }
+body, h1, h2, h3, h4, h5, h6, p, ol, ul {
+ margin: 0;
+ padding: 0;
+ font-weight: normal;
+}
+ol, ul { list-style: none; } 
+body, html { height: 100%; }
+body {
+ font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+ font-size: 16px;
+ color: var(--main-fg);
+}
+
+/* main header bar */
+#nav-top         { background-color: var(--nav-bg); }
+#nav-top-links   { background-color: var(--nav-bg-darker); }
+#nav-top a       { color: var(--nav-fg); }
+#nav-top a:hover { color: white; text-decoration: none; }
+
+.version {
+ align-self: center;
+ font-size: x-small;
+ color: rgba(255,255,255,0.3);
+}
+
+/* navbar svg icons (enable notifications) */
+.nav-icon            { display: inherit; }
+.nav-icon svg        { fill: var(--nav-fg); stroke: #000; }
+.nav-icon:hover      { cursor: pointer; }
+.nav-icon:hover svg  { fill: var(--nav-fg-light); }
+.nav-icon.active svg { fill: var(--icon-enabled); }
+
+/* anchors */  
+a              { color: var(--link-fg); text-decoration: none; }
+a:visited      { color: var(--link-fg); }
+a:active       { color: var(--link-fg); }
+a:hover        { text-decoration: underline; }
+
+/* charts */
+canvas {
+ width: 100% !important;
+ max-width: 800px;
+ height: auto !important;
+}
+
+#popup-connecting {
+ position: fixed;
+ background: white;
+ border: 1px solid #ddd;
+ bottom: 10px;
+ right: 10px;
+ padding: 20px;
+}
+
+/* status icons */
+.status {
+ display: inline-block;
+ width: 1em;
+ vertical-align: middle;
+ margin-top: -2px; /* pixel-pushing */
+}
+svg.success path   { fill: var(--success); }
+svg.failed path    { fill: var(--failure); }
+svg.running circle { stroke: var(--running); }
+svg.queued circle  { fill: var(--nav-fg); }
+svg.queued path    { stroke: white; }
+
+/* sort indicators */
+a.sort {
+ position: relative;
+ margin-left: 7px;
+}
+a.sort:before, a.sort:after {
+ border: 4px solid transparent;
+ content: "";
+ position: absolute;
+ display: block;
+ height: 0;
+ width: 0;
+ right: 0;
+ top: 50%;
+}
+a.sort:before {
+ border-bottom-color: var(--border-grey);
+ margin-top: -9px;
+}
+a.sort:after {
+ border-top-color: var(--border-grey);
+ margin-top: 1px;
+}
+a.sort.dsc:after { border-top-color: var(--main-fg); }
+a.sort.asc:before { border-bottom-color: var(--main-fg); }
+a.sort:hover { text-decoration: none; cursor:pointer; }
+a.sort:not(.asc):hover:before { border-bottom-color: var(--main-fg);  }
+a.sort:not(.dsc):hover:after { border-top-color: var(--main-fg);  }
+
+/* job group tabs */
+a.active { color: var(--main-fg); }
+a.active:hover { text-decoration: none; }
+
+/* run console output */
+.console-log { padding: 15px; background-color: var(--console-bg); }
+.console-log code { white-space: pre-wrap; color: var(--console-fg); }
+.console-log a { color: var(--console-fg); }
+
+/* text input (job filtering) */
+input { padding: 5px 8px; }
+
+/* description list (run detail) */
+dl { display: grid; grid-template-columns: auto 1fr; }
+dt { text-align: right; font-weight: bold; min-width: 85px; }
+dt,dd { line-height: 2; }
+  
+/* tables */
+table { border-spacing: 0; width: 100%; }
+th { text-align: left; border-bottom: 1px solid var(--border-grey); }
+td, th { padding: 8px; }
+table.striped td { border-top: 1px solid var(--border-grey); }
+table.striped tr:nth-child(even) { background-color: var(--alt-row-bg); }
+td:first-child, th:first-child { padding-left: 15px; }
+td:last-child, th:last-child { padding-right: 15px; }
+
+/* next/prev navigation buttons */
+button {
+ border: 1px solid var(--border-grey);
+ background-color: var(--alt-row-bg);
+ padding: 6px;
+ min-width: 29px;
+}
+button[disabled]       { cursor: not-allowed; color: var(--border-grey); }
+button:not([disabled]) { cursor: pointer; color: var(--main-fg); }
+
+/* progress bar */
+.progress {
+ width: 100%;
+ height: 8px;
+ border: 1px solid;
+ border-radius: 4px;
+ overflow: hidden;
+ border-color: var(--border-grey);
+ background-color: var(--alt-row-bg);
+}
+.progress-bar {
+ height: 100%;
+ background-color: var(--running);
+ background-image: linear-gradient(45deg, transparent 35%, rgba(255,255,255,0.18) 35% 65%, transparent 65%);
+ background-size: 1rem;
+ transition: width .6s linear;
+}
+.progress-bar.overtime { background-color: var(--warning); }
+.progress-bar.indeterminate {
+ animation: animate-stripes 1s linear infinite;
+}
+@keyframes animate-stripes {
+ from { background-position: 1rem 0; } to { background-position: 0 0; }
+}
+
+/* wallboard */
+.wallboard {
+ display: flex;
+ flex-wrap: wrap-reverse;
+ flex-direction: row-reverse;
+ gap: 20px;
+ padding: 20px;
+ position: fixed;
+ height: 100%;
+ width: 100%;
+ overflow: auto;
+ background-color: #000
+}
+.wallboard > div {
+ padding: 30px;
+ flex-grow: 1;
+ background-color: var(--failure);
+ color: var(--nav-fg-light);
+}
+.wallboard > div:hover {
+  cursor: pointer;
+}
+.wallboard > div[data-result="running"] {
+  animation: wallboard-bg-fade 2s ease infinite;
+}
+@keyframes wallboard-bg-fade {
+  from { background-color: #4786ab; }
+  50% { background-color: #446597; }
+  to { background-color: #4786ab; }
+}
+.wallboard > div[data-result="success"] {
+  background-color: var(--success);
+  color: var(--main-fg);
+}
+
+/* connecting overlay */
+#connecting-overlay {
+ position: fixed;
+ top: 0; right: 0; bottom: 0; left: 0;
+ display: grid;
+ align-content: end; justify-content: end;
+ color: var(--nav-fg-light);
+ font-size: 18px;
+ padding: 30px;
+ visibility: hidden;
+ background-color: rgba(0,0,0,0.75);
+ opacity: 0;
+ transition: opacity 0.5s ease, visibility 0s 0.5s;
+}
+#connecting-overlay.shown {
+ visibility: visible;
+ opacity: 1;
+ transition: opacity 0.5s ease 2s;
+}
+#connecting-overlay > div { opacity: 1; }
+
+/* responsive layout */
+#page-home-main {
+ display: grid;
+ grid-template-columns: auto 1fr;
+}
+@media (max-width: 865px) {
+ #page-home-main {
+  grid-template-columns: 1fr;
+ }
+ .vp-sm-hide { display: none; }
+}
+#page-home-stats {
+ display: grid;
+ grid-template-columns: 1fr 1fr 1fr;
+ padding: 15px;
+ gap: 15px;
+ max-width: 1600px;
+ margin: auto;
+ text-align: center;
+}
+@media (max-width: 650px) {
+ #page-home-stats {
+  grid-template-columns: 1fr;
+ }
+}
+#page-home-plots {
+ display: grid;
+ grid-template-columns: 1fr 1fr;
+ padding: 5px;
+ gap: 5px;
+ max-width: 1600px;
+ margin: auto;
+}
+@media (max-width: 1095px) {
+ #page-home-plots {
+  grid-template-columns: 1fr;
+ }
+}
+#page-job-main {
+ display: grid;
+ grid-template: auto 1fr / minmax(550px, 1fr) 1fr;
+}
+@media (max-width: 965px) {
+ #page-job-main {
+  grid-template: auto auto 1fr / 1fr;
+ }
+}
+#page-run-detail {
+  display: grid;
+  grid-template-columns: minmax(400px, auto) 1fr;
+  gap: 5px;
+}
+@media (max-width: 780px) {
+ #page-run-detail {
+  grid-template-columns: 1fr;
+ }
+}
--- a/src/rpc.cpp
+++ b/src/rpc.cpp
@@ -53,10 +53,13 @@ public:
    kj::Promise<void> queue(QueueContext context) override {
        std::string jobName = context.getParams().getJobName();
        LLOG(INFO, "RPC queue", jobName);
-        LaminarCi::MethodResult result = laminar.queueJob(jobName, params(context.getParams().getParams()))
-                ? LaminarCi::MethodResult::SUCCESS
-                : LaminarCi::MethodResult::FAILED;
-        context.getResults().setResult(result);
+        std::shared_ptr<Run> run = laminar.queueJob(jobName, params(context.getParams().getParams()));
+        if(Run* r = run.get()) {
+            context.getResults().setResult(LaminarCi::MethodResult::SUCCESS);
+            context.getResults().setBuildNum(r->build);
+        } else {
+            context.getResults().setResult(LaminarCi::MethodResult::FAILED);
+        }
        return kj::READY_NOW;
    }

--- a/src/rpc.h
+++ b/src/rpc.h
@@ -1,5 +1,5 @@
 ///
-/// Copyright 2019 Oliver Giles
+/// Copyright 2019-2020 Oliver Giles
 ///
 /// This file is part of Laminar
 ///
@@ -23,7 +23,7 @@
 #include <capnp/rpc-twoparty.h>
 #include <capnp/rpc.capnp.h>

-struct Laminar;
+class Laminar;

 class Rpc {
 public:
--- a/src/run.cpp
+++ b/src/run.cpp
@@ -1,5 +1,5 @@
 ///
-/// Copyright 2015-2018 Oliver Giles
+/// Copyright 2015-2020 Oliver Giles
 ///
 /// This file is part of Laminar
 ///
@@ -33,7 +33,7 @@ inline kj::Path operator/(const kj::Path& p, const T& ext) {

 std::string to_string(const RunState& rs) {
    switch(rs) {
-    case RunState::PENDING: return "pending";
+    case RunState::QUEUED: return "queued";
    case RunState::RUNNING: return "running";
    case RunState::ABORTED: return "aborted";
    case RunState::FAILED: return "failed";
@@ -44,10 +44,10 @@ std::string to_string(const RunState& rs) {
 }


-Run::Run(std::string name, ParamMap pm, kj::Path&& rootPath) :
+Run::Run(std::string name, uint num, ParamMap pm, kj::Path&& rootPath) :
    result(RunState::SUCCESS),
-    lastResult(RunState::UNKNOWN),
    name(name),
+    build(num),
    params(kj::mv(pm)),
    queuedAt(time(nullptr)),
    rootPath(kj::mv(rootPath)),
@@ -84,7 +84,7 @@ static void setEnvFromFile(const kj::Path& rootPath, kj::Path file) {
    }
 }

-kj::Promise<RunState> Run::start(uint buildNum, std::shared_ptr<Context> ctx, const kj::Directory &fsHome, std::function<kj::Promise<int>(kj::Maybe<pid_t>&)> getPromise)
+kj::Promise<RunState> Run::start(RunState lastResult, std::shared_ptr<Context> ctx, const kj::Directory &fsHome, std::function<kj::Promise<int>(kj::Maybe<pid_t>&)> getPromise)
 {
    kj::Path cfgDir{"cfg"};

@@ -131,7 +131,7 @@ kj::Promise<RunState> Run::start(uint buildNum, std::shared_ptr<Context> ctx, co
            PATH.append(p);
        }

-        std::string runNumStr = std::to_string(buildNum);
+        std::string runNumStr = std::to_string(build);

        setenv("PATH", PATH.c_str(), true);
        setenv("RUN", runNumStr.c_str(), true);
@@ -152,14 +152,13 @@ kj::Promise<RunState> Run::start(uint buildNum, std::shared_ptr<Context> ctx, co
        // enough. Instead, we'll just exec ourselves and handle that in laminard's
        // main() by calling leader_main()
        char* procName;
-        asprintf(&procName, "{laminar} %s:%d", name.data(), buildNum);
-        execl("/proc/self/exe", procName, NULL); // does not return
+        if(asprintf(&procName, "{laminar} %s:%d", name.data(), build) > 0)
+            execl("/proc/self/exe", procName, NULL); // does not return
        _exit(EXIT_FAILURE);
    }

    // All good, we've "started"
    startedAt = time(nullptr);
-    build = buildNum;
    context = ctx;

    output_fd = plog[0];
--- a/src/run.h
+++ b/src/run.h
@@ -34,7 +34,7 @@ typedef unsigned int uint;

 enum class RunState {
    UNKNOWN,
-    PENDING,
+    QUEUED,
    RUNNING,
    ABORTED,
    FAILED,
@@ -50,14 +50,14 @@ typedef std::unordered_map<std::string, std::string> ParamMap;
 // Represents an execution of a job.
 class Run {
 public:
-    Run(std::string name, ParamMap params, kj::Path&& rootPath);
+    Run(std::string name, uint num, ParamMap params, kj::Path&& rootPath);
    ~Run();

    // copying this class would be asking for trouble...
    Run(const Run&) = delete;
    Run& operator=(const Run&) = delete;

-    kj::Promise<RunState> start(uint buildNum, std::shared_ptr<Context> ctx, const kj::Directory &fsHome, std::function<kj::Promise<int>(kj::Maybe<pid_t>&)> getPromise);
+    kj::Promise<RunState> start(RunState lastResult, std::shared_ptr<Context> ctx, const kj::Directory &fsHome, std::function<kj::Promise<int>(kj::Maybe<pid_t>&)> getPromise);

    // aborts this run
    bool abort();
@@ -69,7 +69,6 @@ public:

    std::shared_ptr<Context> context;
    RunState result;
-    RunState lastResult;
    std::string name;
    std::string parentName;
    int parentBuild = 0;
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -95,7 +95,7 @@ kj::Promise<int> Server::onChildExit(kj::Maybe<pid_t> &pid) {

 Server::PathWatcher& Server::watchPaths(std::function<void()> fn)
 {
-    struct PathWatcherImpl : public PathWatcher {
+    struct PathWatcherImpl final : public PathWatcher {
        PathWatcher& addPath(const char* path) override {
            inotify_add_watch(fd, path, IN_ONLYDIR | IN_CLOSE_WRITE | IN_CREATE | IN_DELETE);
            return *this;
--- a/src/server.h
+++ b/src/server.h
@@ -1,5 +1,5 @@
 ///
-/// Copyright 2015-2017 Oliver Giles
+/// Copyright 2015-2020 Oliver Giles
 ///
 /// This file is part of Laminar
 ///
@@ -24,10 +24,11 @@
 #include <capnp/message.h>
 #include <capnp/capability.h>
 #include <functional>
+#include <sys/types.h>

-struct Laminar;
-struct Http;
-struct Rpc;
+class Laminar;
+class Http;
+class Rpc;

 // This class manages the program's asynchronous event loop
 class Server final : public kj::TaskSet::ErrorHandler {
--- a/src/version.cpp
+++ b/src/version.cpp
@@ -0,0 +1,25 @@
+///
+/// Copyright 2020 Oliver Giles
+///
+/// This file is part of Laminar
+///
+/// Laminar is free software: you can redistribute it and/or modify
+/// it under the terms of the GNU General Public License as published by
+/// the Free Software Foundation, either version 3 of the License, or
+/// (at your option) any later version.
+///
+/// Laminar is distributed in the hope that it will be useful,
+/// but WITHOUT ANY WARRANTY; without even the implied warranty of
+/// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+/// GNU General Public License for more details.
+///
+/// You should have received a copy of the GNU General Public License
+/// along with Laminar.  If not, see <http://www.gnu.org/licenses/>
+///
+
+#define str(x) #x
+#define xstr(x) str(x)
+
+const char* laminar_version() {
+    return xstr(LAMINAR_VERSION);
+}
--- a/test/laminar-fixture.h
+++ b/test/laminar-fixture.h
@@ -1,5 +1,5 @@
 ///
-/// Copyright 2019 Oliver Giles
+/// Copyright 2019-2020 Oliver Giles
 ///
 /// This file is part of Laminar
 ///
@@ -19,15 +19,17 @@
 #ifndef LAMINAR_FIXTURE_H_
 #define LAMINAR_FIXTURE_H_

-#include <capnp/rpc-twoparty.h>
-#include <gtest/gtest.h>
 #include "laminar.capnp.h"
 #include "eventsource.h"
 #include "tempdir.h"
 #include "laminar.h"
+#include "log.h"
 #include "server.h"
 #include "conf.h"

+#include <capnp/rpc-twoparty.h>
+#include <gtest/gtest.h>
+
 class LaminarFixture : public ::testing::Test {
 public:
    LaminarFixture() {
@@ -108,7 +110,7 @@ public:
    StringMap parseFromString(kj::StringPtr content) {
        char tmp[16] = "/tmp/lt.XXXXXX";
        int fd = mkstemp(tmp);
-        write(fd, content.begin(), content.size());
+        LSYSCALL(write(fd, content.begin(), content.size()));
        close(fd);
        StringMap map = parseConfFile(tmp);
        unlink(tmp);
--- a/test/laminar-functional.cpp
+++ b/test/laminar-functional.cpp
@@ -45,7 +45,6 @@ TEST_F(LaminarFixture, EmptyStatusMessageStructure) {
    EXPECT_TRUE(data.HasMember("resultChanged"));
    EXPECT_TRUE(data.HasMember("lowPassRates"));
    EXPECT_TRUE(data.HasMember("buildTimeChanges"));
-    EXPECT_TRUE(data.HasMember("buildTimeDist"));
 }

 TEST_F(LaminarFixture, JobNotifyHomePage) {
--- a/test/tempdir.h
+++ b/test/tempdir.h
@@ -1,5 +1,5 @@
 ///
-/// Copyright 2018 Oliver Giles
+/// Copyright 2018-2020 Oliver Giles
 ///
 /// This file is part of Laminar
 ///
@@ -19,6 +19,8 @@
 #ifndef LAMINAR_TEMPDIR_H_
 #define LAMINAR_TEMPDIR_H_

+#include "log.h"
+
 #include <kj/filesystem.h>
 #include <stdlib.h>

@@ -37,7 +39,7 @@ public:
 private:
    static kj::Path mkdtemp() {
        char dir[] = "/tmp/laminar-test-XXXXXX";
-        ::mkdtemp(dir);
+        LASSERT(::mkdtemp(dir) != nullptr, "mkdtemp failed");
        return kj::Path::parse(&dir[1]);
    }
 };
--- a/test/unit-conf.cpp
+++ b/test/unit-conf.cpp
@@ -1,5 +1,5 @@
 ///
-/// Copyright 2018 Oliver Giles
+/// Copyright 2018-2020 Oliver Giles
 ///
 /// This file is part of Laminar
 ///
@@ -16,8 +16,9 @@
 /// You should have received a copy of the GNU General Public License
 /// along with Laminar.  If not, see <http://www.gnu.org/licenses/>
 ///
-#include <gtest/gtest.h>
 #include "conf.h"
+#include "log.h"
+#include <gtest/gtest.h>

 class ConfTest : public ::testing::Test {
 protected:
@@ -30,7 +31,7 @@ protected:
    }
    void parseConf(std::string conf) {
        lseek(fd, SEEK_SET, 0);
-        write(fd, conf.data(), conf.size());
+        LSYSCALL(write(fd, conf.data(), conf.size()));
        cfg = parseConfFile(tmpFile);
    }
    StringMap cfg;
Author	SHA1	Message	Date
Oliver Giles	1a5292f141	remove old trigger command it has been deprecated for a while now	2020-12-05 13:55:11 +13:00
Oliver Giles	ec237f475e	deprecate custom css replaced by custom index html page	2020-12-05 13:54:35 +13:00
Oliver Giles	5e64844440	frontend: "builds" -> "runs" use consistent naming	2020-12-05 13:52:40 +13:00
Oliver Giles	c274e321df	fetch average runtime as double, not int only makes a difference for very short jobs, but nice to have more accurate graphs	2020-12-05 13:51:25 +13:00
Oliver Giles	e442652e0a	rpm packaging: list man pages	2020-12-05 13:49:13 +13:00
Oliver Giles	212cfaf8ab	UserManual: laminard env vars with docker explain how laminard uses environment variables and recommend how to set them when using docker resolves #136	2020-12-05 13:24:12 +13:00
Oliver Giles	b755a2ef9e	edit manpages and cmakeize them so that they will be installed in the correct place as part of a normal build or packaging process.	2020-11-27 21:25:48 +13:00
Dmitry Bogatov	cafd0ddaee	Write and install manpage for laminarc	2020-11-25 13:36:34 +13:00
Dmitry Bogatov	69df17d7bf	Write and install manpage for laminard	2020-11-25 13:35:25 +13:00
Oliver Giles	308d679ea4	update vue and vue-router to 2.6.12 and 3.4.8 respectively, as they are the versions available in Debian. fix an exposed issue where the status handler attempted to manipulate the DOM before vue had rendered it - such manipulations need to be deferred with $nextTick().	2020-11-20 14:34:26 +13:00
Oliver Giles	b851c72d53	progress bar: fix initial delayed update when the displayed frontend state changes, any progress bar should begin in the initial correct state before smoothly transitioning with time.	2020-11-20 14:08:02 +13:00
Oliver Giles	3e993d35a0	no badges for unfinished runs do not attempt to generate badges for runs which have not yet finished. resolves #134	2020-11-13 14:02:00 +13:00
Oliver Giles	579c192d89	builds per day: fix dynamic update to wrong result the wrong dataset was updated, causing the graph to increase the number of failed builds when a build succeeded and vice-versa.	2020-11-13 14:00:59 +13:00
Oliver Giles	4fb95fcb4f	allow contexts to specify accepted jobs using a glob expression, the same way jobs can specify contexts. This allows more flexibility in situations where there are many jobs sharing limited contexts because it may obviate the need to create a conf file for each job. resolves #124	2020-11-13 13:47:02 +13:00
Oliver Giles	bd489bdbb0	frontend refactor use a more modern style, reduce variable scopes where possible, fix several minor bugs such as pagination and scales in chart tooltips	2020-10-16 21:19:12 +13:00
Oliver Giles	c6b60646f6	rewrite gtest result formatting example	2020-10-09 20:17:33 +13:00
Oliver Giles	1ea9713536	implement wallboard view resolves #51	2020-10-09 13:06:03 +13:00
Oliver Giles	746ab24676	move buildTimeDist chart to examples too esoteric for the front page, converting it to an example of querying laminar db directly and using gnuplot should provide more value to those needing deeper insights into job behaviour.	2020-09-26 15:12:02 +12:00
Oliver Giles	9862affd98	fix warnings under clang++	2020-09-26 11:33:36 +12:00
Oliver Giles	9974df21ce	add example telegram notification	2020-09-26 09:03:21 +12:00
Oliver Giles	c774acbb98	add example email notification scripts	2020-09-26 08:53:17 +12:00
Oliver Giles	06a5f3d8ef	assign run numbers at queue time This allows build chains to be traced in the common case where an upstream job calls `laminarc queue' instead of `laminarc start'. Incomplete job runs now have database entries, which requires some adjustments in queries. Queued jobs can now be viewed in the frontend and there is a corresponding status icon.	2020-09-25 15:29:30 +12:00
Oliver Giles	6d2c0b208b	fix LAST_RESULT env var the variable was set too late to be passed to the forked process. resolves #131	2020-09-20 09:15:03 +12:00
Oliver Giles	4b62e6dbf3	fix colours of per-job build time graph	2020-09-19 15:22:01 +12:00
Oliver Giles	dc3e41fb28	prettier graphs	2020-09-04 13:21:29 +12:00
Oliver Giles	e74332595e	build time graph: simplify success/failed color logic	2020-09-04 13:15:30 +12:00
Oliver Giles	a793a97424	fix time scales in graphs these were not correct at all	2020-09-04 13:12:52 +12:00
Oliver Giles	4e9c4bfb04	run page: switch progress bar and nav buttons the navigation buttons are more usable next to other navigation elements. This is especially noticeable on large monitors.	2020-09-04 13:10:09 +12:00
Oliver Giles	e29568f627	improve layout on large screens	2020-09-04 13:08:34 +12:00
Oliver Giles	4316eb8a00	sse endpoint: hint to reverse-proxy not to buffer Similarly to `210787a3`, and as discussed in #88 and #130, nginx will buffer chunked transfer-encoding unless proxy_buffering is turned off or the X-Accel-Buffering header is set to no. resolves #130	2020-08-11 06:54:03 +12:00
Oliver Giles	8a4992e6af	more aggressive, recursive kill on abort some jobs may spawn child processes which change their process group or session id, making the existing abort behavior of HUP-then-KILL to the process group ineffective. Instead, if HUP to the process group fails, recursively walk /proc and KILL anything with a ppid corresponding to the leader process. This should keep working because the leader process is a subreaper. resolves #129	2020-08-08 12:03:55 +12:00
Oliver Giles	7f7e8d2455	downstream link signal only within job only add the private ANSI sequence to the output of laminarc start/run commands used for adding a hyperlink to the frontend if we are within a job execution (tested with __LAMINAR_SETENV_PIPE). this makes parsing the output easier, which is likely to be more common when laminarc is invoked externally	2020-07-03 18:11:29 +12:00
Oliver Giles	d6be7f5079	fix minor compile warnings	2020-07-03 17:31:44 +12:00
Oliver Giles	09a208ebeb	report version and usage messages add -h\|--help usage messages to laminarc and laminard add a mechanism to compile in a version number, and display the version in the help messages and in the frontend. resolves #119	2020-07-03 15:13:11 +12:00
Oliver Giles	ae560b9de4	webui refresh WebUI rewritten in a more modern style, bootstrap is dropped in favour of plain css/grid. Hand-crafted svgs replace utf-8 glyphs for a more uniform look and smoother animation. webmanifest added for better mobile behaviour. No doubt minor tweaks will follow... resolves #57	2020-06-27 10:45:47 +12:00
Oliver Giles	4554039703	readme: add a warning about "make install" overriding laminar.conf resolves #96	2020-06-27 10:26:28 +12:00
Oliver Giles	cd64be2cea	UserManual: add a note that env vars are not shell-expanded resolves #120	2020-06-27 10:20:37 +12:00
Oliver Giles	559a6480ee	send SIGKILL to unterminated child jobs If we haven't exited 2 seconds after SIGTERM, send SIGKILL. This allows aborting of runs with wayward descendent processes.	2020-06-20 16:05:14 +12:00
Oliver Giles	1bb545e3f9	cmake: more appropriate use of CMAKE_INSTALL_PREFIX CMAKE_INSTALL_PREFIX is supposed to be used to set an install prefix of e.g. /usr or /usr/local. Because we need to install files to /etc, we had been requiring CMAKE_INSTALL_PREFIX=/ and installing using relative paths. The best practice method is to install to /etc using absolute paths, and then allow CMAKE_INSTALL_PREFIX to set where the final binaries actually go. Now that it actually has some meaning, the systemd service is generated to incorporate that path. Those wishing to use "make install" to install laminar to a subdir should use "make DESTDIR=path/to/subdir install" and NOT modify CMAKE_INSTALL_PREFIX. Documentation and packaging scripts updated accordingly.	2020-06-20 15:59:35 +12:00
Oliver Giles	de948c149e	don't report latestNum of non-existent job navigating to a non-existent job in the frontend caused a mutating change to the buildNums map, and returing the latestNum field caused the frontend to repeatedly try to fetch the latest run, which could overload the backend	2020-06-20 15:46:18 +12:00
Oliver Giles	0f2e601692	use c++17, deprecate debian 9 (stretch) packaging C++17 has some nice new features, but Debian Stretch doesn't support a compiler which can use it. Stretch is oldstable for a while now anyway, so just deprecate support.	2020-06-20 15:39:34 +12:00
Oliver Giles	c690be3a90	set html lang="en" This fixes weird offers from browsers to translate erroneously detected languages	2020-06-19 12:13:09 +12:00
Oliver Giles	1cc6cc6ae9	unify SSE reconnect behaviour Chrome auto-reconnects when an EventSource connection is interrupted but Firefox doesn't. Enforce consistent behaviour by implementing reconnect logic.	2020-06-19 12:01:46 +12:00
Oliver Giles	d5cfa3b94e	connect stdin to /dev/null laminard is a daemon process and does not read from stdin. Usually we can rely on the process mananger to do this for us, but if not (e.g. laminard is run interactively), we need this so that child processes (job runs) will not be able to block on stdin. resolves #125	2020-06-15 12:31:42 +12:00
Oliver Giles	081becf23a	laminarc: correct variable lifetime of show-jobs etc the one-liner used to iterate on the results of the RPC calls for show-jobs, show-queued and show-running meant that the result collection was destroyed before we finished with it. Hoist it out of the loop. resolves #127	2020-06-14 07:49:02 +12:00
Oliver Giles	6c61fb3111	add missing #includes New compiler version exposed missing header files resolves #123	2020-05-22 11:42:16 +12:00
Oliver Giles	eadcdbdf9c	laminarc: improve exit codes and errors - return non-zero when failed to connect to laminard - only output trigger links on successful trigger - better error messages Resolves #121	2020-04-25 08:49:39 +12:00
Cameron Eagans	2e54773e83	Add the ability to customize index.html (#113 ) User may provide a custom index.html template file to be used instead of the built-in version. Changes to this file are watched by laminard using inotify in order to load and compress the custom file for gzip delivery, reusing the existing method for serving static assets. This feature obviates the custom css feature, so remove references from the manual and add a deprecation warning if it is used. Add a section to the UserManual describing how to use this feature and including a link to an example using Semantic UI.	2020-03-10 19:40:14 +02:00
Oliver Giles	f981491a34	define FNM_EXTMATCH to 0 if undefined FNM_EXTMATCH is undefined under musl. In that case, we just won't support extended match patterns. Resolves #110	2020-02-25 20:36:26 +02:00