From c079754fc3fc7bb4b8bf27f2ff8b6d527da1e956 Mon Sep 17 00:00:00 2001 From: "Douglas Cerna (Soy Douglas)" Date: Wed, 18 Oct 2023 23:26:53 +0000 Subject: [PATCH] Update Ubuntu install instructions --- .../installation/install-ubuntu.rst | 26 +++++++++---------- .../installation/scripts/am-jammy-deb.sh | 6 +---- 2 files changed, 14 insertions(+), 18 deletions(-) diff --git a/admin-manual/installation-setup/installation/install-ubuntu.rst b/admin-manual/installation-setup/installation/install-ubuntu.rst index 8eff970a..d6a23077 100644 --- a/admin-manual/installation-setup/installation/install-ubuntu.rst +++ b/admin-manual/installation-setup/installation/install-ubuntu.rst @@ -26,7 +26,7 @@ Ubuntu 22.04 (Jammy) installation instructions .. literalinclude:: scripts/am-jammy-deb.sh :language: bash - :lines: 14-19 + :lines: 12-15 #. Add Elasticsearch package source (optional). Elasticsearch comes from its own package repository. @@ -37,20 +37,20 @@ Ubuntu 22.04 (Jammy) installation instructions .. literalinclude:: scripts/am-jammy-deb.sh :language: bash - :lines: 21-22 + :lines: 17-18 #. Update to the most recent OS release. This step will also fetch a list of the software from the package repositories you just added to your system. .. literalinclude:: scripts/am-jammy-deb.sh :language: bash - :lines: 24-25 + :lines: 20-21 #. Install some needed packages .. literalinclude:: scripts/am-jammy-deb.sh :language: bash - :lines: 27 + :lines: 23 #. Install Elasticsearch (optional) @@ -59,26 +59,26 @@ Ubuntu 22.04 (Jammy) installation instructions .. literalinclude:: scripts/am-jammy-deb.sh :language: bash - :lines: 28 + :lines: 24 #. Now that MySQL is up and running, create the Storage Service database and set up the expected credentials. .. literalinclude:: scripts/am-jammy-deb.sh :language: bash - :lines: 30-32 + :lines: 26-28 #. Install the Storage Service package. .. literalinclude:: scripts/am-jammy-deb.sh :language: bash - :lines: 34 + :lines: 30 #. Configure the Storage Service. .. literalinclude:: scripts/am-jammy-deb.sh :language: bash - :lines: 36-37 + :lines: 32-33 #. Install the Archivematica packages. The order of installation is important - the archivematica-mcp-server package must be installed before the dashboard @@ -96,7 +96,7 @@ Ubuntu 22.04 (Jammy) installation instructions .. literalinclude:: scripts/am-jammy-deb.sh :language: bash - :lines: 39-41 + :lines: 35-37 #. Configure the Archivematica components (optional). There are a number of environment variables that Archivematica recognizes which can be used to @@ -119,7 +119,7 @@ Ubuntu 22.04 (Jammy) installation instructions .. literalinclude:: scripts/am-jammy-deb.sh :language: bash - :lines: 43 + :lines: 39 #. Start Elasticsearch (optional). @@ -128,13 +128,13 @@ Ubuntu 22.04 (Jammy) installation instructions .. literalinclude:: scripts/am-jammy-deb.sh :language: bash - :lines: 45-47 + :lines: 41-43 #. Start the remaining services .. literalinclude:: scripts/am-jammy-deb.sh :language: bash - :lines: 49-58 + :lines: 45-54 If you have trouble with the gearman or clamav command try restarting it: @@ -158,7 +158,7 @@ Ubuntu 22.04 (Jammy) installation instructions .. literalinclude:: scripts/am-jammy-deb.sh :language: bash - :lines: 60-63 + :lines: 56-59 #. Complete :ref:`Post Install Configuration `. 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 4594bb1f..54e1fcb7 100644 --- a/admin-manual/installation-setup/installation/scripts/am-jammy-deb.sh +++ b/admin-manual/installation-setup/installation/scripts/am-jammy-deb.sh @@ -3,8 +3,6 @@ set -euxo pipefail export DEBIAN_FRONTEND=noninteractive -sudo debconf-set-selections <<< 'mysql-server mysql-server/root_password password your_password' -sudo debconf-set-selections <<< 'mysql-server mysql-server/root_password_again password your_password' sudo debconf-set-selections <<< "postfix postfix/mailname string your.hostname.com" sudo debconf-set-selections <<< "postfix postfix/main_mailer_type string 'Internet Site'" sudo debconf-set-selections <<< "archivematica-mcp-server archivematica-mcp-server/dbconfig-install boolean true" @@ -13,10 +11,8 @@ sudo debconf-set-selections <<< "archivematica-mcp-server archivematica-mcp-serv sudo wget -O - https://packages.archivematica.org/1.15.x/key.asc | sudo apt-key add - -#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 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 [trusted=yes] https://jenkins-ci.archivematica.org/repos/am-packbuild/1.15.0/jammy ./" > /etc/apt/sources.list.d/archivematica-jenkins.list' -sudo sh -c 'echo "deb [trusted=yes] https://jenkins-ci.archivematica.org/repos/am-packbuild/0.21.0/jammy ./" > /etc/apt/sources.list.d/archivematica-jenkins-ss.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