Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: update Coucbase ORM to conform SDK 3.x (config updates) #1851 #2118

Merged
merged 1 commit into from
Aug 12, 2022
Merged

feat: update Coucbase ORM to conform SDK 3.x (config updates) #1851 #2118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 8 additions & 10 deletions jans-auth-server/server/conf/jans-couchbase.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
servers: ${config.couchbase.couchbase_servers}

connection.operation-tracing-enabled: false

# If mutation tokens are enabled, they can be used for advanced durability requirements,
# as well as optimized RYOW consistency.
connection.mutation-tokens-enabled: false

# Default scan consistency. Possible values are: not_bounded, request_plus, statement_plus
connection.scan-consistency: not_bounded

# Enable/disable DNS SRV lookup for the bootstrap nodes
# Default dnsSrvEnabled is true
connection.dns.use-lookup: false

auth.userName: ${config.couchbase.couchbase_server_user}
auth.userPassword: ${config.couchbase.encoded_couchbase_server_pw}

Expand All @@ -23,7 +21,7 @@ bucket.jans_session.mapping: ${config.bucket.jans_session.mapping}

password.encryption.method: ${config.couchbase.encryption_method}

ssl.enable: ${config.couchbase.ssl_enabled}
ssl.trustStoreFile: ${config.couchbase.couchbaseTrustStoreFn}
ssl.trustStorePin: ${config.couchbase.encoded_couchbaseTrustStorePass}
ssl.trustStoreFormat: pkcs12
ssl.trustStore.enable: ${config.couchbase.ssl_enabled}
ssl.trustStore.file: ${config.couchbase.couchbaseTrustStoreFn}
ssl.trustStore.pin: ${config.couchbase.encoded_couchbaseTrustStorePass}
ssl.trustStore.type: pkcs12
40 changes: 23 additions & 17 deletions jans-linux-setup/jans_setup/templates/jans-couchbase.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,32 +4,38 @@ servers: %(couchbase_query_node)s
# If you feel the urge to change this value to something higher, there is a good chance that your network is not properly set up.
# Connecting to the server should in practice not take longer than a second on a reasonably fast network.
# Default SDK connectTimeout is 10s
connection.connect-timeout:10000
connection.connect-timeout: 10000

# Enable/disable DNS SRV lookup for the bootstrap nodes
# Default dnsSrvEnabled is true
connection.dns.use-lookup: false

# Key/value timeout
# Default SDK kvTimeout is 2500ms
connection.kv-timeout: 5000

# Query timeout
# Default SDK queryTimeout is 75s
connection.query-timeout: 75000

# Configures whether mutation tokens will be returned from the server for all mutation operations
# Default mutationTokensEnabled is true
# connection.mutation-tokens-enabled: false

# At startup when connection error is occurred persistence layer can make another attempt to open buckets.
# Before make next try it pause process for 5 second. If after that total connection time is less than specified
# in property above new attempt will be executed
connection.connection-max-wait-time: 20000
connection.operation-tracing-enabled: false

# If mutation tokens are enabled, they can be used for advanced durability requirements,
# as well as optimized RYOW consistency.
connection.mutation-tokens-enabled: false

# Sets the pool size (number of threads to use) for all non blocking operations in the core and clients
# (default value is the number of CPUs).
#connection.computation-pool-size: 5

# Default scan consistency. Possible values are: not_bounded, request_plus, statement_plus
connection.scan-consistency: not_bounded

# Sets the time of inactivity, in milliseconds, after which some services
# will issue a form of keep-alive request to their corresponding server/nodes
# (default is 30s, values <= 0 deactivate the idle check).
#connection.keep-alive-interval=4000
# Disable scan consistency in queries. Default value: false
# connection.ignore-attribute-scan-consistency: true

# Customize the timeout used for keepalive operations
#connection.keep-alive-timeout=2500
# Try to execute query with scan consitency specified in connection.scan-consistency first.
# On failure execute query again with scan consistency specified in attributes defintions. Default value: true
# connection.attempt-without-attribute-scan-consistency: false

# Enable scopes support. Default value: false
# connection.enable-scope-support: true
Expand All @@ -50,7 +56,7 @@ password.encryption.method: %(encryption_method)s
ssl.trustStore.enable: %(ssl_enabled)s
ssl.trustStore.file: %(couchbaseTrustStoreFn)s
ssl.trustStore.pin: %(encoded_couchbaseTrustStorePass)s
ssl.trustStore.format: pkcs12
ssl.trustStore.type: pkcs12

binaryAttributes=objectGUID
certificateAttributes=userCertificate