update zone auth and negotiation env vars (#44, #45)

bihealth · Dec 10, 2024 · 507048e · 507048e
1 parent 285c277
commit 507048e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -18,6 +18,9 @@
 - Enable Python rule engine `core.py` file templating (#41)
 - Add `IRODS_CLIENT_SERVER_POLICY` in `core.py` template (#42)
 - Remove support for legacy and C++ rule engines (#43)
+- Remove `IRODS_AUTHENTICATION_SCHEME` env var (#44)
+- Set `IRODS_CLIENT_SERVER_NEGOTIATION` default value to `request_server_negotiation` (#45)
+
 
 ## v4.2 (2024-01-19)
 

diff --git a/README.md b/README.md
@@ -63,8 +63,7 @@ iRODS can be run in either "provider" mode, which installs an iCAT catalogue ser
 | IRODS_SSL_VERIFY_SERVER          | none                             | both       |
 | IRODS_PASSWORD_SALT              | tempsalt                         | both       |
 | IRODS_SSL_CA_CERT_PATH           |                                  | both       |
-| IRODS_AUTHENTICATION_SCHEME      | native                           | both       |
-| IRODS_CLIENT_SERVER_NEGOTIATION  | off                              | both       |
+| IRODS_CLIENT_SERVER_NEGOTIATION  | request_server_negotiation       | both       |
 | IRODS_CLIENT_SERVER_POLICY       | CS_NEG_REFUSE                    | both       |
 | IRODS_RESOURCE_DIRECTORY         | /data/Vault                      | both       |
 | IRODS_DEFAULT_HASH_SCHEME        | SHA256                           | both       |

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -33,8 +33,7 @@ ENV IRODS_PKG_VERSION=$IRODS_PKG_VERSION \
     IRODS_SSL_VERIFY_SERVER=none \
     IRODS_PASSWORD_SALT=tempsalt \
     IRODS_SSL_CA_CERT_PATH= \
-    IRODS_AUTHENTICATION_SCHEME=native \
-    IRODS_CLIENT_SERVER_NEGOTIATION=off \
+    IRODS_CLIENT_SERVER_NEGOTIATION=request_server_negotiation \
     IRODS_CLIENT_SERVER_POLICY=CS_NEG_REFUSE \
     IRODS_RESOURCE_DIRECTORY=/data/Vault \
     IRODS_DEFAULT_HASH_SCHEME="SHA256" \

diff --git a/docker/templates/unattended_config.json.j2 b/docker/templates/unattended_config.json.j2
@@ -153,7 +153,7 @@
         "server_port_range_start": {{ IRODS_DATA_PORT_RANGE_START }},
         "server_port_range_end": {{ IRODS_DATA_PORT_RANGE_END }},
         "xmsg_port": 1279,
-        "zone_auth_scheme": "{{ IRODS_AUTHENTICATION_SCHEME }}",
+        "zone_auth_scheme": "native",
         "zone_key": "{{ IRODS_ZONE_KEY }}",
         "zone_name": "{{ IRODS_ZONE_NAME }}",
         "zone_port": {{ IRODS_ZONE_PORT }},