Skip to content

Commit

Permalink
AM 1.17.0 + SS 0.23.0
Browse files Browse the repository at this point in the history
  • Loading branch information
replaceafill committed Dec 6, 2024
1 parent 8923c89 commit f7d48a7
Show file tree
Hide file tree
Showing 8 changed files with 25 additions and 25 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -255,8 +255,8 @@ the configuration of your new server.

:ref:`Back to the top <install-pkg-rocky>`

.. _`Dashboard install README`: https://github.com/artefactual/archivematica/blob/stable/1.16.x/src/dashboard/install/README.md
.. _`MCPClient install README`: https://github.com/artefactual/archivematica/blob/stable/1.16.x/src/MCPClient/install/README.md
.. _`MCPServer install README`: https://github.com/artefactual/archivematica/blob/stable/1.16.x/src/MCPServer/install/README.md
.. _`Dashboard install README`: https://github.com/artefactual/archivematica/blob/stable/1.17.x/src/dashboard/install/README.md
.. _`MCPClient install README`: https://github.com/artefactual/archivematica/blob/stable/1.17.x/src/MCPClient/install/README.md
.. _`MCPServer install README`: https://github.com/artefactual/archivematica/blob/stable/1.17.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
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,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.16.x/src/dashboard/install/README.md
.. _`MCPClient install README`: https://github.com/artefactual/archivematica/blob/stable/1.16.x/src/MCPClient/install/README.md
.. _`MCPServer install README`: https://github.com/artefactual/archivematica/blob/stable/1.16.x/src/MCPServer/install/README.md
.. _`Dashboard install README`: https://github.com/artefactual/archivematica/blob/stable/1.17.x/src/dashboard/install/README.md
.. _`MCPClient install README`: https://github.com/artefactual/archivematica/blob/stable/1.17.x/src/MCPClient/install/README.md
.. _`MCPServer install README`: https://github.com/artefactual/archivematica/blob/stable/1.17.x/src/MCPServer/install/README.md
.. _`Archivematica user forum`: https://groups.google.com/forum/#!forum/archivematica
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ 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-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
curl -fsSL https://packages.archivematica.org/1.17.x/key.asc | sudo gpg --dearmor -o /etc/apt/keyrings/archivematica-1.17.x.gpg

sudo sh -c 'echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/archivematica-1.16.x.gpg] http://packages.archivematica.org/1.16.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.16.x.gpg] http://packages.archivematica.org/1.16.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.17.x.gpg] http://packages.archivematica.org/1.17.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.17.x.gpg] http://packages.archivematica.org/1.17.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 /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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ EOF'
sudo -u root bash -c 'cat << EOF > /etc/yum.repos.d/archivematica.repo
[archivematica]
name=archivematica
baseurl=https://packages.archivematica.org/1.16.x/rocky9/
baseurl=https://packages.archivematica.org/1.17.x/rocky9/
gpgcheck=1
gpgkey=https://packages.archivematica.org/GPG-KEY-archivematica-sha512
enabled=1
Expand All @@ -40,7 +40,7 @@ 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.16.x/rocky9-extras
baseurl=https://packages.archivematica.org/1.17.x/rocky9-extras
gpgcheck=1
gpgkey=https://packages.archivematica.org/GPG-KEY-archivematica-sha512
enabled=1
Expand Down
6 changes: 3 additions & 3 deletions admin-manual/installation-setup/upgrading/upgrading.rst
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,8 @@ Upgrade on Ubuntu packages

.. code:: bash
echo 'deb [arch=amd64] http://packages.archivematica.org/1.16.x/ubuntu jammy main' >> /etc/apt/sources.list
echo 'deb [arch=amd64] http://packages.archivematica.org/1.16.x/ubuntu-externals jammy main' >> /etc/apt/sources.list
echo 'deb [arch=amd64] http://packages.archivematica.org/1.17.x/ubuntu jammy main' >> /etc/apt/sources.list
echo 'deb [arch=amd64] http://packages.archivematica.org/1.17.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.
Expand Down Expand Up @@ -184,7 +184,7 @@ Upgrade on Rocky Linux/Red Hat packages

.. code:: bash
sudo sed -i 's/1.15.x/1.16.x/g' /etc/yum.repos.d/archivematica*
sudo sed -i 's/1.16.x/1.17.x/g' /etc/yum.repos.d/archivematica*
#. Remove the current installed version of ghostscript:

Expand Down
12 changes: 6 additions & 6 deletions admin-manual/security/security.rst
Original file line number Diff line number Diff line change
Expand Up @@ -468,9 +468,9 @@ This will create a new :file:`/etc/ssl/certs/ca-certificates.crt` file.
.. _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.16.x/src/dashboard/install/README.md
.. _am-ldap-auth-mod: https://github.com/artefactual/archivematica/blob/stable/1.16.x/src/dashboard/src/settings/components/ldap_auth.py
.. _am-shib-auth-mod: https://github.com/artefactual/archivematica/blob/stable/1.16.x/src/dashboard/src/settings/components/shibboleth_auth.py
.. _am-dashboard-config: https://github.com/artefactual/archivematica/blob/stable/1.17.x/src/dashboard/install/README.md
.. _am-ldap-auth-mod: https://github.com/artefactual/archivematica/blob/stable/1.17.x/src/dashboard/src/settings/components/ldap_auth.py
.. _am-shib-auth-mod: https://github.com/artefactual/archivematica/blob/stable/1.17.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/
Expand All @@ -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.22.x/install/README.md
.. _ss-config: https://github.com/artefactual/archivematica-storage-service/blob/stable/0.23.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/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.16.x/src/dashboard/src/settings/production.py
.. _ss-prod-settings: https://github.com/artefactual/archivematica-storage-service/blob/stable/0.22.x/storage_service/storage_service/settings/production.py
.. _am-prod-settings: https://github.com/artefactual/archivematica/blob/stable/1.17.x/src/dashboard/src/settings/production.py
.. _ss-prod-settings: https://github.com/artefactual/archivematica-storage-service/blob/stable/0.23.x/storage_service/storage_service/settings/production.py
4 changes: 2 additions & 2 deletions conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,9 @@
# built documents.
#
# The short X.Y version.
version = '1.16'
version = '1.17'
# The full version, including alpha/beta/rc tags.
release = '1.16.0'
release = '1.17.0'

rst_epilog = """
.. |previous_version| replace:: 1.15
Expand Down
6 changes: 3 additions & 3 deletions style_guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -568,9 +568,9 @@ Short, simple scripts can be added as code blocks using the `code` directive.
```rst
.. code:: bash
sudo wget -O - https://packages.archivematica.org/1.16.x/key.asc | sudo apt-key add -
sudo sh -c 'echo "deb [arch=amd64] http://packages.archivematica.org/1.16.x/ubuntu jammy main" >> /etc/apt/sources.list'
sudo sh -c 'echo "deb [arch=amd64] http://packages.archivematica.org/1.16.x/ubuntu-externals jammy main" >> /etc/apt/sources.list'
sudo wget -O - https://packages.archivematica.org/1.17.x/key.asc | sudo apt-key add -
sudo sh -c 'echo "deb [arch=amd64] http://packages.archivematica.org/1.17.x/ubuntu jammy main" >> /etc/apt/sources.list'
sudo sh -c 'echo "deb [arch=amd64] http://packages.archivematica.org/1.17.x/ubuntu-externals jammy main" >> /etc/apt/sources.list'
```

For longer scripts, or scripts that will be referenced on multiple pages, you
Expand Down

0 comments on commit f7d48a7

Please sign in to comment.