From 8e3bed344a6b8aeaa139bb111bbc24d124fef56c Mon Sep 17 00:00:00 2001 From: Trey Dockendorf Date: Mon, 23 Oct 2023 12:26:16 -0400 Subject: [PATCH] Document Debian 12 support - fixes #879 --- source/how-tos/debug/debug-apache.rst | 4 ++-- source/installation.rst | 2 +- source/installation/add-ssl.rst | 4 ++-- source/installation/install-software.rst | 15 +++++++++++++-- source/release-notes/v3.1-release-notes.rst | 7 +++++++ source/requirements.rst | 1 + 6 files changed, 26 insertions(+), 7 deletions(-) diff --git a/source/how-tos/debug/debug-apache.rst b/source/how-tos/debug/debug-apache.rst index a364d1c9c..2aa0eed6b 100644 --- a/source/how-tos/debug/debug-apache.rst +++ b/source/how-tos/debug/debug-apache.rst @@ -36,7 +36,7 @@ Restart services sudo systemctl try-restart httpd - .. tab:: Ubuntu + .. tab:: Ubuntu & Debian .. code-block:: sh @@ -73,7 +73,7 @@ Or you're using the wrong hostname in your browser. sudo /sbin/httpd -S - .. tab:: Ubuntu + .. tab:: Ubuntu & Debian .. code-block:: sh diff --git a/source/installation.rst b/source/installation.rst index 2330b45fd..f84b659ba 100644 --- a/source/installation.rst +++ b/source/installation.rst @@ -6,7 +6,7 @@ Installation The OnDemand host machine needs to be setup *similarly* to a login node. This means that it will need: -- RedHat/CentOS 7+ or Ubuntu 20.04-22.04 or Amazon Linux 2023 +- RedHat/CentOS 7+ or Ubuntu 20.04-22.04 or Debian 12 or Amazon Linux 2023 - the resource manager (e.g., Torque, Slurm, or LSF) client binaries and libraries used by the batch servers installed - configuration on both OnDemand node **and batch servers** to be able to diff --git a/source/installation/add-ssl.rst b/source/installation/add-ssl.rst index 73476a200..5c5012b01 100644 --- a/source/installation/add-ssl.rst +++ b/source/installation/add-ssl.rst @@ -85,7 +85,7 @@ authority. sudo yum update ca-certificates - .. tab:: Ubuntu + .. tab:: Ubuntu & Debian .. code:: sh @@ -105,7 +105,7 @@ authority you're using and run these commands to copy it to the appropriate plac sudo cp /etc/pki/ca-trust/source/anchors/ sudo update-ca-trust - .. tab:: Ubuntu + .. tab:: Ubuntu & Debian .. code:: sh diff --git a/source/installation/install-software.rst b/source/installation/install-software.rst index 56932aadd..45d2072e7 100644 --- a/source/installation/install-software.rst +++ b/source/installation/install-software.rst @@ -138,6 +138,17 @@ Some operating systems use `Software Collections`_ to satisfy these. sudo apt install ondemand + .. tab:: Debian 12 + + .. code-block:: sh + + sudo apt install apt-transport-https ca-certificates + wget -O /tmp/ondemand-release-web_{{ ondemand_version }}.0-bookworm_all.deb https://apt.osc.edu/ondemand/{{ ondemand_version }}/ondemand-release-web_{{ ondemand_version }}.0-bookworm_all.deb + sudo apt install /tmp/ondemand-release-web_{{ ondemand_version }}.0-bookworm_all.deb + sudo apt update + + sudo apt install ondemand + .. tab:: Amazon Linux 2023 .. code-block:: sh @@ -166,7 +177,7 @@ Some operating systems use `Software Collections`_ to satisfy these. sudo systemctl start httpd sudo systemctl enable httpd - .. tab:: Ubuntu + .. tab:: Ubuntu & Debian .. code-block:: sh @@ -188,7 +199,7 @@ a public page telling you to come back here and setup authentication. If this is the case - then you should :ref:`secure your apache ` then :ref:`add authentication `. You may also want to :ref:`enable SELinux `. -If you're seeing the default apache page (Ubuntu users will) you will have to :ref:`debug virtualhosts ` +If you're seeing the default apache page (Ubuntu & Debian users will) you will have to :ref:`debug virtualhosts ` and likely :ref:`configure a servername `. Building From Source diff --git a/source/release-notes/v3.1-release-notes.rst b/source/release-notes/v3.1-release-notes.rst index 2eec7c780..c51a6299f 100644 --- a/source/release-notes/v3.1-release-notes.rst +++ b/source/release-notes/v3.1-release-notes.rst @@ -15,6 +15,7 @@ New Features - `aarch64/arm64 and ppc64le packages`_ - `Amazon Linux 2023 packages`_ +- `Debian 12 packages`_ Details of administrative changes --------------------------------- @@ -197,3 +198,9 @@ Amazon Linux 2023 packages Added Amazon Linux 2023 packages. See :ref:`install-software` for installation instructions. + +Debian 12 packages +.................. + +Added Debian 12 packages. +See :ref:`install-software` for installation instructions. diff --git a/source/requirements.rst b/source/requirements.rst index 0bf86d1ee..bd2a85997 100644 --- a/source/requirements.rst +++ b/source/requirements.rst @@ -22,6 +22,7 @@ At this time OnDemand only supports the following operating systems and architec "RedHat/Rocky Linux/AlmaLinux 9",:raw-html:`✅`,:raw-html:`✅`,:raw-html:`✅` "Ubuntu 20.04",:raw-html:`✅`,:raw-html:`✅`,:raw-html:`❌` "Ubuntu 22.04",:raw-html:`✅`,:raw-html:`✅`,:raw-html:`❌` + "Debian 12",:raw-html:`✅`,:raw-html:`✅`,:raw-html:`✅` "Amazon Linux 2023",:raw-html:`✅`,:raw-html:`✅`,:raw-html:`❌` Software Requirements