From 6166f270b5f87d84069f9df237da0cd194ffd37b Mon Sep 17 00:00:00 2001 From: Arjan H Date: Wed, 13 Apr 2022 19:52:31 +0200 Subject: [PATCH] Tweak documentation and version number --- README.md | 2 +- install | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index fb2d8ee..84c7af2 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ Getting Boulder up and running has quite a learning curve though and that is whe ## Install -LabCA is best run on its own server / virtual machine to prevent any issues caused by conflicting applications. On a freshly installed Linux machine (currently only tested with Debian 9/stretch, Debian 10/buster and Ubuntu 18.04) run this command as root user (or as a regular user that already is in the sudo group): +LabCA is best run on its own server / virtual machine to prevent any issues caused by conflicting applications. On a freshly installed Linux machine (currently tested with Debian 11/bullseye, Debian 10/buster and Ubuntu 18.04) run this command as root user (or as a regular user that already is in the sudo group): ```sh curl -sSL https://raw.githubusercontent.com/hakwerk/labca/master/install | bash diff --git a/install b/install index 931618f..7b6c024 100755 --- a/install +++ b/install @@ -3,7 +3,7 @@ # LabCA: a private Certificate Authority for internal lab usage # (c) 2018-2022 Arjan Hakkesteegt # -# Install with this command from a Linux machine (only tested with Debian 9): +# Install with this command from a Linux machine (only tested with Debian and Ubuntu): # curl -sSL https://raw.githubusercontent.com/hakwerk/labca/master/install | bash set -e @@ -360,7 +360,7 @@ copy_admin() { replace_all /home/labca/acme_tiny.py LABCA_FQDN cd "$cloneDir" - version=$(git describe --always HEAD 2>/dev/null) + version=$(git describe --always --tags HEAD 2>/dev/null) cd "$adminDir" grep \"version\" data/config.json &>/dev/null || sed -i -e 's/^}$/,\n "version": ""\n}/' data/config.json sed -i -e "s/\"version\": \".*\"/\"version\": \"$version\"/" data/config.json