Skip to content

Commit

Permalink
[ci skip] Autodoc commit for c2adc6e4cd8f8b57459fe9ce7a92480699f4e2ba.
Browse files Browse the repository at this point in the history
  • Loading branch information
oscwiag committed Nov 25, 2024
1 parent aa70908 commit cf6a5bd
Show file tree
Hide file tree
Showing 16 changed files with 421 additions and 65 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@ Since 2.0 you should use the simpler and faster :ref:`user_map_match <ood-portal

Both with variations will be discussed here.

.. tip::

Since 4.0 user mapping also accepts UIDs to be returned as well as usernames.
This can be helpful at centers where duplicate usernames and/or have multiple
domains.

Remote User
-----------
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,14 @@ This is the full list of items with details, you may supply to this yaml file to

whether or not the application is cacheable or not. Defaults to true.

.. _bc_form_header:
.. describe:: form_header (String)

New in 4.0.

Add a text header to the form. Note this is different from the
manifest's description as it does not appear as hoverover text.

.. _bc_form_attributes:

Attributes
Expand Down
18 changes: 7 additions & 11 deletions data-hide-false/_sources/installation/install-software.rst.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,10 @@ Install Software

Open OnDemand uses these packages, among many others.

- `Apache HTTP Server 2.4`_
- Ruby 3.0 with :command:`rake`, :command:`bundler`, and development
- Apache HTTP Server 2.4
- Ruby 3.3 with :command:`rake`, :command:`bundler`, and development
libraries
- Node.js 18

Some operating systems use `Software Collections`_ to satisfy these.
- Node.js 20

.. note::

Expand Down Expand Up @@ -39,23 +37,23 @@ Some operating systems use `Software Collections`_ to satisfy these.
sudo dnf config-manager --set-enabled powertools
sudo dnf install epel-release
sudo dnf module enable ruby:3.1 nodejs:18
sudo dnf module enable ruby:3.3 nodejs:20
.. tab:: RockyLinux/Alma Linux 9

.. code-block:: sh
sudo dnf config-manager --set-enabled crb
sudo dnf install epel-release
sudo dnf module enable ruby:3.1 nodejs:18
sudo dnf module enable ruby:3.3 nodejs:20
.. tab:: RHEL 8

.. code-block:: sh
sudo dnf install epel-release
sudo dnf module enable ruby:3.1 nodejs:18
sudo dnf module enable ruby:3.3 nodejs:20
sudo subscription-manager repos --enable codeready-builder-for-rhel-8-x86_64-rpms
Expand All @@ -64,7 +62,7 @@ Some operating systems use `Software Collections`_ to satisfy these.
.. code-block:: sh
sudo dnf install epel-release
sudo dnf module enable ruby:3.1 nodejs:18
sudo dnf module enable ruby:3.3 nodejs:20
sudo subscription-manager repos --enable codeready-builder-for-rhel-9-x86_64-rpms
2. Add repository and install
Expand Down Expand Up @@ -198,6 +196,4 @@ If you'd like a package built for a system that we don't currently support, feel

- https://github.com/OSC/ondemand/issues/new

.. _software collections: https://www.softwarecollections.org/en/
.. _apache http server 2.4: https://www.softwarecollections.org/en/scls/rhscl/httpd24/
.. _ohio supercomputer center: https://www.osc.edu/
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,7 @@ configuration files.
``cluster1``, so you will need to replace it with the name of the cluster
you configured):

.. rubric:: If your operating system is CentOS 7 or RHEL 7, run this command:

.. code-block:: sh
sudo su $USER -c 'scl enable ondemand -- bin/rake test:jobs:cluster1 RAILS_ENV=production'
.. rubric:: Otherwise, run this command:
.. rubric:: Run this command:

.. code-block:: sh
Expand Down Expand Up @@ -101,13 +95,7 @@ configuration files.
provide these command line arguments as a string with the environment
variable ``SUBMIT_ARGS`` as:

.. rubric:: If your operating system is CentOS 7 or RHEL 7, run this command:

.. code-block:: sh
sudo su $USER -c 'scl enable ondemand-- bin/rake test:jobs:cluster1 RAILS_ENV=production SUBMIT_ARGS="-A myaccount"'
.. rubric:: Otherwise, run this command:
.. rubric:: Run this command:

.. code-block:: sh
Expand Down
14 changes: 7 additions & 7 deletions data-hide-false/_sources/reference/files/nginx-stage-yml.rst.txt
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ Configuration Options
the path to the NGINX binary

Default
Use NGINX installed by OnDemand Software Collections
Use NGINX installed by OnDemand

.. code-block:: yaml
Expand Down Expand Up @@ -220,7 +220,7 @@ Configuration Options
the path to the system-installed NGINX ``mime.types`` file

Default
Use the NGINX installed by OnDemand Software Collections file
Use the NGINX installed by OnDemand

.. code-block:: yaml
Expand All @@ -238,7 +238,7 @@ Configuration Options
the ``locations.ini`` file that describes Passenger installation

Default
Use the file supplied by Passenger from OnDemand Software Collections
Use the file supplied by Passenger from OnDemand

.. code-block:: yaml
Expand All @@ -263,11 +263,11 @@ Configuration Options
passenger_ruby: "/opt/ood/nginx_stage/bin/ruby"
Example
Use the binary supplied by Ruby 2.4 installed by Software Collections
Use the system installed Ruby

.. code-block:: yaml
passenger_ruby: "/opt/rh/rh-ruby25/root/usr/bin/ruby"
passenger_ruby: "/usr/bin/ruby"
.. describe:: passenger_nodejs (String, null)

Expand All @@ -281,11 +281,11 @@ Configuration Options
passenger_nodejs: "/opt/ood/nginx_stage/bin/node"
Example
Use the binary supplied by Node.js installed by Software Collections
Use the system installed Node.js

.. code-block:: yaml
passenger_nodejs: "/opt/rh/rh-nodejs6/root/usr/bin/node"
passenger_nodejs: "/usr/bin/node"
.. describe:: passenger_python (String, null)

Expand Down
Loading

0 comments on commit cf6a5bd

Please sign in to comment.