From d7afbb7099fbb8b03c514ced544c1edd9972cfe1 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 3 Aug 2026 16:00:13 +0200 Subject: [PATCH] Fix minor glitches in developer mode on ubuntu - Ubuntu uses the binary `yarnpkg` for Yarn. The makefile should use that name as a fallback if `yarn` is not found - Update install instructions for Caddy. - Fix json syntax in example --- Makefile | 2 +- README.md | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 15448bc1..d1992bb7 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ PACKAGE_NAME = grommunio-admin-web # Tools -YARN ?= yarn +YARN ?= $(shell command -v yarn >/dev/null 2>&1 && echo yarn || echo yarnpkg) # Variables diff --git a/README.md b/README.md index 0153aa96..41de02bb 100644 --- a/README.md +++ b/README.md @@ -23,10 +23,10 @@ yarn start ## caddy ### Installation -According to https://caddyserver.com/docs/install +According to https://caddyserver.com/docs/install#debian-ubuntu-raspbian ``` -sudo apt install -y debian-keyring debian-archive-keyring apt-transport-https -curl -1sLf 'https://dl.cloudsmith.io/public/caddy/stable/cfg/gpg/gpg.155B6D79CA56EA34.key' | sudo apt-key add - +sudo apt install -y debian-keyring debian-archive-keyring apt-transport-https curl +curl -1sLf 'https://dl.cloudsmith.io/public/caddy/stable/cfg/gpg/gpg.155B6D79CA56EA34.key' | sudo gpg --dearmor -o /usr/share/keyrings/caddy-stable-archive-keyring.gpg curl -1sLf 'https://dl.cloudsmith.io/public/caddy/stable/cfg/setup/config.deb.txt?distro=debian&version=any-version' | sudo tee -a /etc/apt/sources.list.d/caddy-stable.list sudo apt update sudo apt install caddy @@ -142,7 +142,7 @@ Each hostname is the key of an object, which has following keys: "logo": "anotherUrl.to/logo.png", "logoLight": "anotherUrl.to/light/logo.png", "icon": "anotherUrl.to/light/icon.svg" - }, + } } ``` As you can see, it is not necessary to overwrite every image, but the hostnames need to be accurate.