From 55d50e3ba65c20edfc66f9c254019a999a3455b8 Mon Sep 17 00:00:00 2001 From: thorstenspille Date: Sun, 2 May 2021 19:21:09 +0200 Subject: [PATCH] Added command to load constants-service.conf --- src/mailpiler/install-service.sh | 14 ++++++++++---- src/matrix/install-service.sh | 5 +++-- src/zmb-member/install-service.sh | 1 + src/zmb-standalone/install-service.sh | 1 + 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/mailpiler/install-service.sh b/src/mailpiler/install-service.sh index c42fa9a..d7df5ae 100644 --- a/src/mailpiler/install-service.sh +++ b/src/mailpiler/install-service.sh @@ -6,6 +6,7 @@ # (C) 2021 Script rework and documentation by Thorsten Spille source /root/zamba.conf +source /root/constants-service.conf HOSTNAME=$(hostname -f) @@ -16,18 +17,23 @@ echo $HOSTNAME if [ "$HOSTNAME" != "$PILER_FQDN" ] then - echo "Hostname doesn't match PILER_FQDNain! Check install.sh, /etc/hosts, /etc/hostname." && exit + echo "Hostname doesn't match $PILER_FQDN! Check install.sh, /etc/hosts, /etc/hostname." && exit else - echo "Hostname matches PILER_FQDNAIN, so starting installation." + echo "Hostname matches $PILER_FQDN, so starting installation." fi # 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 -DEBIAN_FRONTEND=nonintercative DEBIAN_PRIORITY=critical apt install -y -qq build-essential libwrap0-dev libpst-dev tnef libytnef0-dev unrtf catdoc libtre-dev tre-agrep poppler-utils libzip-dev unixodbc libpq5 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 php$PILER_PHP_VERSION-{fpm,common,ldap,mysql,cli,opcache,phpdbg,gd,memcache,json,readline,zip} +apt update -DEBIAN_FRONTEND=nonintercative DEBIAN_PRIORITY=critical apt remove --purge -y -qq postfix +DEBIAN_FRONTEND=noninteractive DEBIAN_PRIORITY=critical apt install -y -qq build-essential libwrap0-dev libpst-dev tnef libytnef0-dev \ +unrtf catdoc libtre-dev tre-agrep poppler-utils libzip-dev unixodbc libpq5 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 \ +php$PILER_PHP_VERSION-{fpm,common,ldap,mysql,cli,opcache,phpdbg,gd,memcache,json,readline,zip} + +DEBIAN_FRONTEND=noninteractive DEBIAN_PRIORITY=critical apt remove --purge -y -qq postfix cat > /etc/mysql/conf.d/mailpiler.conf < source /root/zamba.conf +source /root/constants-service.conf MRX_PKE=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1) @@ -13,12 +14,12 @@ ELE_DBNAME="synapse_db" ELE_DBUSER="synapse_user" ELE_DBPASS=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1) -DEBIAN_FRONTEND=nonintercative DEBIAN_PRIORITY=critical apt install -y -qq nginx postgresql python3-psycopg2 +DEBIAN_FRONTEND=noninteractive DEBIAN_PRIORITY=critical apt install -y -qq nginx postgresql python3-psycopg2 wget -O /usr/share/keyrings/matrix-org-archive-keyring.gpg https://packages.matrix.org/debian/matrix-org-archive-keyring.gpg echo "deb [signed-by=/usr/share/keyrings/matrix-org-archive-keyring.gpg] https://packages.matrix.org/debian/ $(lsb_release -cs) main" | tee /etc/apt/sources.list.d/matrix-org.list apt update -DEBIAN_FRONTEND=nonintercative DEBIAN_PRIORITY=critical apt install -y -qq matrix-synapse-py3 +DEBIAN_FRONTEND=noninteractive DEBIAN_PRIORITY=critical apt install -y -qq matrix-synapse-py3 systemctl enable matrix-synapse ss -tulpen diff --git a/src/zmb-member/install-service.sh b/src/zmb-member/install-service.sh index e4edaf0..e93e54f 100644 --- a/src/zmb-member/install-service.sh +++ b/src/zmb-member/install-service.sh @@ -6,6 +6,7 @@ # (C) 2021 Script rework and documentation by Thorsten Spille source /root/zamba.conf +source /root/constants-service.conf DEBIAN_FRONTEND=noninteractive DEBIAN_PRIORITY=critical apt install -y -o DPkg::options::="--force-confdef" -o DPkg::options::="--force-confold" acl samba winbind libpam-winbind libnss-winbind krb5-user krb5-config samba-dsdb-modules samba-vfs-modules diff --git a/src/zmb-standalone/install-service.sh b/src/zmb-standalone/install-service.sh index 07ba9f7..d808dcf 100644 --- a/src/zmb-standalone/install-service.sh +++ b/src/zmb-standalone/install-service.sh @@ -6,6 +6,7 @@ # (C) 2021 Script rework and documentation by Thorsten Spille source /root/zamba.conf +source /root/constants-service.conf # add wsdd package repo apt-key adv --fetch-keys https://pkg.ltec.ch/public/conf/ltec-ag.gpg.key