From 29af955432c2c8c26f5a2e1c3a71a367d89b5184 Mon Sep 17 00:00:00 2001 From: Thorsten Spille Date: Tue, 13 Apr 2021 12:42:15 +0000 Subject: [PATCH 1/5] =?UTF-8?q?=E2=80=9Ezamba.conf=E2=80=9C=20=C3=A4ndern?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- zamba.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/zamba.conf b/zamba.conf index 4350deb..0967898 100644 --- a/zamba.conf +++ b/zamba.conf @@ -25,7 +25,7 @@ LXC_SHAREFS_MOUNTPOINT="tank" # Define whether the container will be created in unprivileged (1) or privileged (0) mode # For 'zmb_standalone', 'zmb_pdc', 'zmb_member' and 'mailpiler' the container needs to be created with 'unprivileged=0' -LXC_UNPRIVILEGED="1" +LXC_UNPRIVILEGED="0" # Size of the RAM assigned to the container LXC_MEM="1024" @@ -49,7 +49,7 @@ LXC_GW="10.10.80.10" LXC_DNS="10.10.80.10" # Networkbridge for this container -LXC_BRIDGE="vmbr80" +LXC_BRIDGE="vmbr0" # Optional VLAN number for this container LXC_VLAN="" @@ -61,7 +61,7 @@ LXC_PWD='S3cr3tp@ssw0rd' LXC_AUTHORIZED_KEY="ssh-rsa xxxxxxxx" # Define some optional packages to install (your favourite tools on linux systems) -LXC_TOOLSET="vim htop net-tools dnsutils mc sysstat lsb-release curl git" +LXC_TOOLSET="vim htop net-tools dnsutils mc sysstat lsb-release curl git gpg apt-transport-https" # Define system timezone on LXC container LXC_TIMEZONE="Europe/Berlin" From 1fa24aed72b31d2919aeed74e2391093f04670ce Mon Sep 17 00:00:00 2001 From: Thorsten Spille Date: Tue, 13 Apr 2021 15:40:24 +0000 Subject: [PATCH 2/5] Moved reconf locales to beginning --- just_lxc.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/just_lxc.sh b/just_lxc.sh index 665fd66..622c8f3 100644 --- a/just_lxc.sh +++ b/just_lxc.sh @@ -5,11 +5,11 @@ # (C) 2021 Script design and prototype by Markus Helmke # (C) 2021 Script rework and documentation by Thorsten Spille +dpkg-reconfigure locales + source /root/zamba.conf # Set Timezone ln -sf /usr/share/zoneinfo/$LXC_TIMEZONE /etc/localtime -dpkg-reconfigure locales - DEBIAN_FRONTEND=noninteractive DEBIAN_PRIORITY=critical apt install -y -o DPkg::options::="--force-confdef" -o DPkg::options::="--force-confold" $LXC_TOOLSET \ No newline at end of file From e7caf5781249c981c3380f96fd816c690e3e6645 Mon Sep 17 00:00:00 2001 From: Thorsten Spille Date: Tue, 13 Apr 2021 15:41:23 +0000 Subject: [PATCH 3/5] Moved reconf locales to beginning --- mailpiler.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mailpiler.sh b/mailpiler.sh index 43bbb85..80668e2 100644 --- a/mailpiler.sh +++ b/mailpiler.sh @@ -5,14 +5,14 @@ # (C) 2021 Script design and prototype by Markus Helmke # (C) 2021 Script rework and documentation by Thorsten Spille -source ./zamba.conf +# configure system language +dpkg-reconfigure locales + +source /root/zamba.conf # Set Timezone ln -sf /usr/share/zoneinfo/$LXC_TIMEZONE /etc/localtime -# configure system language -dpkg-reconfigure locales - HOSTNAME=$(hostname -f) echo "Ensure your Hostname is set to your Piler FQDN!" From 5a8f2cb8f8e27fc4a6e09a162e1c64b10a5e983f Mon Sep 17 00:00:00 2001 From: Thorsten Spille Date: Tue, 13 Apr 2021 15:42:11 +0000 Subject: [PATCH 4/5] Moved gpg and apt-https to LXC_TOOLSET --- mailpiler.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/mailpiler.sh b/mailpiler.sh index 80668e2..fe635c4 100644 --- a/mailpiler.sh +++ b/mailpiler.sh @@ -27,8 +27,6 @@ else echo "Hostname matches PILER_FQDNAIN, so starting installation." fi -apt install -y gpg apt-transport-https lsb-release - 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 From 85dbb9181a4c2a8f50f47c12a95834bbd368c16c Mon Sep 17 00:00:00 2001 From: Thorsten Spille Date: Tue, 13 Apr 2021 15:44:54 +0000 Subject: [PATCH 5/5] Rearranged package installation --- mailpiler.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mailpiler.sh b/mailpiler.sh index fe635c4..6cb912d 100644 --- a/mailpiler.sh +++ b/mailpiler.sh @@ -27,13 +27,14 @@ else echo "Hostname matches PILER_FQDNAIN, so starting installation." 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 update && apt full-upgrade -y apt install -y $LXC_TOOLSET build-essential libwrap0-dev libpst-dev tnef libytnef0-dev unrtf catdoc libtre-dev tre-agrep poppler-utils libzip-dev unixodbc libpq5 software-properties-common libpoppler-dev openssl libssl-dev memcached telnet nginx mariadb-server default-libmysqlclient-dev python-mysqldb gcc libwrap0 libzip4 latex2rtf latex2html catdoc tnef zipcmp zipmerge ziptool libsodium23 +# install php +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 update && apt install -y php$PILER_PHP_VERSION-{fpm,common,ldap,mysql,cli,opcache,phpdbg,gd,memcache,json,readline,zip} apt purge -y postfix