From c24520f06cc4597d80d83c64f397b8ff2c52e24d Mon Sep 17 00:00:00 2001 From: Thorsten Spille Date: Tue, 29 Mar 2022 11:41:01 +0200 Subject: [PATCH 1/4] Fix changed template download with Debian 11.3 --- install.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/install.sh b/install.sh index 37975f8..0f165e1 100755 --- a/install.sh +++ b/install.sh @@ -94,14 +94,15 @@ source $PWD/src/$service/constants-service.conf # CHeck is the newest template available, else download it. DEB_LOC=$(pveam list $LXC_TEMPLATE_STORAGE | grep $LXC_TEMPLATE_VERSION | cut -d'_' -f2) -DEB_REP=$(pveam available --section system | grep $LXC_TEMPLATE_VERSION | cut -d'_' -f2) +DEB_REP=$(pveam available --section system | grep $LXC_TEMPLATE_VERSION | tail -1 | cut -d'_' -f2) +TMPL_NAME=$(pveam available --section system | grep $LXC_TEMPLATE_VERSION | tail -1 | cut -d' ' -f11) if [[ $DEB_LOC == $DEB_REP ]]; then echo "Newest Version of $LXC_TEMPLATE_VERSION $DEP_REP exists."; else echo "Will now download newest $LXC_TEMPLATE_VERSION $DEP_REP."; - pveam download $LXC_TEMPLATE_STORAGE "$LXC_TEMPLATE_VERSION"_$DEB_REP\_amd64.tar.gz + pveam download $LXC_TEMPLATE_STORAGE $TMPL_NAME fi if [ $ctid -gt 99 ]; then @@ -120,7 +121,7 @@ fi echo "Will now create LXC Container $LXC_NBR!"; # Create the container -pct create $LXC_NBR -unprivileged $LXC_UNPRIVILEGED $LXC_TEMPLATE_STORAGE:vztmpl/"$LXC_TEMPLATE_VERSION"_$DEB_REP\_amd64.tar.gz -rootfs $LXC_ROOTFS_STORAGE:$LXC_ROOTFS_SIZE; +pct create $LXC_NBR -unprivileged $LXC_UNPRIVILEGED $LXC_TEMPLATE_STORAGE:vztmpl/$TMPL_NAME -rootfs $LXC_ROOTFS_STORAGE:$LXC_ROOTFS_SIZE; sleep 2; # Check vlan configuration From ff0566817f86ed92f44ed43c88a7e77f13e8ff1b Mon Sep 17 00:00:00 2001 From: Thorsten Spille Date: Tue, 29 Mar 2022 12:28:47 +0200 Subject: [PATCH 2/4] Update install.sh --- install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.sh b/install.sh index 0f165e1..addf0ef 100755 --- a/install.sh +++ b/install.sh @@ -93,7 +93,7 @@ source $config source $PWD/src/$service/constants-service.conf # CHeck is the newest template available, else download it. -DEB_LOC=$(pveam list $LXC_TEMPLATE_STORAGE | grep $LXC_TEMPLATE_VERSION | cut -d'_' -f2) +DEB_LOC=$(pveam list $LXC_TEMPLATE_STORAGE | grep $LXC_TEMPLATE_VERSION | tail -1 | cut -d'_' -f2) DEB_REP=$(pveam available --section system | grep $LXC_TEMPLATE_VERSION | tail -1 | cut -d'_' -f2) TMPL_NAME=$(pveam available --section system | grep $LXC_TEMPLATE_VERSION | tail -1 | cut -d' ' -f11) From e81f6c8affa7bdd8196be470d3c873ce31c0ab12 Mon Sep 17 00:00:00 2001 From: Thorsten Spille Date: Thu, 7 Apr 2022 16:42:26 +0200 Subject: [PATCH 3/4] Update README.md --- conf/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/README.md b/conf/README.md index 3b84cd0..36c232f 100644 --- a/conf/README.md +++ b/conf/README.md @@ -51,7 +51,7 @@ LXC_SWAP="1024" ### LXC_HOSTNAME Defines the hostname of your LXC container (Default: Name of installed Service) ```bash -LXC_SWAP="zamba" +LXC_HOSTNAME="zamba" ``` ### LXC_DOMAIN Defines the domain name / search domain of your LXC container From d935b38c86cb7d0e73ca2a282fff478cc322deb2 Mon Sep 17 00:00:00 2001 From: Thorsten Spille Date: Wed, 20 Apr 2022 16:16:28 +0200 Subject: [PATCH 4/4] Update constants-service.conf --- src/checkmk/constants-service.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/checkmk/constants-service.conf b/src/checkmk/constants-service.conf index 6788984..fadd3a9 100644 --- a/src/checkmk/constants-service.conf +++ b/src/checkmk/constants-service.conf @@ -20,6 +20,6 @@ LXC_UNPRIVILEGED="1" LXC_NESTING="1" # checkmk version -CMK_VERSION=2.0.0p18 +CMK_VERSION=2.0.0p23 # build number of the debian package (needs to start with underscore) -CMK_BUILD=_0 \ No newline at end of file +CMK_BUILD=_0