From 6a429c116dc50995c25669ccc144dbe801e725d4 Mon Sep 17 00:00:00 2001 From: Dhwani Patel Date: Fri, 6 Oct 2023 08:21:22 -0600 Subject: [PATCH] Release AM 1.15.0 + SS 0.21.0 --- .tx/config | 346 ------------------ admin-manual/index.rst | 2 +- .../customization/dashboard-config.rst | 12 +- .../customization/scaling-archivematica.rst | 4 +- .../customization/task-config.rst | 2 +- .../installation/_csv/install-development.csv | 4 +- .../installation/_csv/install-new.csv | 4 +- .../installation/install-advanced.rst | 9 +- .../installation/install-ansible.rst | 8 +- .../{install-centos.rst => install-rocky.rst} | 68 ++-- .../installation/install-ubuntu.rst | 36 +- .../installation/installation.rst | 35 +- .../{am-bionic-deb.sh => am-jammy-deb.sh} | 6 +- .../{am-centos-rpm.sh => am-rocky-rpm.sh} | 8 +- .../upgrading/upgrading.rst | 30 +- admin-manual/maintenance/maintenance.rst | 4 +- admin-manual/security/security.rst | 28 +- conf.py | 8 +- dev-manual/development-environment.rst | 2 +- style_guide.md | 12 +- 20 files changed, 135 insertions(+), 493 deletions(-) delete mode 100644 .tx/config rename admin-manual/installation-setup/installation/{install-centos.rst => install-rocky.rst} (81%) rename admin-manual/installation-setup/installation/scripts/{am-bionic-deb.sh => am-jammy-deb.sh} (93%) rename admin-manual/installation-setup/installation/scripts/{am-centos-rpm.sh => am-rocky-rpm.sh} (94%) diff --git a/.tx/config b/.tx/config deleted file mode 100644 index 154cba45..00000000 --- a/.tx/config +++ /dev/null @@ -1,346 +0,0 @@ -[main] -host = https://www.transifex.com -type = PO - -[archivematica-docs.index] -file_filter = locale//LC_MESSAGES/index.po -source_file = _build/locale/index.pot -source_lang = en -type = PO - -[archivematica-docs.contents] -file_filter = locale//LC_MESSAGES/contents.po -source_file = _build/locale/contents.pot -source_lang = en -type = PO - -[archivematica-docs.admin-manual--index] -file_filter = locale//LC_MESSAGES/admin-manual/index.po -source_file = _build/locale/admin-manual/index.pot -source_lang = en -type = PO - -[archivematica-docs.admin-manual--security--security] -file_filter = locale//LC_MESSAGES/admin-manual/security/security.po -source_file = _build/locale/admin-manual/security/security.pot -source_lang = en -type = PO - -[archivematica-docs.admin-manual--maintenance--maintenance] -file_filter = locale//LC_MESSAGES/admin-manual/maintenance/maintenance.po -source_file = _build/locale/admin-manual/maintenance/maintenance.pot -source_lang = en -type = PO - -[archivematica-docs.admin-manual--installation-setup--installation--install-ubuntu] -file_filter = locale//LC_MESSAGES/admin-manual/installation-setup/installation/install-ubuntu.po -source_file = _build/locale/admin-manual/installation-setup/installation/install-ubuntu.pot -source_lang = en -type = PO - -[archivematica-docs.admin-manual--installation-setup--installation--install-advanced] -file_filter = locale//LC_MESSAGES/admin-manual/installation-setup/installation/install-advanced.po -source_file = _build/locale/admin-manual/installation-setup/installation/install-advanced.pot -source_lang = en -type = PO - -[archivematica-docs.admin-manual--installation-setup--installation--install-centos] -file_filter = locale//LC_MESSAGES/admin-manual/installation-setup/installation/install-centos.po -source_file = _build/locale/admin-manual/installation-setup/installation/install-centos.pot -source_lang = en -type = PO - -[archivematica-docs.admin-manual--installation-setup--installation--install-ansible] -file_filter = locale//LC_MESSAGES/admin-manual/installation-setup/installation/install-ansible.po -source_file = _build/locale/admin-manual/installation-setup/installation/install-ansible.pot -source_lang = en -type = PO - -[archivematica-docs.admin-manual--installation-setup--installation--installation] -file_filter = locale//LC_MESSAGES/admin-manual/installation-setup/installation/installation.po -source_file = _build/locale/admin-manual/installation-setup/installation/installation.pot -source_lang = en -type = PO - -[archivematica-docs.admin-manual--installation-setup--integrations--integrations] -file_filter = locale//LC_MESSAGES/admin-manual/installation-setup/integrations/integrations.po -source_file = _build/locale/admin-manual/installation-setup/integrations/integrations.pot -source_lang = en -type = PO - -[archivematica-docs.admin-manual--installation-setup--integrations--atom-setup] -file_filter = locale//LC_MESSAGES/admin-manual/installation-setup/integrations/atom-setup.po -source_file = _build/locale/admin-manual/installation-setup/integrations/atom-setup.pot -source_lang = en -type = PO - -[archivematica-docs.admin-manual--installation-setup--integrations--archivesspace-setup] -file_filter = locale//LC_MESSAGES/admin-manual/installation-setup/integrations/archivesspace-setup.po -source_file = _build/locale/admin-manual/installation-setup/integrations/archivesspace-setup.pot -source_lang = en -type = PO - -[archivematica-docs.admin-manual--installation-setup--integrations--duracloud-setup] -file_filter = locale//LC_MESSAGES/admin-manual/installation-setup/integrations/duracloud-setup.po -source_file = _build/locale/admin-manual/installation-setup/integrations/duracloud-setup.pot -source_lang = en -type = PO - -[archivematica-docs.admin-manual--installation-setup--integrations--binder-setup] -file_filter = locale//LC_MESSAGES/admin-manual/installation-setup/integrations/binder-setup.po -source_file = _build/locale/admin-manual/installation-setup/integrations/binder-setup.pot -source_lang = en -type = PO - -[archivematica-docs.admin-manual--installation-setup--upgrading--upgrading] -file_filter = locale//LC_MESSAGES/admin-manual/installation-setup/upgrading/upgrading.po -source_file = _build/locale/admin-manual/installation-setup/upgrading/upgrading.pot -source_lang = en -type = PO - -[archivematica-docs.admin-manual--installation-setup--customization--dashboard-config] -file_filter = locale//LC_MESSAGES/admin-manual/installation-setup/customization/dashboard-config.po -source_file = _build/locale/admin-manual/installation-setup/customization/dashboard-config.pot -source_lang = en -type = PO - -[archivematica-docs.admin-manual--installation-setup--customization--task-config] -file_filter = locale//LC_MESSAGES/admin-manual/installation-setup/customization/task-config.po -source_file = _build/locale/admin-manual/installation-setup/customization/task-config.pot -source_lang = en -type = PO - -[archivematica-docs.admin-manual--installation-setup--customization--antivirus-admin] -file_filter = locale//LC_MESSAGES/admin-manual/installation-setup/customization/antivirus-admin.po -source_file = _build/locale/admin-manual/installation-setup/customization/antivirus-admin.pot -source_lang = en -type = PO - -[archivematica-docs.admin-manual--installation-setup--customization--customization] -file_filter = locale//LC_MESSAGES/admin-manual/installation-setup/customization/customization.po -source_file = _build/locale/admin-manual/installation-setup/customization/customization.pot -source_lang = en -type = PO - -[archivematica-docs.getting-started--index] -file_filter = locale//LC_MESSAGES/getting-started/index.po -source_file = _build/locale/getting-started/index.pot -source_lang = en -type = PO - -[archivematica-docs.getting-started--overview--microservices] -file_filter = locale//LC_MESSAGES/getting-started/overview/microservices.po -source_file = _build/locale/getting-started/overview/microservices.pot -source_lang = en -type = PO - -[archivematica-docs.getting-started--overview--intro] -file_filter = locale//LC_MESSAGES/getting-started/overview/intro.po -source_file = _build/locale/getting-started/overview/intro.pot -source_lang = en -type = PO - -[archivematica-docs.getting-started--overview--dashboard] -file_filter = locale//LC_MESSAGES/getting-started/overview/dashboard.po -source_file = _build/locale/getting-started/overview/dashboard.pot -source_lang = en -type = PO - -[archivematica-docs.getting-started--overview--system-requirements] -file_filter = locale//LC_MESSAGES/getting-started/overview/system-requirements.po -source_file = _build/locale/getting-started/overview/system-requirements.pot -source_lang = en -type = PO - -[archivematica-docs.getting-started--overview--technical] -file_filter = locale//LC_MESSAGES/getting-started/overview/technical.po -source_file = _build/locale/getting-started/overview/technical.pot -source_lang = en -type = PO - -[archivematica-docs.getting-started--quick-start--quick-start] -file_filter = locale//LC_MESSAGES/getting-started/quick-start/quick-start.po -source_file = _build/locale/getting-started/quick-start/quick-start.pot -source_lang = en -type = PO - -[archivematica-docs.getting-started--quick-start--configuration] -file_filter = locale//LC_MESSAGES/getting-started/quick-start/configuration.po -source_file = _build/locale/getting-started/quick-start/configuration.pot -source_lang = en -type = PO - -[archivematica-docs.getting-started--other-resources--trac] -file_filter = locale//LC_MESSAGES/getting-started/other-resources/trac.po -source_file = _build/locale/getting-started/other-resources/trac.pot -source_lang = en -type = PO - -[archivematica-docs.getting-started--troubleshooting--error-reporting] -file_filter = locale//LC_MESSAGES/getting-started/troubleshooting/error-reporting.po -source_file = _build/locale/getting-started/troubleshooting/error-reporting.pot -source_lang = en -type = PO - -[archivematica-docs.getting-started--troubleshooting--faq] -file_filter = locale//LC_MESSAGES/getting-started/troubleshooting/faq.po -source_file = _build/locale/getting-started/troubleshooting/faq.pot -source_lang = en -type = PO - -[archivematica-docs.getting-started--troubleshooting--error-handling] -file_filter = locale//LC_MESSAGES/getting-started/troubleshooting/error-handling.po -source_file = _build/locale/getting-started/troubleshooting/error-handling.pot -source_lang = en -type = PO - -[archivematica-docs.user-manual--index] -file_filter = locale//LC_MESSAGES/user-manual/index.po -source_file = _build/locale/user-manual/index.pot -source_lang = en -type = PO - -[archivematica-docs.user-manual--administer--dashboard-admin] -file_filter = locale//LC_MESSAGES/user-manual/administer/dashboard-admin.po -source_file = _build/locale/user-manual/administer/dashboard-admin.pot -source_lang = en -type = PO - -[archivematica-docs.user-manual--transfer--forensic] -file_filter = locale//LC_MESSAGES/user-manual/transfer/forensic.po -source_file = _build/locale/user-manual/transfer/forensic.pot -source_lang = en -type = PO - -[archivematica-docs.user-manual--transfer--import-metadata] -file_filter = locale//LC_MESSAGES/user-manual/transfer/import-metadata.po -source_file = _build/locale/user-manual/transfer/import-metadata.pot -source_lang = en -type = PO - -[archivematica-docs.user-manual--transfer--manage-backlog] -file_filter = locale//LC_MESSAGES/user-manual/transfer/manage-backlog.po -source_file = _build/locale/user-manual/transfer/manage-backlog.pot -source_lang = en -type = PO - -[archivematica-docs.user-manual--transfer--dataverse] -file_filter = locale//LC_MESSAGES/user-manual/transfer/dataverse.po -source_file = _build/locale/user-manual/transfer/dataverse.pot -source_lang = en -type = PO - -[archivematica-docs.user-manual--transfer--transfer] -file_filter = locale//LC_MESSAGES/user-manual/transfer/transfer.po -source_file = _build/locale/user-manual/transfer/transfer.pot -source_lang = en -type = PO - -[archivematica-docs.user-manual--transfer--scan-for-viruses] -file_filter = locale//LC_MESSAGES/user-manual/transfer/scan-for-viruses.po -source_file = _build/locale/user-manual/transfer/scan-for-viruses.pot -source_lang = en -type = PO - -[archivematica-docs.user-manual--transfer--dspace] -file_filter = locale//LC_MESSAGES/user-manual/transfer/dspace.po -source_file = _build/locale/user-manual/transfer/dspace.pot -source_lang = en -type = PO - -[archivematica-docs.user-manual--transfer--bags] -file_filter = locale//LC_MESSAGES/user-manual/transfer/bags.po -source_file = _build/locale/user-manual/transfer/bags.pot -source_lang = en -type = PO - -[archivematica-docs.user-manual--transfer--digitized] -file_filter = locale//LC_MESSAGES/user-manual/transfer/digitized.po -source_file = _build/locale/user-manual/transfer/digitized.pot -source_lang = en -type = PO - -[archivematica-docs.user-manual--metadata--dublincore] -file_filter = locale//LC_MESSAGES/user-manual/metadata/dublincore.po -source_file = _build/locale/user-manual/metadata/dublincore.pot -source_lang = en -type = PO - -[archivematica-docs.user-manual--metadata--premis] -file_filter = locale//LC_MESSAGES/user-manual/metadata/premis.po -source_file = _build/locale/user-manual/metadata/premis.pot -source_lang = en -type = PO - -[archivematica-docs.user-manual--appraisal--appraisal] -file_filter = locale//LC_MESSAGES/user-manual/appraisal/appraisal.po -source_file = _build/locale/user-manual/appraisal/appraisal.pot -source_lang = en -type = PO - -[archivematica-docs.user-manual--preservation--preservation-planning] -file_filter = locale//LC_MESSAGES/user-manual/preservation/preservation-planning.po -source_file = _build/locale/user-manual/preservation/preservation-planning.pot -source_lang = en -type = PO - -[archivematica-docs.user-manual--translations--translations] -file_filter = locale//LC_MESSAGES/user-manual/translations/translations.po -source_file = _build/locale/user-manual/translations/translations.pot -source_lang = en -type = PO - -[archivematica-docs.user-manual--access--access] -file_filter = locale//LC_MESSAGES/user-manual/access/access.po -source_file = _build/locale/user-manual/access/access.pot -source_lang = en -type = PO - -[archivematica-docs.user-manual--access--contentdm] -file_filter = locale//LC_MESSAGES/user-manual/access/contentdm.po -source_file = _build/locale/user-manual/access/contentdm.pot -source_lang = en -type = PO - -[archivematica-docs.user-manual--access--archivists-toolkit] -file_filter = locale//LC_MESSAGES/user-manual/access/archivists-toolkit.po -source_file = _build/locale/user-manual/access/archivists-toolkit.pot -source_lang = en -type = PO - -[archivematica-docs.user-manual--backlog--backlog] -file_filter = locale//LC_MESSAGES/user-manual/backlog/backlog.po -source_file = _build/locale/user-manual/backlog/backlog.pot -source_lang = en -type = PO - -[archivematica-docs.user-manual--archival-storage--archival-storage] -file_filter = locale//LC_MESSAGES/user-manual/archival-storage/archival-storage.po -source_file = _build/locale/user-manual/archival-storage/archival-storage.pot -source_lang = en -type = PO - -[archivematica-docs.user-manual--archival-storage--aic] -file_filter = locale//LC_MESSAGES/user-manual/archival-storage/aic.po -source_file = _build/locale/user-manual/archival-storage/aic.pot -source_lang = en -type = PO - -[archivematica-docs.user-manual--archival-storage--aip-structure] -file_filter = locale//LC_MESSAGES/user-manual/archival-storage/aip-structure.po -source_file = _build/locale/user-manual/archival-storage/aip-structure.pot -source_lang = en -type = PO - -[archivematica-docs.user-manual--ingest--ingest] -file_filter = locale//LC_MESSAGES/user-manual/ingest/ingest.po -source_file = _build/locale/user-manual/ingest/ingest.pot -source_lang = en -type = PO - -[archivematica-docs.user-manual--ingest--manual-normalization] -file_filter = locale//LC_MESSAGES/user-manual/ingest/manual-normalization.po -source_file = _build/locale/user-manual/ingest/manual-normalization.pot -source_lang = en -type = PO - diff --git a/admin-manual/index.rst b/admin-manual/index.rst index 04242051..e493781d 100644 --- a/admin-manual/index.rst +++ b/admin-manual/index.rst @@ -11,7 +11,7 @@ set of links to each chapter's main sections. installation-setup/installation/installation installation-setup/installation/install-ubuntu - installation-setup/installation/install-centos + installation-setup/installation/install-rocky installation-setup/installation/install-ansible installation-setup/installation/install-advanced installation-setup/upgrading/upgrading diff --git a/admin-manual/installation-setup/customization/dashboard-config.rst b/admin-manual/installation-setup/customization/dashboard-config.rst index 0510d1a0..44345347 100644 --- a/admin-manual/installation-setup/customization/dashboard-config.rst +++ b/admin-manual/installation-setup/customization/dashboard-config.rst @@ -426,15 +426,15 @@ Add the SSH key that we generated before: permissions to this directory in order to delete it. The easiest way is to use the setfacl command. - Install the `acl` package on Ubuntu or CentOS: + Install the `acl` package on Ubuntu or Rocky Linux: .. code-block:: bash sudo apt-get install acl # Ubuntu - sudo yum install acl # CentOS + sudo yum install acl # Rocky Linux - Create a new SWORD deposit directory (Use the `nginx` group CentOS instead - of `www-data`): + Create a new SWORD deposit directory (Use the `nginx` group on Rocky Linux + instead of `www-data`): .. code-block:: bash @@ -442,7 +442,7 @@ Add the SSH key that we generated before: sudo chown archivematica:www-data /home/archivematica/atom_sword_deposit sudo chmod 770 /home/archivematica/atom_sword_deposit - Set the ACL on new directory (Use the `nginx` user on CentOS instead of + Set the ACL on new directory (Use the `nginx` user on Rocky Linux instead of `www-data`) : .. code-block:: bash @@ -785,7 +785,7 @@ when deploying using Ansible. For manual installations, please use the web configuration method described in the Post Install Configuration sections: * :ref:`Ubuntu Post Install Configuration `. -* :ref:`CentOS Post Install Configuration `. +* :ref:`Rocky Linux Post Install Configuration `. Security ^^^^^^^^ diff --git a/admin-manual/installation-setup/customization/scaling-archivematica.rst b/admin-manual/installation-setup/customization/scaling-archivematica.rst index 2e89e471..a3449e4d 100644 --- a/admin-manual/installation-setup/customization/scaling-archivematica.rst +++ b/admin-manual/installation-setup/customization/scaling-archivematica.rst @@ -98,8 +98,8 @@ many CPUs. To deploy another instance of MCPClient on the same machine we recommend creating an additional `systemd`_ unit. A second unit can be created by -creating another `unit file`_ for the MCPClient service. For example, in CentOS -the existing `MCPClient unit file`_ is located in +creating another `unit file`_ for the MCPClient service. For example, in Rocky +Linux the existing `MCPClient unit file`_ is located in `/etc/systemd/system/archivematica-mcp-client.service`. To add a unit, create a copy of that unit file with a different name, such as\ `/etc/systemd/system/archivematica-mcp-client-two.service` diff --git a/admin-manual/installation-setup/customization/task-config.rst b/admin-manual/installation-setup/customization/task-config.rst index dfefe68c..247a9730 100644 --- a/admin-manual/installation-setup/customization/task-config.rst +++ b/admin-manual/installation-setup/customization/task-config.rst @@ -33,7 +33,7 @@ depends on the deployment method used. Please consult the relevant documentation for your deployment method if you are interested in disabling output capturing. -- :ref:`Environment variable configuration for CentOS package-based installations ` +- :ref:`Environment variable configuration for Rocky Linux package-based installations ` - :ref:`Environment variable configuration for Ubuntu package-based installations ` - :ref:`Environment variable configuration for Ubuntu Ansible-based installations ` - `Environment variable configuration for Docker Compose installations `_ diff --git a/admin-manual/installation-setup/installation/_csv/install-development.csv b/admin-manual/installation-setup/installation/_csv/install-development.csv index dbf6fb07..a89b1838 100644 --- a/admin-manual/installation-setup/installation/_csv/install-development.csv +++ b/admin-manual/installation-setup/installation/_csv/install-development.csv @@ -1,4 +1,2 @@ Development environments,, -"Docker and Linux -",`Installing Archivematica Using Docker Compose on Linux `_,Docker will provide instructions on how to use it as a non-root user. This may not be desirable for all. -Docker and Mac,`Installing Archivematica Using Docker Compose on Mac `_ ,Installation of Archivematica on machines running macOS using Docker is possible but still in development and may require some extra steps. +"Docker and Linux",`Archivematica development on Docker Compose `_,Docker will provide instructions on how to use it as a non-root user. This may not be desirable for all. diff --git a/admin-manual/installation-setup/installation/_csv/install-new.csv b/admin-manual/installation-setup/installation/_csv/install-new.csv index 4469d585..5f2091fe 100644 --- a/admin-manual/installation-setup/installation/_csv/install-new.csv +++ b/admin-manual/installation-setup/installation/_csv/install-new.csv @@ -1,4 +1,4 @@ New installations for production deployment,, -Ubuntu 18.04 64-bit Server Edition,:ref:`Automated install using Ansible Ubuntu 18.04 \(Bionic\)`,"These instructions will not work if you are using a Windows machine as the host environment. For Windows installations, see the :ref:`manual install instructions ` for production." -CentOS 7 64-bit,:ref:`Installing Archivematica on CentOS/Red Hat`,Archivematica versions 1.5.1 and higher support installation on CentOS/Red Hat. +Ubuntu 22.04 64-bit Server Edition,:ref:`Automated install using Ansible Ubuntu 22.04 \(Jammy\)`,"These instructions will not work if you are using a Windows machine as the host environment." +Rocky Linux 9 x86-64,:ref:`Installing Archivematica on Rocky Linux 9 \(Blue Onyx\)`,Archivematica versions 1.15.0 and higher support installation on Rocky Linux 9. Windows OS,Not supported, diff --git a/admin-manual/installation-setup/installation/install-advanced.rst b/admin-manual/installation-setup/installation/install-advanced.rst index 2d631e17..0f49ef62 100644 --- a/admin-manual/installation-setup/installation/install-advanced.rst +++ b/admin-manual/installation-setup/installation/install-advanced.rst @@ -19,12 +19,6 @@ The recommended way to install Archivematica for development is with Docker. For instructions on how to deploy Archivematica in Docker containers, see the `development environment instructions`_. -It's also possible to deploy Archivematica using Ansible and Vagrant. For -instructions on how to install Archivematica from a virtual machine, see the -`Ansible & Vagrant installation instructions`_ on the Archivematica wiki. See -also instructions for installation on a virtual machine using Vagrant in the -:ref:`Quick Start Guide `. - .. _installation-scaling: Scaling Archivematica @@ -53,8 +47,7 @@ In order to obtain valid SSL certificates trusted by any browser, you can use :ref:`Back to the top ` -.. _`development environment instructions`: https://github.com/artefactual/archivematica/tree/qa/1.x/hack -.. _`Ansible & Vagrant installation instructions`: https://wiki.archivematica.org/Getting_started#Installation +.. _`development environment instructions`: https://github.com/artefactual/archivematica/tree/qa/1.x/hack#archivematica-development-on-docker-compose .. _`sample configurations for the dashboard`: https://github.com/artefactual-labs/ansible-archivematica-src/blob/8b2aee1ba90053d030c31f3b8d0e5b0f14fcf57c/templates/etc/nginx/sites-available/dashboard-ssl.conf.j2 .. _`sample configurations for the Storage Service`: https://github.com/artefactual-labs/ansible-archivematica-src/blob/8b2aee1ba90053d030c31f3b8d0e5b0f14fcf57c/templates/etc/nginx/sites-available/storage-ssl.conf.j2 .. _`Let's Encrypt`: https://letsencrypt.org diff --git a/admin-manual/installation-setup/installation/install-ansible.rst b/admin-manual/installation-setup/installation/install-ansible.rst index 4458c663..811e9a51 100644 --- a/admin-manual/installation-setup/installation/install-ansible.rst +++ b/admin-manual/installation-setup/installation/install-ansible.rst @@ -9,7 +9,7 @@ installations on Ubuntu. It is assumed here that your host operating system is Ubuntu. This can be modified for a different Unix based operating system, such as Mac OS X or -another Linux distribution such as CentOS. +another Linux distribution such as Rocky Linux. The Ansible roles referenced here can be used in production deployments by creating your own Ansible playbook to run them. See the `deploy-pub`_ repo @@ -65,7 +65,7 @@ Installation instructions .. code:: bash - cd deploy-pub/playbooks/archivematica-bionic + cd deploy-pub/playbooks/archivematica-jammy ansible-galaxy install -f -p roles/ -r requirements.yml 4. Create the virtual machine and provision it: @@ -98,7 +98,7 @@ Installation instructions * Archivematica: ``_. * Storage Service: ``_. - The credentials can be found in the `vars-singlenode-qa.yml`. + The credentials can be found in the `vars-singlenode-1.15.yml`. .. _ansible-deploy-dev-branches: @@ -119,7 +119,7 @@ steps: .. code:: bash - cd deploy-pub/playbooks/archivematica-bionic + cd deploy-pub/playbooks/archivematica-jammy ansible-galaxy install -f -p roles/ -r requirements-qa.yml 2. Update ``singlenode.yml`` to load ``vars-singlenode-qa.yml``. Inside the diff --git a/admin-manual/installation-setup/installation/install-centos.rst b/admin-manual/installation-setup/installation/install-rocky.rst similarity index 81% rename from admin-manual/installation-setup/installation/install-centos.rst rename to admin-manual/installation-setup/installation/install-rocky.rst index 9442f609..769870df 100644 --- a/admin-manual/installation-setup/installation/install-centos.rst +++ b/admin-manual/installation-setup/installation/install-rocky.rst @@ -1,17 +1,17 @@ -.. _install-pkg-centos: +.. _install-pkg-rocky: -========================================== -Installing Archivematica on CentOS/Red Hat -========================================== +========================================= +Installing Archivematica on Rocky Linux 9 +========================================= -Archivematica versions 1.5.1 and higher support installation on CentOS/Red Hat. +Archivematica versions 1.15.0 and higher support installation on Rocky Linux 9. *On this page* -* :ref:`Installation instructions ` -* :ref:`Post-installation configuration ` +* :ref:`Installation instructions ` +* :ref:`Post-installation configuration ` -.. _centos-instructions: +.. _rocky-instructions: Installation instructions ------------------------- @@ -20,7 +20,7 @@ Installation instructions Update your system - .. literalinclude:: scripts/am-centos-rpm.sh + .. literalinclude:: scripts/am-rocky-rpm.sh :language: bash :lines: 3 @@ -28,7 +28,7 @@ Installation instructions following commands. Additional configuration may be required for your local setup. - .. literalinclude:: scripts/am-centos-rpm.sh + .. literalinclude:: scripts/am-rocky-rpm.sh :language: bash :lines: 5-12 @@ -37,7 +37,7 @@ Installation instructions * Extra packages for enterprise Linux: - .. literalinclude:: scripts/am-centos-rpm.sh + .. literalinclude:: scripts/am-rocky-rpm.sh :language: bash :lines: 14 @@ -47,13 +47,13 @@ Installation instructions Skip this step if you are planning to run :ref:`Archivematica without Elasticsearch `. - .. literalinclude:: scripts/am-centos-rpm.sh + .. literalinclude:: scripts/am-rocky-rpm.sh :language: bash :lines: 16-26 * Archivematica - use these commands to install the repositories: - .. literalinclude:: scripts/am-centos-rpm.sh + .. literalinclude:: scripts/am-rocky-rpm.sh :language: bash :lines: 28-44 @@ -65,14 +65,14 @@ Installation instructions Do not enable Elasticsearch if you are running Archivematica in indexless mode. - .. literalinclude:: scripts/am-centos-rpm.sh + .. literalinclude:: scripts/am-rocky-rpm.sh :language: bash :lines: 51-57 #. Now that MariaDB is up and running, create the Archivematica and Storage Service databases and set up the expected credentials. - .. literalinclude:: scripts/am-centos-rpm.sh + .. literalinclude:: scripts/am-rocky-rpm.sh :language: bash :lines: 59-63 @@ -80,20 +80,20 @@ Installation instructions * First, install the packages: - .. literalinclude:: scripts/am-centos-rpm.sh + .. literalinclude:: scripts/am-rocky-rpm.sh :language: bash :lines: 65 * Apply the database migrations using the ``archivematica`` user: - .. literalinclude:: scripts/am-centos-rpm.sh + .. literalinclude:: scripts/am-rocky-rpm.sh :language: bash :lines: 67-71 * Now enable and start the archivematica-storage-service, rngd (needed for encrypted spaces) and the Nginx frontend: - .. literalinclude:: scripts/am-centos-rpm.sh + .. literalinclude:: scripts/am-rocky-rpm.sh :language: bash :lines: 86-91 @@ -108,25 +108,25 @@ Installation instructions * First, install the packages: - .. literalinclude:: scripts/am-centos-rpm.sh + .. literalinclude:: scripts/am-rocky-rpm.sh :language: bash :lines: 93 * Apply the database migrations using the ``archivematica`` user: - .. literalinclude:: scripts/am-centos-rpm.sh + .. literalinclude:: scripts/am-rocky-rpm.sh :language: bash :lines: 95-100 * Start and enable services: - .. literalinclude:: scripts/am-centos-rpm.sh + .. literalinclude:: scripts/am-rocky-rpm.sh :language: bash :lines: 102-105 * Restart Nginx in order to load the dashboard config file: - .. literalinclude:: scripts/am-centos-rpm.sh + .. literalinclude:: scripts/am-rocky-rpm.sh :language: bash :lines: 107 @@ -136,13 +136,13 @@ Installation instructions * Install the package: - .. literalinclude:: scripts/am-centos-rpm.sh + .. literalinclude:: scripts/am-rocky-rpm.sh :language: bash :lines: 109 * Tweak ClamAV configuration: - .. literalinclude:: scripts/am-centos-rpm.sh + .. literalinclude:: scripts/am-rocky-rpm.sh :language: bash :lines: 111-112 @@ -161,7 +161,7 @@ Installation instructions * After that, we can enable and start/restart services - .. literalinclude:: scripts/am-centos-rpm.sh + .. literalinclude:: scripts/am-rocky-rpm.sh :language: bash :lines: 114-121 @@ -178,8 +178,8 @@ Installation instructions that the listen directives used under /etc/nginx are not using IPv6 addresses like [::]:80. - CentOS will install firewalld which will be running default rules that will - likely be blocking ports 81 and 8001. If you are not able to access the + Rocky Linux will install firewalld which will be running default rules that + will likely be blocking ports 81 and 8001. If you are not able to access the dashboard and Storage Service, then use the following command to check if firewalld is running: @@ -190,13 +190,13 @@ Installation instructions If firewalld is running, you will likely need to modify the firewall rules to allow access to ports 81 and 8001 from your location: - .. literalinclude:: scripts/am-centos-rpm.sh + .. literalinclude:: scripts/am-rocky-rpm.sh :language: bash :lines: 123-125 -#. Complete :ref:`Post Install Configuration `. +#. Complete :ref:`Post Install Configuration `. -.. _centos-post-install-config: +.. _rocky-post-install-config: Post-install configuration -------------------------- @@ -253,10 +253,10 @@ the configuration of your new server. allow requests from your dashboard IP to your Storage Service IP on the appropriate port. -:ref:`Back to the top ` +:ref:`Back to the top ` -.. _`Dashboard install README`: https://github.com/artefactual/archivematica/blob/stable/1.14.x/src/dashboard/install/README.md -.. _`MCPClient install README`: https://github.com/artefactual/archivematica/blob/stable/1.14.x/src/MCPClient/install/README.md -.. _`MCPServer install README`: https://github.com/artefactual/archivematica/blob/stable/1.14.x/src/MCPServer/install/README.md +.. _`Dashboard install README`: https://github.com/artefactual/archivematica/blob/stable/1.15.x/src/dashboard/install/README.md +.. _`MCPClient install README`: https://github.com/artefactual/archivematica/blob/stable/1.15.x/src/MCPClient/install/README.md +.. _`MCPServer install README`: https://github.com/artefactual/archivematica/blob/stable/1.15.x/src/MCPServer/install/README.md .. _`known issue`: https://github.com/artefactual/archivematica-storage-service/issues/312 .. _`Sword API`: https://wiki.archivematica.org/Sword_API diff --git a/admin-manual/installation-setup/installation/install-ubuntu.rst b/admin-manual/installation-setup/installation/install-ubuntu.rst index 2abea910..7e7a3794 100644 --- a/admin-manual/installation-setup/installation/install-ubuntu.rst +++ b/admin-manual/installation-setup/installation/install-ubuntu.rst @@ -6,7 +6,7 @@ Manually Installing Archivematica on Ubuntu Archivematica packages are hosted at packages.archivematica.org as a central place to store packages for multiple operating systems. Packages are available -for Ubuntu 18.04. We're planning to support Ubuntu 20.04 soon. +for Ubuntu 22.04. .. note:: Manual installation using packages on Ubuntu is not officially supported. Please see :ref:`Instructions for new installation @@ -14,17 +14,17 @@ for Ubuntu 18.04. We're planning to support Ubuntu 20.04 soon. *On this page* -* :ref:`Installation instructions for Ubuntu 18.04 (Bionic) ` +* :ref:`Installation instructions for Ubuntu 22.04 (Jammy) ` * :ref:`Post-installation configuration ` .. _ubuntu-instructions: -Ubuntu 18.04 (Bionic) installation instructions +Ubuntu 22.04 (Jammy) installation instructions ----------------------------------------------- #. Use these commands to install the repositories: - .. literalinclude:: scripts/am-bionic-deb.sh + .. literalinclude:: scripts/am-jammy-deb.sh :language: bash :lines: 14-18 @@ -35,20 +35,20 @@ Ubuntu 18.04 (Bionic) installation instructions Skip this step if you are planning to run :ref:`Archivematica without Elasticsearch `. - .. literalinclude:: scripts/am-bionic-deb.sh + .. literalinclude:: scripts/am-jammy-deb.sh :language: bash :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-bionic-deb.sh + .. literalinclude:: scripts/am-jammy-deb.sh :language: bash :lines: 23-24 #. Install some needed packages - .. literalinclude:: scripts/am-bionic-deb.sh + .. literalinclude:: scripts/am-jammy-deb.sh :language: bash :lines: 26 @@ -57,19 +57,19 @@ Ubuntu 18.04 (Bionic) installation instructions .. note:: Skip this step if you are planning to run Archivematica in indexless mode (without Elasticsearch). - .. literalinclude:: scripts/am-bionic-deb.sh + .. literalinclude:: scripts/am-jammy-deb.sh :language: bash :lines: 27 #. Install the Storage Service package. - .. literalinclude:: scripts/am-bionic-deb.sh + .. literalinclude:: scripts/am-jammy-deb.sh :language: bash :lines: 29 #. Configure the Storage Service. - .. literalinclude:: scripts/am-bionic-deb.sh + .. literalinclude:: scripts/am-jammy-deb.sh :language: bash :lines: 31-32 @@ -87,7 +87,7 @@ Ubuntu 18.04 (Bionic) installation instructions you must use ``demo`` as the password during the install process. The password can be changed after the installation is complete. - .. literalinclude:: scripts/am-bionic-deb.sh + .. literalinclude:: scripts/am-jammy-deb.sh :language: bash :lines: 34-36 @@ -110,7 +110,7 @@ Ubuntu 18.04 (Bionic) installation instructions #. Configure the dashboard. - .. literalinclude:: scripts/am-bionic-deb.sh + .. literalinclude:: scripts/am-jammy-deb.sh :language: bash :lines: 38 @@ -119,13 +119,13 @@ Ubuntu 18.04 (Bionic) installation instructions .. note:: Skip this step if you are planning to run Archivematica in indexless mode (without Elasticsearch). - .. literalinclude:: scripts/am-bionic-deb.sh + .. literalinclude:: scripts/am-jammy-deb.sh :language: bash :lines: 40-42 #. Start the remaining services - .. literalinclude:: scripts/am-bionic-deb.sh + .. literalinclude:: scripts/am-jammy-deb.sh :language: bash :lines: 44-54 @@ -149,7 +149,7 @@ Ubuntu 18.04 (Bionic) installation instructions the dashboard and the Storage Service, i.e., 80 and 8000. - .. literalinclude:: scripts/am-bionic-deb.sh + .. literalinclude:: scripts/am-jammy-deb.sh :language: bash :lines: 56-59 @@ -227,7 +227,7 @@ the configuration of your new server. .. _`Sword API`: https://wiki.archivematica.org/Sword_API .. _`known issue with pip`: https://bugs.launchpad.net/ubuntu/+source/python-pip/+bug/1658844 -.. _`Dashboard install README`: https://github.com/artefactual/archivematica/blob/stable/1.14.x/src/dashboard/install/README.md -.. _`MCPClient install README`: https://github.com/artefactual/archivematica/blob/stable/1.14.x/src/MCPClient/install/README.md -.. _`MCPServer install README`: https://github.com/artefactual/archivematica/blob/stable/1.14.x/src/MCPServer/install/README.md +.. _`Dashboard install README`: https://github.com/artefactual/archivematica/blob/stable/1.15.x/src/dashboard/install/README.md +.. _`MCPClient install README`: https://github.com/artefactual/archivematica/blob/stable/1.15.x/src/MCPClient/install/README.md +.. _`MCPServer install README`: https://github.com/artefactual/archivematica/blob/stable/1.15.x/src/MCPServer/install/README.md .. _`Archivematica user forum`: https://groups.google.com/forum/#!forum/archivematica diff --git a/admin-manual/installation-setup/installation/installation.rst b/admin-manual/installation-setup/installation/installation.rst index dd84a9e7..735e9ecc 100644 --- a/admin-manual/installation-setup/installation/installation.rst +++ b/admin-manual/installation-setup/installation/installation.rst @@ -51,8 +51,8 @@ Operating system Archivematica |release| installation instructions are provided here for the following operating systems: -* Ubuntu 18.04 64-bit Server Edition -* CentOS 7 64-bit +* Ubuntu 22.04 64-bit Server Edition +* Rocky Linux 9 x86-64 Other Linux distributions should work, but will require customization of these installation instructions. @@ -81,14 +81,13 @@ information, see :ref:`Advanced `. .. note:: - Archivematica |version| has been tested with MySQL 5.5, including - the Percona and MariaDB alternatives. Archivematica uses MySQL 5.7 on - Ubuntu 18.04. + Archivematica |version| has been tested with MySQL 8.0, including + the Percona and MariaDB alternatives. Some of the tools run by Archivematica require Java to be - installed (primarily Elasticsearch and fits). On Ubuntu 18.04, Open JDK 8 - is used, but Open JDK 11 is the default. It is possible to use Oracle Java - 7 or 8 instead. + installed (primarily Elasticsearch and fits). On Ubuntu 22.04, Open JDK 8 + is used, but Open JDK 11 is the default. It is possible to use Oracle Java 8 + instead. The remaining dependencies should be kept at the versions installed by Archivematica. @@ -123,7 +122,7 @@ Possible ``archivematica_src_search_enabled`` configuration attribute values: Backlog, Appraisal, and Archival Storage tabs will be non-functional. When Elasticsearch is used, Archivematica |release| requires version 6.x (tested -with 6.5.4). +with 6.8.21). For more information on disabling Elasticsearch, please see the README for Archivematica's ansible role, @@ -183,10 +182,8 @@ documents. Browser compatability ^^^^^^^^^^^^^^^^^^^^^ -Archivematica has been tested most extensively with Firefox and Chrome. There -are known issues with Internet Explorer 11 which result in an inability to start -transfers in the dashboard (:issue:`7246`). Minimal, but successful, testing has -been done with Microsoft Edge. +Archivematica has been tested most extensively with Firefox and Chrome. Minimal, +but successful, testing has been done with Microsoft Edge. .. _instructions: @@ -194,14 +191,14 @@ Instructions for new installations ---------------------------------- Archivematica can be installed using packages or Ansible scripts in either -CentOS/Red Hat or Ubuntu environments. It can also be installed using Docker. -At this time, installation instructions are provided for officially tested and -supported installation environments: +Rocky Linux/Red Hat or Ubuntu environments. At this time, installation +instructions are provided for officially tested and supported installation +environments: -* :ref:`Automated install on Ubuntu 18.04 using Ansible `. -* :ref:`Manual install of OS packages on CentOS/Red Hat ` +* :ref:`Automated install on Ubuntu 22.04 using Ansible `. +* :ref:`Manual install of OS packages on Rocky Linux 9/Red Hat ` -Note that :ref:`manual install of OS packages on Ubuntu 18.04 +Note that :ref:`manual install of OS packages on Ubuntu 22.04 ` is documented but not officially supported. Installing Archivematica using :ref:`Docker ` is not officially diff --git a/admin-manual/installation-setup/installation/scripts/am-bionic-deb.sh b/admin-manual/installation-setup/installation/scripts/am-jammy-deb.sh similarity index 93% rename from admin-manual/installation-setup/installation/scripts/am-bionic-deb.sh rename to admin-manual/installation-setup/installation/scripts/am-jammy-deb.sh index 3f84eeef..e3235227 100644 --- a/admin-manual/installation-setup/installation/scripts/am-bionic-deb.sh +++ b/admin-manual/installation-setup/installation/scripts/am-jammy-deb.sh @@ -11,10 +11,10 @@ sudo debconf-set-selections <<< "archivematica-mcp-server archivematica-mcp-serv -sudo wget -O - https://packages.archivematica.org/1.14.x/key.asc | sudo apt-key add - +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.14.x/ubuntu bionic main" >> /etc/apt/sources.list' -sudo sh -c 'echo "deb [arch=amd64] http://packages.archivematica.org/1.14.x/ubuntu-externals bionic main" >> /etc/apt/sources.list' +sudo sh -c 'echo "deb [arch=amd64] http://packages.archivematica.org/1.15.x/ubuntu jammy main" >> /etc/apt/sources.list' +sudo sh -c 'echo "deb [arch=amd64] http://packages.archivematica.org/1.15.x/ubuntu-externals jammy main" >> /etc/apt/sources.list' wget -qO - https://artifacts.elastic.co/GPG-KEY-elasticsearch | sudo apt-key add - diff --git a/admin-manual/installation-setup/installation/scripts/am-centos-rpm.sh b/admin-manual/installation-setup/installation/scripts/am-rocky-rpm.sh similarity index 94% rename from admin-manual/installation-setup/installation/scripts/am-centos-rpm.sh rename to admin-manual/installation-setup/installation/scripts/am-rocky-rpm.sh index 381a0f43..bf97ccf5 100644 --- a/admin-manual/installation-setup/installation/scripts/am-centos-rpm.sh +++ b/admin-manual/installation-setup/installation/scripts/am-rocky-rpm.sh @@ -28,18 +28,18 @@ EOF' sudo -u root bash -c 'cat << EOF > /etc/yum.repos.d/archivematica.repo [archivematica] name=archivematica -baseurl=https://packages.archivematica.org/1.14.x/centos +baseurl=https://packages.archivematica.org/1.15.x/rocky gpgcheck=1 -gpgkey=https://packages.archivematica.org/1.14.x/key.asc +gpgkey=https://packages.archivematica.org/1.15.x/key.asc enabled=1 EOF' sudo -u root bash -c 'cat << EOF > /etc/yum.repos.d/archivematica-extras.repo [archivematica-extras] name=archivematica-extras -baseurl=https://packages.archivematica.org/1.14.x/centos-extras +baseurl=https://packages.archivematica.org/1.15.x/rocky-extras gpgcheck=1 -gpgkey=https://packages.archivematica.org/1.14.x/key.asc +gpgkey=https://packages.archivematica.org/1.15.x/key.asc enabled=1 EOF' diff --git a/admin-manual/installation-setup/upgrading/upgrading.rst b/admin-manual/installation-setup/upgrading/upgrading.rst index bfbef7f7..a60c0627 100644 --- a/admin-manual/installation-setup/upgrading/upgrading.rst +++ b/admin-manual/installation-setup/upgrading/upgrading.rst @@ -9,7 +9,7 @@ Upgrade from Archivematica |previous_version|.x to |release| * :ref:`Clean up completed transfers watched directory ` * :ref:`Create a backup ` * :ref:`Upgrade Ubuntu package install ` -* :ref:`Upgrade CentOS/Red Hat package install ` +* :ref:`Upgrade Rocky Linux/Red Hat package install ` * :ref:`Upgrade in indexless mode ` * :ref:`Upgrade with output capturing disabled ` * :ref:`Update search indices ` @@ -130,8 +130,8 @@ Upgrade on Ubuntu packages .. code:: bash - echo 'deb [arch=amd64] http://packages.archivematica.org/1.14.x/ubuntu bionic main' >> /etc/apt/sources.list - echo 'deb [arch=amd64] http://packages.archivematica.org/1.14.x/ubuntu-externals bionic main' >> /etc/apt/sources.list + echo 'deb [arch=amd64] http://packages.archivematica.org/1.15.x/ubuntu jammy main' >> /etc/apt/sources.list + echo 'deb [arch=amd64] http://packages.archivematica.org/1.15.x/ubuntu-externals jammy main' >> /etc/apt/sources.list Optionally you can remove the lines referencing packages.archivematica.org/|previous_version|.x from /etc/apt/sources.list. @@ -173,16 +173,16 @@ Upgrade on Ubuntu packages you should be able to clear the cache with control-shift-R or command-shift-F5. -.. _upgrade-centos: +.. _upgrade-rocky: -Upgrade on CentOS/Red Hat packages ----------------------------------- +Upgrade on Rocky Linux/Red Hat packages +--------------------------------------- #. Upgrade the repositories for |version|: .. code:: bash - sudo sed -i 's/1.13.x/1.14.x/g' /etc/yum.repos.d/archivematica* + sudo sed -i 's/1.14.x/1.15.x/g' /etc/yum.repos.d/archivematica* #. Remove the current installed version of ghostscript: @@ -277,22 +277,22 @@ with cloud based virtual machines, or physical servers. #. Go into the appropiate playbook folder, and install the needed roles - .. _ubuntu-18.04: + .. _ubuntu-22.04: - Ubuntu 18.04 (Bionic): + Ubuntu 22.04 (Jammy): .. code:: bash - cd deploy-pub/playbooks/archivematica-bionic + cd deploy-pub/playbooks/archivematica-jammy ansible-galaxy install -f -p roles/ -r requirements.yml - .. _centos-7: + .. rocky-9: - Centos 7: + Rocky Linux 9: .. code:: bash - cd deploy-pub/playbooks/archivematica-centos7 + cd deploy-pub/playbooks/archivematica-rocky9 ansible-galaxy install -f -p roles/ -r requirements.yml All the following steps should be run from the respective playbook folder @@ -340,7 +340,7 @@ searching across several different dashboard pages. sudo sh -c 'echo "ARCHIVEMATICA_MCPSERVER_MCPSERVER_SEARCH_ENABLED=false" >> /etc/default/archivematica-mcp-server' sudo sh -c 'echo "ARCHIVEMATICA_MCPCLIENT_MCPCLIENT_SEARCH_ENABLED=false" >> /etc/default/archivematica-mcp-client' - If you are using CentOS, run the following commands. + If you are using Rocky Linux, run the following commands. .. code:: bash @@ -358,7 +358,7 @@ searching across several different dashboard pages. sudo service archivematica-mcp-client restart sudo service archivematica-mcp-server restart - If you are using CentOS, run the following commands. + If you are using Rocky Linux, run the following commands. .. code:: bash diff --git a/admin-manual/maintenance/maintenance.rst b/admin-manual/maintenance/maintenance.rst index b80f12b0..6e7d5a49 100644 --- a/admin-manual/maintenance/maintenance.rst +++ b/admin-manual/maintenance/maintenance.rst @@ -470,7 +470,7 @@ taken to recover. #. Clean up the disk by removing failed or rejected transfers, any excessive ``/tmp`` data, or anything else causing the disk to have filled up. -#. Reset MySQL (or MariaDB, on CentOS) database. +#. Reset MySQL (or MariaDB, on Rocky Linux) database. #. Reset Archivematica components in appropriate order (see `restart-services`_ for details). #. Set Elasticsearch back into write mode. The easiest way to do this is to run @@ -501,7 +501,7 @@ Other services that Archivematica depends on are: * ClamAV * ElasticSearch * Gearman - * MySQL (Ubuntu) or MariaDB (CentOS) + * MySQL (Ubuntu) or MariaDB (Rocky Linux) * Nailgun * Nginx diff --git a/admin-manual/security/security.rst b/admin-manual/security/security.rst index 2beb85ca..9de272db 100644 --- a/admin-manual/security/security.rst +++ b/admin-manual/security/security.rst @@ -63,7 +63,7 @@ For Ubuntu systems: * /etc/default/archivematica-mcp-server * /etc/default/archivematica-storage-service -For CentOS/Red Hat systems: +For Rocky Linux/Red Hat systems: * /etc/sysconfig/archivematica-dashboard * /etc/sysconfig/archivematica-mcp-client @@ -423,7 +423,7 @@ bundle. - The Ubuntu system's CA bundle file is :file:`/etc/ssl/certs/ca-certificates.crt`. -- The CentOS system's CA bundle file is +- The Rocky Linux system's CA bundle file is :file:`/etc/pki/tls/certs/ca-bundle.crt`. On Ubuntu, add the following line to the :file:`/etc/default/archivematica-*` @@ -433,7 +433,7 @@ files to use the system's CA bundle: REQUESTS_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt -On CentOS, add the following line to the :file:`/etc/default/archivematica-*` +On Rocky Linux, add the following line to the :file:`/etc/default/archivematica-*` files to use the system's CA bundle: .. code:: bash @@ -445,10 +445,10 @@ Trusting additional CAs If you are using ``REQUESTS_CA_BUNDLE`` you may want to trust additional CAs. -On CentOS: +On Rocky Linux: - Copy the ``.crt`` file to ``/etc/pki/ca-trust/source/anchors`` on your - CentOS machine. + Rocky Linux machine. - Run the `update-ca-trust extract` command. The :file:`/etc/pki/tls/certs/ca-bundle.crt` file is a symbolic link that @@ -465,12 +465,12 @@ This will create a new :file:`/etc/ssl/certs/ca-certificates.crt` file. :ref:`Back to the top ` -.. _django-auth-infra: https://docs.djangoproject.com/en/2.0/topics/auth/customizing/#authentication-backends +.. _django-auth-infra: https://docs.djangoproject.com/en/3.2/topics/auth/customizing/#authentication-backends .. _am-gh-issues: https://github.com/artefactual/archivematica/issues .. _am-google-groups: https://groups.google.com/forum/#!forum/archivematica -.. _am-dashboard-config: https://github.com/artefactual/archivematica/blob/stable/1.14.x/src/dashboard/install/README.md -.. _am-ldap-auth-mod: https://github.com/artefactual/archivematica/blob/stable/1.14.x/src/dashboard/src/settings/components/ldap_auth.py -.. _am-shib-auth-mod: https://github.com/artefactual/archivematica/blob/stable/1.14.x/src/dashboard/src/settings/components/shibboleth_auth.py +.. _am-dashboard-config: https://github.com/artefactual/archivematica/blob/stable/1.15.x/src/dashboard/install/README.md +.. _am-ldap-auth-mod: https://github.com/artefactual/archivematica/blob/stable/1.15.x/src/dashboard/src/settings/components/ldap_auth.py +.. _am-shib-auth-mod: https://github.com/artefactual/archivematica/blob/stable/1.15.x/src/dashboard/src/settings/components/shibboleth_auth.py .. _ldap: https://en.wikipedia.org/wiki/Lightweight_Directory_Access_Protocol .. _shibboleth: https://www.shibboleth.net/ .. _oidc: https://openid.net/connect/ @@ -479,10 +479,10 @@ This will create a new :file:`/etc/ssl/certs/ca-certificates.crt` file. .. _requests: https://requests.readthedocs.io/en/master/ .. _requests-cas: https://requests.readthedocs.io/en/master/user/advanced/#ca-certificates .. _elasticsearch-security-external: https://www.elastic.co/guide/en/x-pack/current/elasticsearch-security.html -.. _ss-config: https://github.com/artefactual/archivematica-storage-service/blob/stable/0.20.x/install/README.md +.. _ss-config: https://github.com/artefactual/archivematica-storage-service/blob/stable/0.21.x/install/README.md .. _mozilla-django-oidc-docs: https://mozilla-django-oidc.readthedocs.io/en/stable/ .. _django-csp-docs: https://django-csp.readthedocs.io/en/latest/ -.. _django-https-settings: https://docs.djangoproject.com/en/1.8/topics/security/#ssl-https -.. _django-session-settings: https://docs.djangoproject.com/en/1.8/topics/http/sessions/#settings -.. _am-prod-settings: https://github.com/artefactual/archivematica/blob/stable/1.14.x/src/dashboard/src/settings/production.py -.. _ss-prod-settings: https://github.com/artefactual/archivematica-storage-service/blob/stable/0.20.x/storage_service/storage_service/settings/production.py +.. _django-https-settings: https://docs.djangoproject.com/en/3.2/topics/security/#ssl-https +.. _django-session-settings: https://docs.djangoproject.com/en/3.2/topics/http/sessions/#settings +.. _am-prod-settings: https://github.com/artefactual/archivematica/blob/stable/1.15.x/src/dashboard/src/settings/production.py +.. _ss-prod-settings: https://github.com/artefactual/archivematica-storage-service/blob/stable/0.21.x/storage_service/storage_service/settings/production.py diff --git a/conf.py b/conf.py index 317fac6a..6900a65c 100644 --- a/conf.py +++ b/conf.py @@ -76,13 +76,13 @@ # built documents. # # The short X.Y version. -version = '1.14' +version = '1.15' # The full version, including alpha/beta/rc tags. -release = '1.14.1' +release = '1.15.0' rst_epilog = """ -.. |previous_version| replace:: 1.13 -.. |previous_release| replace:: 1.13.2 +.. |previous_version| replace:: 1.14 +.. |previous_release| replace:: 1.14.1 """ # The language for content autogenerated by Sphinx. Refer to documentation diff --git a/dev-manual/development-environment.rst b/dev-manual/development-environment.rst index edd8ee8d..00479248 100644 --- a/dev-manual/development-environment.rst +++ b/dev-manual/development-environment.rst @@ -13,7 +13,7 @@ for defining and running multi-container Docker applications. Docker Compose can be used in production environments, but installing Archivematica using Docker is not officially supported for production deployments. When installing for production, Archivematica can be installed - using packages or Ansible scripts in either CentOS/Red Hat or Ubuntu. + using packages or Ansible scripts in either Rocky Linux/Red Hat or Ubuntu. For the latest information on Archivematica's development workflow based on Docker and Docker Compose, visit the `hack directory`_ under the Archivematica diff --git a/style_guide.md b/style_guide.md index cfcdbfac..9238b5ed 100644 --- a/style_guide.md +++ b/style_guide.md @@ -349,7 +349,7 @@ Text blocks should truncated after 80 characters. ``` Archivematica packages are hosted at packages.archivematica.org as a central place to store packages for multiple operating systems. Packages for both Ubuntu -14.04 and 16.04 are available. +22.04 and Rocky Linux 9 are available. ``` Code blocks are an exception to this rule. A line of code can extend beyond 80 @@ -550,9 +550,9 @@ Short, simple scripts can be added as code blocks using the `code` directive. ``` .. code:: bash - sudo wget -O - https://packages.archivematica.org/1.8.x/key.asc | sudo apt-key add - - sudo sh -c 'echo "deb [arch=amd64] http://packages.archivematica.org/1.8.x/ubuntu xenial main" >> /etc/apt/sources.list' - sudo sh -c 'echo "deb [arch=amd64] http://packages.archivematica.org/1.8.x/ubuntu-externals xenial main" >> /etc/apt/sources.list' + 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' + sudo sh -c 'echo "deb [arch=amd64] http://packages.archivematica.org/1.15.x/ubuntu-externals jammy main" >> /etc/apt/sources.list' ``` For longer scripts, or scripts that will be referenced on multiple pages, you @@ -569,7 +569,7 @@ To include a script on a page, reference the script using the `literal-include` directive. ``` -.. literalinclude:: scripts/am18-centos-rpm.sh +.. literalinclude:: scripts/am-rocky-rpm.sh :language: bash :lines: 3 ``` @@ -581,7 +581,7 @@ Setting the `lines` option will display only the specified lines. You may specify one line, as above, or multiple lines: ``` -.. literalinclude:: scripts/am18-centos-rpm.sh +.. literalinclude:: scripts/am-rocky-rpm.sh :language: bash :lines: 5-12 ```