Rigo/zamba-lxc-toolbox
1
0
Fork 0
forked from bashclub/zamba-lxc-toolbox
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #65 from bashclub/main

Browse Source 
Apply Bugfixes do dev branch
This commit is contained in:
Thorsten Spille 2022-05-05 22:30:36 +02:00 committed by GitHub
commit 4d3e5bc661
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
install.sh
View File

@ -93,15 +93,16 @@ source $config
source $PWD/src/$service/constants-service.conf source $PWD/src/$service/constants-service.conf
# CHeck is the newest template available, else download it. # 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 | 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 ]]; if [[ $DEB_LOC == $DEB_REP ]];
then then
echo "Newest Version of $LXC_TEMPLATE_VERSION $DEP_REP exists."; echo "Newest Version of $LXC_TEMPLATE_VERSION $DEP_REP exists.";
else else
echo "Will now download newest $LXC_TEMPLATE_VERSION $DEP_REP."; 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 fi
if [ $ctid -gt 99 ]; then if [ $ctid -gt 99 ]; then
@ -120,7 +121,7 @@ fi
echo "Will now create LXC Container $LXC_NBR!"; echo "Will now create LXC Container $LXC_NBR!";
# Create the container # 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; sleep 2;
# Check vlan configuration # Check vlan configuration

2
src/checkmk/constants-service.conf
View File

@ -20,6 +20,6 @@ LXC_UNPRIVILEGED="1"
LXC_NESTING="1" LXC_NESTING="1"
# checkmk version # checkmk version
CMK_VERSION=2.0.0p18 CMK_VERSION=2.0.0p23
# build number of the debian package (needs to start with underscore) # build number of the debian package (needs to start with underscore)
CMK_BUILD=_0 CMK_BUILD=_0