From 8be0a210d972cd06d18163ea58dbf651a9ff1b9b Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Tue, 12 Mar 2024 02:22:13 +0000 Subject: [PATCH] barf: add fonts for people on macos --- ops/nixos/etheroute-lon01/default.nix | 2 ++ web/barf/frontend/default.nix | 2 +- web/barf/frontend/frontend.go | 2 +- web/barf/frontend/index.html | 2 ++ .../static/fonts/FranklinGothic-Medium.woff | Bin 0 -> 68312 bytes .../static/fonts/FranklinGothic-Medium.woff2 | Bin 0 -> 54372 bytes .../frontend/static/fonts/Tahoma-Bold.woff | Bin 0 -> 436612 bytes .../frontend/static/fonts/Tahoma-Bold.woff2 | Bin 0 -> 313608 bytes web/barf/frontend/static/fonts/Tahoma.woff | Bin 0 -> 476724 bytes web/barf/frontend/static/fonts/Tahoma.woff2 | Bin 0 -> 348452 bytes web/barf/frontend/static/fonts/stylesheet.css | 26 ++++++++++++++++++ 11 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 web/barf/frontend/static/fonts/FranklinGothic-Medium.woff create mode 100644 web/barf/frontend/static/fonts/FranklinGothic-Medium.woff2 create mode 100644 web/barf/frontend/static/fonts/Tahoma-Bold.woff create mode 100644 web/barf/frontend/static/fonts/Tahoma-Bold.woff2 create mode 100644 web/barf/frontend/static/fonts/Tahoma.woff create mode 100644 web/barf/frontend/static/fonts/Tahoma.woff2 create mode 100644 web/barf/frontend/static/fonts/stylesheet.css diff --git a/ops/nixos/etheroute-lon01/default.nix b/ops/nixos/etheroute-lon01/default.nix index c1b918421f..67f01501c5 100644 --- a/ops/nixos/etheroute-lon01/default.nix +++ b/ops/nixos/etheroute-lon01/default.nix @@ -51,6 +51,8 @@ snapshot = "tank/local/root@blank"; }; + systemd.services."systemd-networkd-wait-online".wantedBy = lib.mkForce []; + fileSystems = let zfs = device: { device = device; diff --git a/web/barf/frontend/default.nix b/web/barf/frontend/default.nix index 972e0bd4cf..8a0e0dd007 100644 --- a/web/barf/frontend/default.nix +++ b/web/barf/frontend/default.nix @@ -6,6 +6,6 @@ pkgs.buildGoModule { name = "barf-fe"; - src = lib.sourceByRegex ./. [".*\.go$" "go.mod" "go.sum" "static" "static/clipit" ".*/.*\.webm" ".*/.*\.png" ".*/.*\.wav" ".*/.*\.svg" ".*\.html"]; + src = lib.sourceByRegex ./. [".*\.go$" "go.mod" "go.sum" "static" "static/clipit" "static/fonts" ".*/.*\.webm" ".*/.*\.png" ".*/.*\.wav" ".*/.*\.svg" ".*\.html" ".*/.*\.woff" ".*/.*\.woff2" ".*/.*\.css"]; vendorHash = "sha256:0w1k1ykga70af3643lky701kf27pfmgc3lhznfq1v32ww365w57f"; } diff --git a/web/barf/frontend/frontend.go b/web/barf/frontend/frontend.go index 31d1cd6ecb..9b5340312b 100644 --- a/web/barf/frontend/frontend.go +++ b/web/barf/frontend/frontend.go @@ -146,7 +146,7 @@ func main() { indexTmpl, err := template.New("index").Parse(string(indexTmplBytes)) if err != nil { - log.Fatalf("parsing index template: %w", err) + log.Fatalf("parsing index template: %v", err) } db, err := sql.Open("sqlite3", *dbPath) diff --git a/web/barf/frontend/index.html b/web/barf/frontend/index.html index 62c7a52e55..50dd07d462 100644 --- a/web/barf/frontend/index.html +++ b/web/barf/frontend/index.html @@ -4,6 +4,8 @@ + + BARF | Data Collection