From b46d8e1b5d25f25aa23aebcc44483d2dcd297cd5 Mon Sep 17 00:00:00 2001 From: dbeltran Date: Tue, 10 Oct 2023 12:19:50 +0200 Subject: [PATCH 1/3] docs for the new autosubmit_rc env variable --- VERSION | 2 +- docs/source/installation/index.rst | 8 ++++++-- requeriments.txt | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/VERSION b/VERSION index e176f5208..e373cc472 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.0.97 +4.0.98 diff --git a/docs/source/installation/index.rst b/docs/source/installation/index.rst index b89b88c2e..279f02d5a 100644 --- a/docs/source/installation/index.rst +++ b/docs/source/installation/index.rst @@ -174,9 +174,13 @@ There are two methods of configuring the Autosubmit main paths. * ``autosubmit configure`` is suited for a personal/single user who wants to test Autosubmit in the scope of ``$HOME``. It will generate an ``$HOME/.autosubmitrc`` file that overrides the machine configuration. -* Manually generate an ``autosubmitrc`` file in ``/etc/autosubmitrc``, suited for a workgroup or production environment that wants to use Autosubmit in a shared database in a manner that multiple users can share and view others' experiments. +Manually generate an ``autosubmitrc`` file in one of these locations, which is the recommended method for a production environment with a shared database in a manner that multiple users can share and view others' experiments. -.. important:: `.autosubmitrc` user level and user level precedes system configuration. `$HOME/.autosubmitrc > /etc/autosubmitrc` +* ``/etc/autosubmitrc``, System level configuration. + +* Set the environment variable ``AUTOSUBMIT_CONFIGURATION`` to the path of the ``autosubmitrc`` file. This will override the System level configuration path. + +.. important:: `.autosubmitrc` user level and user level precedes system configuration. `$HOME/.autosubmitrc > `AUTOSUBMIT_CONFIGURATION` > /etc/autosubmitrc` Quick Installation - Non-shared database (user level) ------------------------------------------------------ diff --git a/requeriments.txt b/requeriments.txt index cd93f47c5..15acaad8c 100644 --- a/requeriments.txt +++ b/requeriments.txt @@ -1,6 +1,6 @@ setuptools>=60.8.2 cython -autosubmitconfigparser==1.0.48 +autosubmitconfigparser==1.0.49 paramiko>=2.9.2 bcrypt>=3.2 PyNaCl>=1.5.0 -- GitLab From b96ccb526939c055c4381dda2b07c81958881214 Mon Sep 17 00:00:00 2001 From: dbeltran Date: Tue, 10 Oct 2023 12:33:32 +0200 Subject: [PATCH 2/3] docs for the new autosubmit_rc env variable --- docs/source/installation/index.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/installation/index.rst b/docs/source/installation/index.rst index 279f02d5a..be1fe0fa7 100644 --- a/docs/source/installation/index.rst +++ b/docs/source/installation/index.rst @@ -178,9 +178,9 @@ Manually generate an ``autosubmitrc`` file in one of these locations, which is t * ``/etc/autosubmitrc``, System level configuration. -* Set the environment variable ``AUTOSUBMIT_CONFIGURATION`` to the path of the ``autosubmitrc`` file. This will override the System level configuration path. +* Set the environment variable ``AUTOSUBMIT_CONFIGURATION`` to the path of the ``autosubmitrc`` file. This will override all other configuration files. -.. important:: `.autosubmitrc` user level and user level precedes system configuration. `$HOME/.autosubmitrc > `AUTOSUBMIT_CONFIGURATION` > /etc/autosubmitrc` +.. important:: `.autosubmitrc` user level and user level precedes system configuration. `AUTOSUBMIT_CONFIGURATION` > `$HOME/.autosubmitrc > /etc/autosubmitrc` Quick Installation - Non-shared database (user level) ------------------------------------------------------ -- GitLab From cd33d4f13b9b1c4f05b171787d5b2cd04a6f44be Mon Sep 17 00:00:00 2001 From: dbeltran Date: Tue, 10 Oct 2023 14:39:28 +0200 Subject: [PATCH 3/3] fix doc --- docs/source/installation/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/installation/index.rst b/docs/source/installation/index.rst index be1fe0fa7..bba8af71d 100644 --- a/docs/source/installation/index.rst +++ b/docs/source/installation/index.rst @@ -180,7 +180,7 @@ Manually generate an ``autosubmitrc`` file in one of these locations, which is t * Set the environment variable ``AUTOSUBMIT_CONFIGURATION`` to the path of the ``autosubmitrc`` file. This will override all other configuration files. -.. important:: `.autosubmitrc` user level and user level precedes system configuration. `AUTOSUBMIT_CONFIGURATION` > `$HOME/.autosubmitrc > /etc/autosubmitrc` +.. important:: `.autosubmitrc` user level precedes system configuration unless the environment variable is set. `AUTOSUBMIT_CONFIGURATION` > `$HOME/.autosubmitrc > /etc/autosubmitrc` Quick Installation - Non-shared database (user level) ------------------------------------------------------ -- GitLab