Skip to content

Commit 7ac21ac

Browse files
authored
Feature/beta02 (#588)
* DOC_9272-C3 -- B3 --Replace beta01 references https://issues.couchbase.com/browse/DOCS-9272 (cherry picked from commit 41858d71877dea66e8be3597a0e16d7477c288c9) * DOC_9272-C5 -- B5 --Release Notes – check and update the list of issues/fixed https://issues.couchbase.com/browse/DOCS-9272 (cherry picked from commit db1390ca98e264ffaac7c014075d78abb3067ea9) * DOC-9272-C2 -- B.2 --Config Links – check redirected from legacy https://issues.couchbase.com/browse/DOCS-9272 (cherry picked from commit aefe00ddb90d3a594f9e6788a9daf1ec78f9e89c) (cherry picked from commit 5bcc1e530b62698d1a9fe0b766597cd4c4857bd7) * DOC-9272-C7 -- B.7 --Compatibility -- standardize presentation https://issues.couchbase.com/browse/DOCS-9272 (cherry picked from commit 295206f0aaade09893ce52618db60bfe9b551027) * DOC-9272-C7 -- B.7 --Compatibility -- standardize presentation (#2) https://issues.couchbase.com/browse/DOCS-9272 (cherry picked from commit e47191e5b21d306c4b269c3d23bc2f6823cd6a59) * DOC-9272-C9 -- B.9 --DP for AWS Linux 2 Gravition and M1 https://issues.couchbase.com/browse/DOCS-9272 (cherry picked from commit 3c1e3bb1ae666295fef690ade6a320431b539ea3) * DOC-9272-C10 -- B.10--SGW Breaking changes feedback https://issues.couchbase.com/browse/DOCS-9272 (cherry picked from commit 446fd7f7b206c7992eaea12aebb64f40fbeec927) * DOC-9302 -- Add use_tls_server and server_tls_skip_verify to legacy config https://issues.couchbase.com/browse/DOC-9302 (cherry picked from commit b9d378a5be92d292494f245682713393c2a02155) * DOC-9304 -- Add max_concurrent_query_ops Sets the maximum number of concurrent query operations allowed https://issues.couchbase.com/browse/DOC-9304 (cherry picked from commit de5aeedc86171ab9c803b0aaa1b9592393906663) * QF211019-1 -- Fix release date (cherry picked from commit 7a20f66cc671edaa3a6a37c20e3017a364f18cf7) * DOC-9047-C48 -- RN Issue List Updates https://issues.couchbase.com/browse/DOC-9047 (cherry picked from commit 8b89a92dc9aef4c5f7195e7ea3942451c76b2bf2)
1 parent 960da32 commit 7ac21ac

19 files changed

+634
-673
lines changed

antora.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
name: sync-gateway
22
title: Sync Gateway
33
version: '3.0'
4-
prerelease: BETA
5-
display-version: '3.0 BETA01'
4+
prerelease: beta
5+
display-version: '3.0.0 (beta)'
66
start_page: ROOT:index.adoc
77
nav:
88
- modules/ROOT/nav.adoc
99
asciidoc:
1010
attributes:
11-
prerelease: BETA
12-
is-beta:
11+
prerelease: beta
12+
is-beta: true
1313
release: '3.0'
1414
major: 3
1515
minor: 0
1616
maintenance: 0
17+
base: 0
18+
releasetag: beta02

modules/ROOT/assets/attachments/configuration-properties-legacy.yaml

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ properties:
55
default: '127.0.0.1:4985'
66
admin_interface_authentication:
77
type: boolean
8-
default: true
8+
default: 'true'
99
description: |+
1010
Use `admin_interface_authentication=false` to turn of the secure remote administration feature introduced in 3.0 BETA.
1111
@@ -28,7 +28,7 @@ properties:
2828

2929
metrics_interface_authentication:
3030
type: boolean
31-
default: true
31+
default: 'true'
3232
description: |+
3333
Use `metrics_interface_authentication=false` to turn of the secure remote administration feature introduced in 3.0 BETA.
3434
@@ -865,7 +865,12 @@ properties:
865865
description: |+
866866
The view query timeout in seconds. This property allows you to specify the time Sync Gateway should wait for a view query response from Couchbase Server before it times out. The timeout is used for both view and N1QL queries issued by Sync Gateway.
867867
default: 75
868-
#
868+
max_concurrent_query_ops:
869+
description: |+
870+
Sets the maximum number of concurrent query operations allowed
871+
type: integer
872+
default: 1000
873+
#
869874
# END : Define Server
870875

871876
# container:
@@ -1346,7 +1351,7 @@ properties:
13461351
13471352
disable_persistent_config:
13481353
type: boolean
1349-
default: false
1354+
default: 'false'
13501355
description: |+
13511356
Set to true to disable the persistent configuration handling introduced in 3.0 BETA
13521357
facebook:
@@ -1701,6 +1706,17 @@ properties:
17011706
description: Log warnings if N1QL or View queries made by Sync Gateway take this many milliseconds or longer.
17021707
type: integer
17031708
default: 500
1709+
server_tls_skip_verify:
1710+
description: |+
1711+
Allow empty server CA Cert Path without attempting to use system root pool.
1712+
type: boolean
1713+
default: 'false'
1714+
use_tls_server:
1715+
description: |+
1716+
Use TLS for CBS to-from SGW communications
1717+
type: boolean
1718+
default: 'true'
1719+
17041720
SSLCert:
17051721
description: Absolute or relative path on the filesystem to the TLS certificate file, if TLS is used to secure Sync Gateway connections, or "nil" for plaintext. A relative path is from the directory that contains the Sync Gateway executable file.
17061722
type: string

modules/ROOT/assets/attachments/sg-bootstrap.yaml

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ properties:
8383
8484
use_tls_server:
8585
type: boolean
86-
default: true
86+
default: 'true'
8787
description: |+
8888
Default to `true`, which forces the connection to Couchbase Server to use TLS.
8989
@@ -93,7 +93,11 @@ properties:
9393
9494
If the scheme used does not match that indicated by the `use_tls_server` value (for example, `couchbases://` with `use_tls_server` = `false`) then Sync Gateway will error and refuse to start.
9595
96-
Use in conjunction with
96+
max_concurrent_query_ops:
97+
description: |+
98+
Sets the maximum number of concurrent query operations allowed
99+
type: integer
100+
default: 1000
97101

98102
api:
99103
type: object
@@ -112,7 +116,7 @@ properties:
112116
Change requires restart of Admin API
113117
admin_interface_authentication:
114118
type: boolean
115-
default: true
119+
default: 'true'
116120
description: |+
117121
Use the `admin_interface_authentication` property to disable authentication for the metrics API.
118122
This option should be used with discretion and only in test environments.
@@ -132,7 +136,7 @@ properties:
132136
```"metricsInterface": "127.0.0.1:4986"```
133137
metrics_interface_authentication:
134138
type: boolean
135-
default: true
139+
default: 'true'
136140
description: |+
137141
Use the `metrics_interface_authentication` property to disable authentication for the metrics API.
138142
This option should be used with discretion and only in test environments.
@@ -215,7 +219,7 @@ properties:
215219
description: An allowed origin array element
216220
hide_product_version:
217221
type: boolean
218-
default: false
222+
default: 'false'
219223
description: |+
220224
Determines whether product versions are removed from Server headers and REST API responses.
221225
This setting does not apply to the Admin REST API.
@@ -227,7 +231,7 @@ properties:
227231
properties:
228232
# allow_insecure_tls_connections:
229233
# type: boolean
230-
# default: false
234+
# default: 'false'
231235
# description: |+
232236
# Secure TLS connections are used by default for all REST API dialogs.
233237

@@ -287,7 +291,7 @@ properties:
287291
Change requires HTTP server restart
288292
pretty:
289293
type: boolean
290-
default: false
294+
default: 'false'
291295
description: |+
292296
(**Deprecated**) Whether to pretty-print JSON responses.
293297
@@ -616,7 +620,7 @@ properties:
616620
properties:
617621
enabled:
618622
type: boolean
619-
default: true
623+
default: 'true'
620624
description: |+
621625
Whether to enable this log level.
622626
@@ -659,7 +663,7 @@ properties:
659663
properties:
660664
enabled:
661665
type: boolean
662-
default: false
666+
default: 'false'
663667
description: |+
664668
Sets this logging-level on or off.
665669
@@ -819,12 +823,12 @@ properties:
819823
820824
http2.enabled:
821825
type: boolean
822-
default: false
826+
default: 'false'
823827
description:
824828

825829
use_stdlib_json:
826830
type: boolean
827-
default: false
831+
default: 'false'
828832
description:
829833

830834

modules/ROOT/pages/_partials/_attributes-local.adoc

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
:xref-pfx-cao: xref:{component-cao}:
5757
// :xref-pfx-shared: xref:{component-mob}:
5858

59-
:xref-url-cb-downloads: {url-cb-downloads}[Couchbase Downloads page]
59+
:xref-url-mobile-downloads: {url-mobile-downloads}[Couchbase Downloads page]
6060
:xref-url-cb-blog: {url-cb-blog}[Blog]
6161
:xref-url-cb-forum: {url-cb-forum}[Forum]
6262
:xref-url-cb-forum-mobile: {url-cb-forum-mobile}[Forum]
@@ -88,7 +88,7 @@
8888
:url-cb-pfx: https://www.couchbase.com/
8989
:url-cb-jira: https://issues.couchbase.com/browse
9090
:url-cb-issues-sync: https://github.com/couchbase/sync_gateway/issues
91-
:url-cb-downloads: {url-cb-pfx}downloads/?family=mobile
91+
:url-mobile-downloads: {url-cb-pfx}downloads/?family=mobile
9292
:url-cb-package-downloads: http://packages.couchbase.com/releases/couchbase-sync-gateway
9393
:url-cb-blog: https://blog.couchbase.com/
9494
:url-cb-forum: https://forums.couchbase.com/
@@ -153,14 +153,29 @@
153153
// ifndef::patch[:patch: 2]
154154
// ifndef::version[:version: {major}.{minor}]
155155
// Sever shared connection for these attributes
156-
:major: 3
157-
:minor: 0
158-
:patch: 0
156+
157+
// BEGIN -- VERSION ATTRIBUTES
158+
// Version component attributes now seeded from antora.yml
159+
// optional releasetag used yo indicate prerelease versions mainly
160+
:tag: {empty}
161+
ifdef::releasetag[:tag: -{releasetag}]
159162
:version: {major}.{minor}
160-
:version-full: {major}.{minor}.0
161-
:version-maint: {major}.{minor}.{patch}
162-
:version-date: November 2021
163+
:version-full: {major}.{minor}.{base}{tag}
164+
:version-full-untagged: {major}.{minor}.{base}
165+
// Full version including maintenance release -- this is set in attributes-module as it will vary by module -- here at component level it is always same as version-full
166+
167+
// begin maintenance versions
168+
// patch is base/zero until first maintenance release and so version-maint/maintenance is same as version-full until first maintenance release
169+
:patch: {base}
170+
:version-maintenance: {version-full}
171+
:version-maint: {version-full}
172+
:version-date: October 2021
163173
:version-maint-date: {version-date}
174+
// end maintenance versions
175+
176+
// END -- VERSION ATTRIBUTES
177+
178+
164179
// SYNC GATEWAY VERSIONING
165180

166181
// Couchbase Components

modules/ROOT/pages/_partials/_page-index.adoc

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,10 +270,23 @@ endif::xref--pfx-sgw[]
270270

271271
:configuration-schema-bootstrap--page: configuration-schema-bootstrap.adoc
272272
:bootstrap-schema--pfx: {sgw--xref}{configuration-schema-bootstrap--page}
273+
:bootstrap-schema--xref: {bootstrap-schema--pfx}[Bootstrap Configuration]
273274
:configuration-schema-bootstrap--xref: {bootstrap-schema--pfx}[Bootstrap Configuration]
274275

275276
// :bootstrap-schema--xref--allow_insecure_tls_connections: {bootstrap-schema--pfx}#api-https-allow_insecure_tls_connections[allow_insecure_tls_connections]
276277

278+
:bootstrap-schema--xref--group-id: {bootstrap-schema--pfx}#bootstrap-group-id[bootstrap.group_id]
279+
:bootstrap-schema--xref--config_update_frequency: {bootstap-schema--pfx}#bootstrap-config_update_frequency[bootstrap.config_update_frequency]
280+
:bootstrap-schema--xref--server: {bootstrap-schema--pfx}#bootstrap-server[bootstrap.server]
281+
:bootstrap-schema--xref--username: {bootstrap-schema--pfx}#bootstrap-username[bootstrap.username]
282+
:bootstrap-schema--xref--password: {bootstrap-schema--pfx}#bootstrap-password[bootstrap.password]
283+
:bootstrap-schema--xref--ca_cert_path: {bootstrap-schema--pfx}#bootstrap-ca_cert_path[bootstrap.ca_cert_path]
284+
:bootstrap-schema--xref--server_tls_skip_verify: {bootstrap-schema--pfx}#bootstrap-server_tls_skip_verify[bootstrap.server_tls_skip_verify]
285+
:bootstrap-schema--xref--x509_cert_path: {bootstrap-schema--pfx}#bootstrap-x509_cert_path[bootstrap.x509_cert_path]
286+
:bootstrap-schema--xref--x509_key_path: {bootstrap-schema--pfx}#bootstrap-x509_key_path[bootstrap.x509_key_path]
287+
:bootstrap-schema--xref--server_tls_skip_verify: {bootstrap-schema--pfx}#bootstrap-server_tls_skip_verify[bootstrap.server_tls_skip_verify]
288+
:bootstrap-schema--xref--use_tls_server: {bootstrap-schema--pfx}#bootstrap-use_tls_server[bootstrap.use_tls_server]
289+
277290
:bootstrap-schema--xref--api-admin-interface-authentication: {bootstrap-schema--pfx}#api-admin_interface_authentication[api.api.admin_interface_authentication]
278291
:bootstrap-schema--xref--api-admin-interface: {bootstrap-schema--pfx}#api-admin_interface[api.admin_interface]
279292
:bootstrap-schema--xref--api-compress-responses: {bootstrap-schema--pfx}#api-compress_responses[api.compress_responses]
@@ -381,6 +394,22 @@ endif::xref--pfx-sgw[]
381394
:bootstrap-schema--xref--unsupported: {bootstrap-schema--pfx}#unsupported[unsupported]
382395

383396

397+
:configuration-schema-database--page: configuration-schema-database.adoc
398+
:configuration-schema-database--xref: {database-schema--pfx}[Database Configuration Schema]
399+
400+
:database-schema--pfx: {sgw--xref}{configuration-schema-database--page}
401+
:database-schema--xref: {database-schema--pfx}[Database Configuration Schema]
402+
:database-schema--bmk: {database-schema--pfx}#database_configuration_model-
403+
404+
:database-schema--xref--bucket: {database-schema--bmk}bucket[database_schema.bucket]
405+
:database-schema--xref--name: {database-schema--bmk}name[database_schema.name]
406+
:database-schema--xref--sync: {database-schema--bmk}sync[database_schema.sync]
407+
408+
:database-schema--xref--delta-sync: {database-schema--bmk}delta_sync[database_schema.delta_sync]
409+
// :database-schema--xref--bucket: {database-schema--bmk}bucket[database_schema.bucket]
410+
// :database-schema--xref--bucket: {database-schema--bmk}bucket[database_schema.bucket]
411+
// :database-schema--xref--bucket: {database-schema--bmk}bucket[database_schema.bucket]
412+
384413

385414

386415

modules/ROOT/pages/_partials/_related-content.adoc

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,20 @@
4848
4949
// tag::reference-icr[]
5050
// tag::reference-config[]
51-
* {configuration-properties--xref}
51+
52+
* xref:configuration-schema-bootstrap.adoc[Bootstrap]
53+
* xref:configuration-schema-database.adoc[Database]
54+
* xref:configuration-schema-db-security.adoc[Database Security]
55+
* xref:configuration-schema-access-control.adoc[Access Control]
56+
* xref:configuration-schema-import-filter.adoc[Import Filter]
57+
* xref:configuration-schema-isgr.adoc[Inter-Sync{nbsp}Gateway Replication]
58+
* xref:configuration-properties.adoc[Legacy Pre-3.0 BETA Configuration]
59+
5260
// end::reference-config[]
5361
// tag::reference-api[]
5462
* {rest-api--xref}
5563
* {rest-api-admin--xref}
5664
* {rest-api-metrics--xref}
57-
* {rest-api-client-app--xref}
5865
// end::reference-api[]
5966
// end::reference-icr[]
6067

@@ -90,8 +97,9 @@ Blog Entries
9097

9198

9299
// tag::concept-syncfunc[]
93-
* {xref-sgw-pg-icr-sgreplicate}
94-
* {xref-sgw-pg-shared-bucket-access}
100+
* xref:configuration-schema-access-control.adoc[Access Control]
101+
* xref:rest-api-admin.html#/Access_Control/update_sync_function[Add/Update Sync Function]
102+
* xref:sync-function-overview.adoc[Sync Function Overview]
95103
// end::concept-syncfunc[]
96104

97105
// tag::null-content[]

0 commit comments

Comments
 (0)