From 1dd9ab004e6da8b44035d039f49c92ff17cd5746 Mon Sep 17 00:00:00 2001
From: Andris Reinman <andris@reinman.eu>
Date: Thu, 24 Aug 2023 10:34:17 +0300
Subject: [PATCH] updated install scrips

---
 setup/01_install_commits.sh     |  5 ++++-
 setup/04_install_import_keys.sh | 31 +++++++++++++++----------------
 setup/05_install_packages.sh    |  2 +-
 3 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/setup/01_install_commits.sh b/setup/01_install_commits.sh
index a7762ca5..13d1f460 100755
--- a/setup/01_install_commits.sh
+++ b/setup/01_install_commits.sh
@@ -2,8 +2,11 @@
 
 OURNAME=01_install_commits.sh
 
+apt-get update
+apt-get install -y lsb-release curl gnupg
+
 NODEREPO="node_20.x"
-MONGODB="4.4"
+MONGODB="7.0"
 CODENAME=`lsb_release -c -s`
 
 WILDDUCK_COMMIT="35f3c111afca59e3d56dd1724e420b44d68606e0"
diff --git a/setup/04_install_import_keys.sh b/setup/04_install_import_keys.sh
index 6e80dd15..17782181 100755
--- a/setup/04_install_import_keys.sh
+++ b/setup/04_install_import_keys.sh
@@ -20,30 +20,29 @@ echo "# Add your public key here
 chown -R deploy:deploy /home/deploy
 
 export DEBIAN_FRONTEND=noninteractive
+keyring="/usr/share/keyrings"
 
 # nodejs
-wget -qO- https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -
+node_key_url="https://deb.nodesource.com/gpgkey/nodesource.gpg.key"
+curl -s $node_key_url | gpg --dearmor | tee ${keyring}/nodesource.gpg >/dev/null
+
 echo "deb https://deb.nodesource.com/$NODEREPO $CODENAME main" > /etc/apt/sources.list.d/nodesource.list
 echo "deb-src https://deb.nodesource.com/$NODEREPO $CODENAME main" >> /etc/apt/sources.list.d/nodesource.list
 
-# mongo keys
-# ubuntu focal is supported as of 2021-06-14!
-MONGORELEASE=$CODENAME
-# if [ "$MONGORELEASE" = "focal" ]; then
-  # Ubuntu 20 is not yet supported (as of 2020-07-01), fallback to 18
-  # MONGORELEASE="bionic"
-# fi
-
-wget -qO- https://www.mongodb.org/static/pgp/server-${MONGODB}.asc | apt-key add
-echo "deb [ arch=amd64 ] http://repo.mongodb.org/apt/ubuntu $MONGORELEASE/mongodb-org/$MONGODB multiverse" > /etc/apt/sources.list.d/mongodb-org.list
+# mongodb
+mongo_key_url="https://pgp.mongodb.com/server-${MONGODB}.asc"
+curl -s $mongo_key_url | gpg --dearmor | tee ${keyring}/mongodb-server-${MONGODB}.gpg >/dev/null
+echo "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu ${CODENAME}/mongodb-org/${MONGODB} multiverse" | tee /etc/apt/sources.list.d/mongodb-org-${MONGODB}.list
 
 # rspamd
-wget -O- https://rspamd.com/apt-stable/gpg.key | apt-key add -
+rspamd_key_url="https://rspamd.com/apt-stable/gpg.key"
+curl -s $rspamd_key_url | gpg --dearmor | tee ${keyring}/rspamd.gpg >/dev/null
+
 echo "deb http://rspamd.com/apt-stable/ $CODENAME main" > /etc/apt/sources.list.d/rspamd.list
 echo "deb-src http://rspamd.com/apt-stable/ $CODENAME main" >> /etc/apt/sources.list.d/rspamd.list
-apt-get update
 
 # redis
-# use redis team repo
-add-apt-repository -y ppa:redislabs/redis
-# apt-add-repository -y ppa:chris-lea/redis-server
+curl -fsSL https://packages.redis.io/gpg | gpg --dearmor -o ${keyring}/redis-archive-keyring.gpg
+echo "deb [signed-by=${keyring}/redis-archive-keyring.gpg] https://packages.redis.io/deb $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/redis.list
+
+apt-get update
\ No newline at end of file
diff --git a/setup/05_install_packages.sh b/setup/05_install_packages.sh
index 01d94423..5deb8ff0 100755
--- a/setup/05_install_packages.sh
+++ b/setup/05_install_packages.sh
@@ -6,7 +6,7 @@ echo -e "\n-- Executing ${ORANGE}${OURNAME}${NC} subscript --"
 
 # install nginx
 apt-get update
-apt-get -q -y install pwgen git ufw build-essential libssl-dev dnsutils python software-properties-common nginx wget mongodb-org nodejs redis-server clamav clamav-daemon
+apt-get -q -y install pwgen git ufw build-essential libssl-dev dnsutils python3 software-properties-common nginx wget mongodb-org nodejs redis-server clamav clamav-daemon
 
 # rspamd
 apt-get -q -y --no-install-recommends install rspamd