Merge branch 'devel' of https://github.com/diddip21/zamba-lxc-toolbox into devel

README.md

@@ -16,6 +16,8 @@ Proxmox VE Server with at least one configured ZFS Pool.
 - `mailpiler` => mailpiler mail archive [mailpiler.org](https://www.mailpiler.org/)
 - `matrix` => Matrix Synapse Homeserver [matrix.org](https://matrix.org/docs/projects/server/synapse) with Element Web [Element on github](https://github.com/vector-im/element-web)
 - `nextcloud` => Nextcloud Server [nextcloud.com](https://nextcloud.com/) with fail2ban und redis configuration
+- `checkmk` => CheckMK 2.0 Raw Edition [checkmk.com](https://checkmk.com) with our Fork of Matrix Notification Plugin (https://github.com/bashclub/check_mk_matrix_notifications)
+- `open3a` => Open3A accounting software for small and medium business [open3a.de](https://www.open3a.de/)
 - `debian-unpriv` => Debian unprivileged container with basic toolset
 - `debian-priv` => Debian privileged container with basic toolset
 ## Usage

conf/zamba.conf.example

@@ -130,7 +130,7 @@ NEXTCLOUD_REVPROX="192.168.100.254"
 ############### Check_MK-Section ###############
 
 # Define the name of your checkmk instance
-CMK_INSTANCE=zmb-rocks
+CMK_INSTANCE=zmbrocks
 
 # Define the password of user 'cmkadmin'
 CMK_ADMIN_PW='Ju5t@n0thers3cur3p@ssw0rd'

src/checkmk/constants-service.conf

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

src/checkmk/install-service.sh

@@ -30,8 +30,4 @@ systemctl restart apache2.service
 omd start $CMK_INSTANCE
 
 # install matrix notification plugin
-su - $CMK_INSTANCE
+su - $CMK_INSTANCE -c "wget -O  ~/local/share/check_mk/notifications/matrix.py https://github.com/bashclub/check_mk_matrix_notifications/raw/master/matrix.py && chmod +x ~/local/share/check_mk/notifications/matrix.py"
-cd ~/local/share/check_mk/notifications/
-wget https://github.com/bashclub/check_mk_matrix_notifications/raw/master/matrix.py
-chmod +x ./matrix.py
-exit

src/mailpiler/install-service.sh

@@ -26,6 +26,9 @@ fi
 wget -q https://packages.sury.org/php/apt.gpg -O- | apt-key add -
 echo "deb https://packages.sury.org/php/ $(lsb_release -sc) main" | tee /etc/apt/sources.list.d/php.list
 
+apt-key adv --fetch-keys 'https://mariadb.org/mariadb_release_signing_key.asc'
+add-apt-repository 'deb [arch=amd64] https://mirror.wtnet.de/mariadb/repo/10.5/debian buster main'
+
 apt update
 
 DEBIAN_FRONTEND=noninteractive DEBIAN_PRIORITY=critical apt install -y -qq build-essential libwrap0-dev libpst-dev tnef libytnef0-dev \
@@ -58,6 +61,7 @@ chmod 755 /var/piler
 
 if [[ "$PILER_VERSION" == "latest" ]]; then
         URL=$(curl -s https://www.mailpiler.org/wiki/download | grep "https://bitbucket.org/jsuto/piler/downloads/piler-" | cut -d '"' -f2)
+        PILER_VERSION=$(echo $URL | cut -d'-' -f2 | cut -d'.' -f1-3)
         wget -O piler-$PILER_VERSION.tar.gz $URL
 else
         wget https://bitbucket.org/jsuto/piler/downloads/piler-$PILER_VERSION.tar.gz

src/zmb-standalone/constants-service.conf

@@ -14,4 +14,4 @@ LXC_MP="1"
 LXC_UNPRIVILEGED="0"
 
 # enable nesting feature
-LXC_NESTING="0"
+LXC_NESTING="1"

src/zmb-standalone/install-service.sh

@@ -11,10 +11,17 @@ source /root/constants-service.conf
 # add wsdd package repo
 apt-key adv --fetch-keys https://pkg.ltec.ch/public/conf/ltec-ag.gpg.key
 echo "deb https://pkg.ltec.ch/public/ $(lsb_release -cs) main" > /etc/apt/sources.list.d/wsdd.list
+echo "deb http://ftp.de.debian.org/debian buster-backports main contrib" > /etc/apt/sources.list.d/buster-backports.list
 
 apt update
 
 DEBIAN_FRONTEND=noninteractive DEBIAN_PRIORITY=critical apt install -y -o DPkg::options::="--force-confdef" -o DPkg::options::="--force-confold" acl samba samba-dsdb-modules samba-vfs-modules wsdd
+DEBIAN_FRONTEND=noninteractive DEBIAN_PRIORITY=critical apt install -y -o DPkg::options::="--force-confdef" -o DPkg::options::="--force-confold" --no-install-recommends -t buster-backports cockpit
+
+mkdir /usr/share/cockpit/smb
+wget https://raw.githubusercontent.com/enira/cockpit-smb-plugin/master/index.html -O /usr/share/cockpit/smb/index.html
+wget https://raw.githubusercontent.com/enira/cockpit-smb-plugin/master/manifest.json -O /usr/share/cockpit/smb/manifest.json
+wget https://raw.githubusercontent.com/enira/cockpit-smb-plugin/master/smb.js -O /usr/share/cockpit/smb/smb.js
 
 USER=$(echo "$ZMB_ADMIN_USER" | awk '{print tolower($0)}')
 useradd --comment "Zamba fileserver admin" --create-home --shell /bin/bash $USER