From 83ff38296278809be8d1ffead063802f0330aafa Mon Sep 17 00:00:00 2001 From: ssjeanderson Date: Tue, 23 Jan 2024 09:01:51 -0300 Subject: [PATCH 1/2] avoid deprecated apt-key apt-key command is being depracated --- .../installation/scripts/am-jammy-deb.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/admin-manual/installation-setup/installation/scripts/am-jammy-deb.sh b/admin-manual/installation-setup/installation/scripts/am-jammy-deb.sh index 54e1fcb7..3e97fc02 100644 --- a/admin-manual/installation-setup/installation/scripts/am-jammy-deb.sh +++ b/admin-manual/installation-setup/installation/scripts/am-jammy-deb.sh @@ -9,13 +9,13 @@ sudo debconf-set-selections <<< "archivematica-mcp-server archivematica-mcp-serv sudo debconf-set-selections <<< "archivematica-mcp-server archivematica-mcp-server/mysql/app-pass password demo" sudo debconf-set-selections <<< "archivematica-mcp-server archivematica-mcp-server/app-password-confirm password demo" -sudo wget -O - https://packages.archivematica.org/1.15.x/key.asc | sudo apt-key add - +curl -fsSL https://packages.archivematica.org/1.15.x/key.asc | sudo gpg --dearmor -o /etc/apt/keyrings/archivematica-1.15.x.gpg -sudo sh -c 'echo "deb [arch=amd64] http://packages.archivematica.org/1.15.x/ubuntu jammy main" > /etc/apt/sources.list.d/archivematica.list' -sudo sh -c 'echo "deb [arch=amd64] http://packages.archivematica.org/1.15.x/ubuntu-externals jammy main" > /etc/apt/sources.list.d/archivematica-externals.list' +sudo sh -c 'echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/archivematica-1.15.x.gpg] http://packages.archivematica.org/1.15.x/ubuntu jammy main" > /etc/apt/sources.list.d/archivematica.list' +sudo sh -c 'echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/archivematica-1.15.x.gpg] http://packages.archivematica.org/1.15.x/ubuntu-externals jammy main" > /etc/apt/sources.list.d/archivematica-externals.list' -wget -qO - https://artifacts.elastic.co/GPG-KEY-elasticsearch | sudo apt-key add - -echo "deb https://artifacts.elastic.co/packages/6.x/apt stable main" | sudo tee -a /etc/apt/sources.list.d/elastic-6.x.list +curl -fsSL https://artifacts.elastic.co/GPG-KEY-elasticsearch | sudo gpg --dearmor -o /usr/share/keyrings/elasticsearch-keyring.gpg +echo "deb [signed-by=/usr/share/keyrings/elasticsearch-keyring.gpg] https://artifacts.elastic.co/packages/6.x/apt stable main" | sudo tee -a /etc/apt/sources.list.d/elastic-6.x.list sudo apt-get update sudo apt-get -y upgrade From 31414c2fd0432d9c35ae83fb98f22711fe019a62 Mon Sep 17 00:00:00 2001 From: ssjeanderson Date: Wed, 24 Jan 2024 10:50:59 -0300 Subject: [PATCH 2/2] Adjust keyring path for elastic repo Co-authored-by: Douglas Cerna --- .../installation-setup/installation/scripts/am-jammy-deb.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/admin-manual/installation-setup/installation/scripts/am-jammy-deb.sh b/admin-manual/installation-setup/installation/scripts/am-jammy-deb.sh index 3e97fc02..7088b05e 100644 --- a/admin-manual/installation-setup/installation/scripts/am-jammy-deb.sh +++ b/admin-manual/installation-setup/installation/scripts/am-jammy-deb.sh @@ -14,8 +14,8 @@ curl -fsSL https://packages.archivematica.org/1.15.x/key.asc | sudo gpg --dearmo sudo sh -c 'echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/archivematica-1.15.x.gpg] http://packages.archivematica.org/1.15.x/ubuntu jammy main" > /etc/apt/sources.list.d/archivematica.list' sudo sh -c 'echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/archivematica-1.15.x.gpg] http://packages.archivematica.org/1.15.x/ubuntu-externals jammy main" > /etc/apt/sources.list.d/archivematica-externals.list' -curl -fsSL https://artifacts.elastic.co/GPG-KEY-elasticsearch | sudo gpg --dearmor -o /usr/share/keyrings/elasticsearch-keyring.gpg -echo "deb [signed-by=/usr/share/keyrings/elasticsearch-keyring.gpg] https://artifacts.elastic.co/packages/6.x/apt stable main" | sudo tee -a /etc/apt/sources.list.d/elastic-6.x.list +curl -fsSL https://artifacts.elastic.co/GPG-KEY-elasticsearch | sudo gpg --dearmor -o /etc/apt/keyrings/elasticsearch-6.x.gpg +echo "deb [signed-by=/etc/apt/keyrings/elasticsearch-6.x.gpg] https://artifacts.elastic.co/packages/6.x/apt stable main" | sudo tee -a /etc/apt/sources.list.d/elastic-6.x.list sudo apt-get update sudo apt-get -y upgrade