Skip to content

Commit a36ae2d

Browse files
Merge branch 'dev' into 2024-12-seed-restore-until
2 parents 9abb963 + 3dd42c4 commit a36ae2d

32 files changed

+467
-305
lines changed

antora.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
name: operations-manual
22
title: Operations Manual
3-
version: '5'
3+
version: '2025.01'
4+
current: true
45
start_page: ROOT:index.adoc
56
nav:
67
- modules/ROOT/content-nav.adoc
78
asciidoc:
89
attributes:
9-
neo4j-version: '5'
10-
neo4j-version-minor: '5.26'
11-
neo4j-version-exact: '5.26.0'
12-
neo4j-buildnumber: '5.26'
10+
neo4j-version: '2025.01'
11+
neo4j-version-minor: '2025.01'
12+
neo4j-version-exact: '2025.01.0'
13+
neo4j-buildnumber: '2025.01'
1314
neo4j-debian-package-version: '1:5.22.0@'

modules/ROOT/pages/authentication-authorization/database-administration.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ Use `REVOKE` if you want to remove a privilege.
180180

181181
Common errors, such as misspellings or attempts to revoke privileges that have not been granted or denied, will lead to notifications.
182182
Some of these notifications may be replaced with errors in a future major version of Neo4j.
183-
See link:{neo4j-docs-base-uri}/status-codes/{page-version}/notifications/all-notifications[Status Codes -> Notification codes] for details on notifications.
183+
See link:{neo4j-docs-base-uri}/status-codes/{page-version}/notifications/all-notifications[Status Codes for Errors & Notifications -> Server notifications] for details on notifications.
184184

185185
The hierarchy between the different database privileges is shown in the image below.
186186

modules/ROOT/pages/authentication-authorization/ldap-integration.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ dbms.security.ldap.authorization.system_username=cn=search-account,cn=Users,dc=e
197197
+
198198
[source, properties]
199199
----
200-
dbms.security.ldap.authorization.system_password=mypassword
200+
dbms.security.ldap.authorization.system_password=your_password
201201
----
202202

203203
.. Configure which attribute to search for by adding the following lines to the _neo4j.conf_ file (replacing `myattribute` with the actual attribute name):
@@ -490,7 +490,7 @@ ldapsearch -v -H ldap://myactivedirectory.example.com:389 -x -D cn=john,cn=Users
490490
----
491491
# ldapsearch -v -H ldap://<dbms.security.ldap.host> -x -D <dbms.security.ldap.authorization.system_username> -w <dbms.security.ldap.authorization.system_password> -b <dbms.security.ldap.authorization.user_search_base> "<dbms.security.ldap.authorization.user_search_filter>" <dbms.security.ldap.authorization.group_membership_attributes>
492492
493-
ldapsearch -v -H ldap://myactivedirectory.example.com:389 -x -D cn=search-account,cn=Users,dc=example,dc=com -w mypassword -b cn=Users,dc=example,dc=com "(&(objectClass=*)(cn=john))" memberOf
493+
ldapsearch -v -H ldap://myactivedirectory.example.com:389 -x -D cn=search-account,cn=Users,dc=example,dc=com -w your_password -b cn=Users,dc=example,dc=com "(&(objectClass=*)(cn=john))" memberOf
494494
----
495495

496496
. Verify that the value of the returned membership attribute is a group that is mapped to a role in `dbms.security.ldap.authorization.group_to_role_mapping`.

modules/ROOT/pages/backup-restore/inspect.adoc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,11 @@ The `<backup-path>` parameter can also inspect backups stored in AWS S3 buckets
107107
|
108108
|===
109109

110+
[NOTE]
111+
====
112+
The `--latest-backup` and `--latest-chain` options cannot be used together.
113+
====
114+
110115

111116
[[aggregate-backup-example]]
112117
== Examples

modules/ROOT/pages/clustering/databases.adoc

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -268,8 +268,8 @@ Neo4j 5.24 introduces the xref:procedures.adoc#procedure_dbms_cluster_recreateDa
268268
* To change the database store to a specified backup, while keeping all the associated privileges for the database.
269269

270270
* To make your database write-available again after it has been lost (for example, due to a disaster).
271-
// See xref:clustering/disaster-recovery.adoc[] for more information.
272-
271+
See xref:clustering/disaster-recovery.adoc[Disaster recovery] for more information.
272+
273273
[CAUTION]
274274
====
275275
The recreate procedure works only for real user databases and not for composite databases, or the `system` database.
@@ -506,7 +506,7 @@ To determine the cause of the problem, it is recommended to look at the `debug.l
506506

507507
The `FileSeedProvider` supports:
508508

509-
** `file:`
509+
** `file:`
510510

511511
[[url-connection-seed-provider]]
512512
==== URLConnectionSeedProvider
@@ -522,8 +522,8 @@ The `URLConnectionSeedProvider` supports the following:
522522

523523
The `CloudSeedProvider` supports:
524524

525-
** `s3:`
526-
** `gs:`
525+
** `s3:`
526+
** `gs:`
527527
** `azb:`
528528

529529
The `CloudSeedProvider` supports using xref:backup-restore/modes.adoc#differential-backup[differential backups] as seeds.
@@ -538,7 +538,7 @@ include::partial$/aws-s3-overrides.adoc[]
538538

539539
include::partial$/aws-s3-credentials.adoc[]
540540

541-
. Create database from `myBackup.backup`.
541+
. Create database from `myBackup.backup`.
542542
+
543543
[source,shell, role="nocopy"]
544544
----
@@ -551,7 +551,7 @@ CREATE DATABASE foo OPTIONS { existingData: 'use', seedURI: 's3:/myBucket/myBack
551551

552552
include::partial$/gcs-credentials.adoc[]
553553

554-
. Create database from `myBackup.backup`.
554+
. Create database from `myBackup.backup`.
555555
+
556556
[source,shell]
557557
----
@@ -563,7 +563,7 @@ CREATE DATABASE foo OPTIONS { existingData: 'use', seedURI: 'gs:/myBucket/myBack
563563

564564
include::partial$/azb-credentials.adoc[]
565565

566-
. Create database from `myBackup.backup`.
566+
. Create database from `myBackup.backup`.
567567
+
568568
[source,shell]
569569
----
@@ -578,6 +578,8 @@ The `CloudSeedProvider` supports seeding up to a specific date or transaction ID
578578

579579
To seed up to a specific date, you need to pass the differential backup, which contains the data up to that date.
580580

581+
** `s3:` label:deprecated[Deprecated in 5.26]
582+
581583
[source,shell]
582584
----
583585
CREATE DATABASE foo OPTIONS { existingData: 'use', seedURI: 's3:/myBucket/myBackup.backup', seedRestoreUntil: datetime("2019-06-01T18:40:32.142+0100") }
@@ -605,7 +607,8 @@ This will seed the database with transactions up to, but not including transacti
605607
| URI example
606608

607609
| `file:`
608-
| `FileSeedProvider`
610+
| `FileSeedProvider` +
611+
`URLConnectionSeedProvider` label:deprecated[Deprecated in 5.26]
609612
| `file:/tmp/backup1.backup`
610613

611614
| `ftp:`
@@ -621,7 +624,8 @@ This will seed the database with transactions up to, but not including transacti
621624
| `\https://myhttp.com/backups/backup1.backup`
622625

623626
| `s3:`
624-
| `CloudSeedProvider`
627+
| `S3SeedProvider` label:deprecated[Deprecated in 5.26], +
628+
`CloudSeedProvider`
625629
| `s3://mybucket/backups/backup1.backup`
626630

627631
| `gs:`

0 commit comments

Comments
 (0)