Skip to content

Commit 1b9c3fe

Browse files
korydraughnalanking
authored andcommitted
[irods/irods#8376] Remove references to "irods_client_server_negotiation" property.
1 parent d585aba commit 1b9c3fe

File tree

3 files changed

+2
-15
lines changed

3 files changed

+2
-15
lines changed

docs/getting_started/installation.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,6 @@ Once a server is up and running, the default environment can be shown:
166166

167167
~~~
168168
irods@hostname:~/ $ ienv
169-
irods_client_server_negotiation - request_server_negotiation
170169
irods_client_server_policy - CS_NEG_REFUSE
171170
irods_cwd - /tempZone/home/rods
172171
irods_default_hash_scheme - SHA256
@@ -220,7 +219,6 @@ Below you'll find examples showing what the input file might contain for a [Cata
220219
"service_account_group_name": "irods"
221220
},
222221
"service_account_environment": {
223-
"irods_client_server_negotiation": "request_server_negotiation",
224222
"irods_client_server_policy": "CS_NEG_REFUSE",
225223
"irods_connection_pool_refresh_time_in_seconds": 300,
226224
"irods_cwd": "/tempZone/home/rods",
@@ -380,7 +378,6 @@ Below you'll find examples showing what the input file might contain for a [Cata
380378
"service_account_group_name": "irods"
381379
},
382380
"service_account_environment": {
383-
"irods_client_server_negotiation": "request_server_negotiation",
384381
"irods_client_server_policy": "CS_NEG_REFUSE",
385382
"irods_connection_pool_refresh_time_in_seconds": 300,
386383
"irods_cwd": "/tempZone/home/rods",
@@ -646,7 +643,6 @@ For the client, you will need to update your `irods_environment.json` file with
646643
~~~
647644
irods@hostname:~/ $ cat .irods/irods_environment.json
648645
{
649-
"irods_client_server_negotiation": "request_server_negotiation",
650646
"irods_client_server_policy": "CS_NEG_REFUSE",
651647
"irods_cwd": "/**<newzonename>**/home/rods",
652648
"irods_default_hash_scheme": "SHA256",

docs/plugins/pluggable_network.md

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,13 @@ The TLS mechanism is provided via OpenSSL and wraps the activity from the TCP pl
1010
The TLS parameters are tunable via the following `irods_environment.json` variables:
1111

1212
~~~
13-
"irods_client_server_negotiation": "request_server_negotiation",
1413
"irods_client_server_policy": "CS_NEG_REQUIRE",
14+
"irods_encryption_algorithm": "AES-256-CBC",
1515
"irods_encryption_key_size": 32,
16-
"irods_encryption_salt_size": 8,
1716
"irods_encryption_num_hash_rounds": 16,
18-
"irods_encryption_algorithm": "AES-256-CBC",
17+
"irods_encryption_salt_size": 8,
1918
~~~
2019

21-
The only valid value for 'irods_client_server_negotiation' at this time is 'request_server_negotiation'. Anything else will not begin the negotiation stage and default to using a TCP connection.
22-
2320
The possible values for 'irods_client_server_policy' include:
2421

2522
- CS_NEG_REQUIRE: This side of the connection requires a TLS connection

docs/system_overview/configuration.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -510,11 +510,6 @@ This is the main iRODS configuration file defining the iRODS environment. Any ch
510510

511511
```json
512512
{
513-
// (Optional)
514-
// Set to "request_server_negotiation" indicating advanced negotiation is desired,
515-
// for use in enabling TLS and other technologies.
516-
"irods_client_server_negotiation": "request_server_negotiation",
517-
518513
// (Optional)
519514
// Controls whether the client and server should use TLS for communication.
520515
//
@@ -713,7 +708,6 @@ And here is a service account environment file defining the minimum settings nee
713708

714709
```json
715710
{
716-
"irods_client_server_negotiation": "request_server_negotiation",
717711
"irods_client_server_policy": "CS_NEG_REFUSE",
718712
"irods_connection_pool_refresh_time_in_seconds": 300,
719713
"irods_cwd": "/tempZone/home/rods",

0 commit comments

Comments
 (0)