From 44d093d98276af162685360eee07fcc2e2634af8 Mon Sep 17 00:00:00 2001 From: thorstenspille Date: Sun, 11 Jul 2021 23:26:27 +0200 Subject: [PATCH 1/8] Added cockpit + samba manager to zmb-standalone --- src/zmb-standalone/constants-service.conf | 2 +- src/zmb-standalone/install-service.sh | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/zmb-standalone/constants-service.conf b/src/zmb-standalone/constants-service.conf index a2d006f..b5d26cf 100644 --- a/src/zmb-standalone/constants-service.conf +++ b/src/zmb-standalone/constants-service.conf @@ -14,4 +14,4 @@ LXC_MP="1" LXC_UNPRIVILEGED="0" # enable nesting feature -LXC_NESTING="0" \ No newline at end of file +LXC_NESTING="1" \ No newline at end of file diff --git a/src/zmb-standalone/install-service.sh b/src/zmb-standalone/install-service.sh index d808dcf..3fea769 100644 --- a/src/zmb-standalone/install-service.sh +++ b/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 From bfcbce84ee5a2ec55cac83421d0c8773b81dfff3 Mon Sep 17 00:00:00 2001 From: thorstenspille Date: Mon, 12 Jul 2021 20:59:38 +0200 Subject: [PATCH 2/8] fixed mailpiler script (latest version) --- src/mailpiler/install-service.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/mailpiler/install-service.sh b/src/mailpiler/install-service.sh index d7df5ae..f3c7460 100644 --- a/src/mailpiler/install-service.sh +++ b/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 \ @@ -59,6 +62,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) wget -O piler-$PILER_VERSION.tar.gz $URL + PILER_VERSION=$(ls piler-* | cut -d'-' -f2 | cut -d'.' -f1-3) else wget https://bitbucket.org/jsuto/piler/downloads/piler-$PILER_VERSION.tar.gz fi From c3429ebbab590f07a734f58ea13d2e4048aa68d0 Mon Sep 17 00:00:00 2001 From: thorstenspille Date: Mon, 12 Jul 2021 21:06:16 +0200 Subject: [PATCH 3/8] Piler version fix --- src/mailpiler/install-service.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mailpiler/install-service.sh b/src/mailpiler/install-service.sh index f3c7460..e557b5d 100644 --- a/src/mailpiler/install-service.sh +++ b/src/mailpiler/install-service.sh @@ -61,8 +61,8 @@ 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 - PILER_VERSION=$(ls piler-* | cut -d'-' -f2 | cut -d'.' -f1-3) else wget https://bitbucket.org/jsuto/piler/downloads/piler-$PILER_VERSION.tar.gz fi From 82552e7b3f1f22c1d4cc21a16df1b7d7920d6d85 Mon Sep 17 00:00:00 2001 From: thorstenspille Date: Mon, 12 Jul 2021 21:13:25 +0200 Subject: [PATCH 4/8] changed vlan tag config to one line --- install.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/install.sh b/install.sh index acb71ba..a903d14 100644 --- a/install.sh +++ b/install.sh @@ -124,11 +124,7 @@ pct create $LXC_NBR -unprivileged $LXC_UNPRIVILEGED $LXC_TEMPLATE_STORAGE:vztmpl sleep 2; # Check vlan configuration -if [[ $LXC_VLAN != "" ]];then - VLAN=",tag=$LXC_VLAN" -else - VLAN="" -fi +if [[ $LXC_VLAN != "" ]];then VLAN=",tag=$LXC_VLAN"; else VLAN=""; fi # Reconfigure conatiner pct set $LXC_NBR -memory $LXC_MEM -swap $LXC_SWAP -hostname $LXC_HOSTNAME -onboot 1 -timezone $LXC_TIMEZONE -features nesting=$LXC_NESTING; if [ $LXC_DHCP == true ]; then From c52525caf7c4dbfa2ea569d073676d54f052ead0 Mon Sep 17 00:00:00 2001 From: Thorsten Spille Date: Tue, 27 Jul 2021 11:30:04 +0200 Subject: [PATCH 5/8] Changed matrix notification plugin installation --- src/checkmk/install-service.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/checkmk/install-service.sh b/src/checkmk/install-service.sh index 25ab743..180c4a5 100644 --- a/src/checkmk/install-service.sh +++ b/src/checkmk/install-service.sh @@ -30,8 +30,4 @@ systemctl restart apache2.service omd start $CMK_INSTANCE # install matrix notification plugin -su - $CMK_INSTANCE -cd ~/local/share/check_mk/notifications/ -wget https://github.com/bashclub/check_mk_matrix_notifications/raw/master/matrix.py -chmod +x ./matrix.py -exit \ No newline at end of file +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" From 01460566edd2ac15628dd9be6508838f431647a1 Mon Sep 17 00:00:00 2001 From: Thorsten Spille Date: Tue, 27 Jul 2021 12:18:42 +0200 Subject: [PATCH 6/8] Update constants-service.conf Changed checkmk version to 2.0.0p8 --- 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 d6a75fa..e506a6e 100644 --- a/src/checkmk/constants-service.conf +++ b/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 \ No newline at end of file +CMK_BUILD=_0 From 14fc948e5750bb2e01eac89078422dd1d53aef5a Mon Sep 17 00:00:00 2001 From: Thorsten Spille Date: Thu, 29 Jul 2021 15:15:45 +0200 Subject: [PATCH 7/8] Update README.md Added checkmk and open3a to list --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 9cbc32b..1a38e0e 100644 --- a/README.md +++ b/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 From 32036dfb2f76754869f55a4f3fb41e39e9ec2c0d Mon Sep 17 00:00:00 2001 From: Thorsten Spille Date: Thu, 29 Jul 2021 17:11:45 +0200 Subject: [PATCH 8/8] Update zamba.conf.example fixed checkmk instance name --- conf/zamba.conf.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/zamba.conf.example b/conf/zamba.conf.example index 1e20320..9bd2691 100644 --- a/conf/zamba.conf.example +++ b/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'