Update installation instructions

artefactual · Apr 2, 2024 · 1d108ff · 1d108ff
1 parent 75da465
commit 1d108ff
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 45 deletions.
diff --git 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: 12-15
+      :lines: 15-18
 
 #. 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: 17-18
+      :lines: 20-21
 
 #. 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: 20-21
+      :lines: 23-24
 
 #. Install some needed packages
 
    .. literalinclude:: scripts/am-jammy-deb.sh
       :language: bash
-      :lines: 23
+      :lines: 26
 
 #. Install Elasticsearch (optional)
 
@@ -59,26 +59,21 @@ Ubuntu 22.04 (Jammy) installation instructions
 
    .. literalinclude:: scripts/am-jammy-deb.sh
       :language: bash
-      :lines: 24
+      :lines: 27
 
-#. Now that MySQL is up and running, create the Storage Service database and
-   set up the expected credentials.
+#. Now that MySQL is up and running, install the Storage Service. You will be
+   prompted to create a password for its database. If necessary, the password
+   can be changed after the installation is complete.
 
    .. literalinclude:: scripts/am-jammy-deb.sh
       :language: bash
-      :lines: 26-28
-
-#. Install the Storage Service package.
-
-   .. literalinclude:: scripts/am-jammy-deb.sh
-       :language: bash
-       :lines: 30
+      :lines: 29
 
 #. Configure the Storage Service.
 
    .. literalinclude:: scripts/am-jammy-deb.sh
       :language: bash
-      :lines: 32-33
+      :lines: 31-32
 
 #. Install the Archivematica packages. The order of installation is important -
    the archivematica-mcp-server package must be installed before the dashboard
@@ -90,13 +85,12 @@ Ubuntu 22.04 (Jammy) installation instructions
    database used by Archivematica. Depending on the version of MySQL that is
    installed, the interfaces that you see may differ slightly.
 
-   When you are prompted to create a password for the archivematica-mcp-server,
-   you must use ``demo`` as the password during the install process. The
-   password can be changed after the installation is complete.
+   You will be prompted to create a password for the database. If necessary,
+   the password can be changed after the installation is complete.
 
    .. literalinclude:: scripts/am-jammy-deb.sh
       :language: bash
-      :lines: 35-37
+      :lines: 34-37
 
 #.  Configure the Archivematica components (optional). There are a number of
     environment variables that Archivematica recognizes which can be used to
@@ -117,48 +111,48 @@ Ubuntu 22.04 (Jammy) installation instructions
 
 #. Configure the dashboard.
 
-    .. literalinclude:: scripts/am-jammy-deb.sh
-       :language: bash
-       :lines: 39
+   .. literalinclude:: scripts/am-jammy-deb.sh
+      :language: bash
+      :lines: 38
 
 #. Start Elasticsearch (optional).
 
-    .. note:: Skip this step if you are planning to run Archivematica in indexless
-       mode (without Elasticsearch).
+   .. note:: Skip this step if you are planning to run Archivematica in indexless
+      mode (without Elasticsearch).
 
-    .. literalinclude:: scripts/am-jammy-deb.sh
+   .. literalinclude:: scripts/am-jammy-deb.sh
       :language: bash
-      :lines: 41-43
+      :lines: 40-42
 
 #. Start the remaining services
 
-    .. literalinclude:: scripts/am-jammy-deb.sh
-       :language: bash
-       :lines: 45-55
+   .. literalinclude:: scripts/am-jammy-deb.sh
+      :language: bash
+      :lines: 44-54
 
-    If you have trouble with the gearman or clamav command try restarting it:
+   If you have trouble with the gearman or clamav command try restarting it:
 
-    .. code:: bash
+   .. code:: bash
 
        sudo service gearman-job-server restart
        sudo service clamav-daemon restart
 
 #. Configure your firewall (if applicable)
 
-    On Ubuntu, the default firewall configuration tool is ufw (Uncomplicated
-    Firewall). To see the firewall status, enter:
+   On Ubuntu, the default firewall configuration tool is ufw (Uncomplicated
+   Firewall). To see the firewall status, enter:
 
-    .. code:: bash
+   .. code:: bash
 
        sudo ufw status
 
-    If ufw is active, you must ensure that it is not blocking the ports used by
-    the dashboard and the Storage Service, i.e., 80 and 8000.
+   If ufw is active, you must ensure that it is not blocking the ports used by
+   the dashboard and the Storage Service, i.e., 80 and 8000.
 
 
-    .. literalinclude:: scripts/am-jammy-deb.sh
-       :language: bash
-       :lines: 57-60
+   .. literalinclude:: scripts/am-jammy-deb.sh
+      :language: bash
+      :lines: 57-59
 
 #. Complete :ref:`Post Install Configuration <ubuntu-post-install-config>`.
 

diff --git a/admin-manual/installation-setup/installation/scripts/am-jammy-deb.sh b/admin-manual/installation-setup/installation/scripts/am-jammy-deb.sh
@@ -5,9 +5,12 @@ set -euxo pipefail
 export DEBIAN_FRONTEND=noninteractive
 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-storage-service archivematica-storage-service/dbconfig-install boolean true"
+sudo debconf-set-selections <<< "archivematica-storage-service archivematica-storage-service/mysql/app-pass password demo-ss"
+sudo debconf-set-selections <<< "archivematica-storage-service archivematica-storage-service/app-password-confirm password demo-ss"
 sudo debconf-set-selections <<< "archivematica-mcp-server archivematica-mcp-server/dbconfig-install boolean true"
-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 debconf-set-selections <<< "archivematica-mcp-server archivematica-mcp-server/mysql/app-pass password demo-am"
+sudo debconf-set-selections <<< "archivematica-mcp-server archivematica-mcp-server/app-password-confirm password demo-am"
 
 curl -fsSL https://packages.archivematica.org/1.16.x/key.asc | sudo gpg --dearmor -o /etc/apt/keyrings/archivematica-1.16.x.gpg
 
@@ -23,10 +26,6 @@ sudo apt-get -y upgrade
 sudo apt-get install -y openjdk-8-jre-headless mysql-server
 sudo apt-get install -y elasticsearch
 
-sudo mysql -e "DROP DATABASE IF EXISTS SS; CREATE DATABASE SS CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;"
-sudo mysql -e "CREATE USER 'archivematica'@'localhost' IDENTIFIED BY 'demo';"
-sudo mysql -e "GRANT ALL ON SS.* TO 'archivematica'@'localhost';"
-
 sudo apt-get install -y archivematica-storage-service
 
 sudo rm -f /etc/nginx/sites-enabled/default