Merge remote-tracking branch 'upstream/master'

[nominatim.git] / docs / admin / Advanced-Installations.md

diff --git a/docs/admin/Advanced-Installations.md b/docs/admin/Advanced-Installations.md
index ff267cee28bd45f9d15fdbef4eb4ddc83a1ddaed..f8232fb29cea6189b36a2ae7d47a8617531813fb 100644 (file)
--- a/docs/admin/Advanced-Installations.md
+++ b/docs/admin/Advanced-Installations.md
@@ -5,6 +5,35 @@ your Nominatim database. It is assumed that you have already successfully
 installed the Nominatim software itself, if not return to the 
 [installation page](Installation.md).
 
 installed the Nominatim software itself, if not return to the 
 [installation page](Installation.md).
 

+## Importing with a database user without superuser rights
+
+Nominatim usually creates its own PostgreSQL database at the beginning of the
+import process. This makes usage easier for the user but means that the
+database user doing the import needs the appropriate rights.
+
+If you prefer to run the import with a database user with limited rights,
+you can do so by changing the import process as follows:
+
+1. Run the command for database preparation with a database user with
+   superuser rights. For example, to use a db user 'dbadmin' for a
+   database 'nominatim', execute:
+
+   ```
+   NOMINATIM_DATABASE_DSN="pgsql:dbname=nominatim;user=dbadmin" nominatim import --prepare-database
+   ```
+
+2. Grant the import user the right to create tables. For example, foe user 'import-user':
+
+   ```
+   psql -d nominatim -c 'GRANT CREATE ON SCHEMA public TO "import-user"'
+   ```
+
+3. Now run the reminder of the import with the import user:
+
+   ```
+   NOMINATIM_DATABASE_DSN="pgsql:dbname=nominatim;user=import-user" nominatim import --continue import-from-file --osm-file file.pbf
+   ```
+

 ## Importing multiple regions (without updates)
 
 To import multiple regions in your database you can simply give multiple
 ## Importing multiple regions (without updates)
 
 To import multiple regions in your database you can simply give multiple


@@ -36,16 +65,15 @@ which has the following structure:
 
 ```bash
 update
 
 ```bash
 update

-    ├── europe
-    │   ├── andorra
-    │   │   └── sequence.state
-    │   └── monaco
-    │       └── sequence.state
-    └── tmp
-        └── europe
-                ├── andorra-latest.osm.pbf
-                └── monaco-latest.osm.pbf
-
+ ├── europe
+ │    ├── andorra
+ │    │    └── sequence.state
+ │    └── monaco
+ │         └── sequence.state
+ └── tmp
+      └── europe
+           ├── andorra-latest.osm.pbf
+           └── monaco-latest.osm.pbf

 
 ```
 
 
 ```
 


@@ -99,7 +127,7 @@ Change into the project directory and run the following command:
 
 This will get diffs from the replication server, import diffs and index
 the database. The default replication server in the
 
 This will get diffs from the replication server, import diffs and index
 the database. The default replication server in the

-script([Geofabrik](https://download.geofabrik.de)) provides daily updates.
+script ([Geofabrik](https://download.geofabrik.de)) provides daily updates.

 
 ## Using an external PostgreSQL database
 
 
 ## Using an external PostgreSQL database
 


@@ -111,7 +139,7 @@ library.
 
 !!! note
     The external module is only needed when using the legacy tokenizer.
 
 !!! note
     The external module is only needed when using the legacy tokenizer.

-    If you have choosen the ICU tokenizer, then you can ignore this section
+    If you have chosen the ICU tokenizer, then you can ignore this section

     and follow the standard import documentation.
 
 ### Option 1: Compiling the library on the database server
     and follow the standard import documentation.
 
 ### Option 1: Compiling the library on the database server


@@ -198,11 +226,10 @@ target machine.
     of a full database.
 
 Next install Nominatim on the target machine by following the standard installation
     of a full database.
 
 Next install Nominatim on the target machine by following the standard installation

-instructions. Again make sure to use the same version as the source machine.
+instructions. Again, make sure to use the same version as the source machine.

 
 

-You can now copy the project directory from the source machine to the new machine.
-If necessary, edit the `.env` file to point it to the restored database.
-Finally run
+Create a project directory on your destination machine and set up the `.env`
+file to match the configuration on the source machine. Finally run

 
     nominatim refresh --website
 
 
     nominatim refresh --website
 


@@ -210,6 +237,8 @@ to make sure that the local installation of Nominatim will be used.
 
 If you are using the legacy tokenizer you might also have to switch to the
 PostgreSQL module that was compiled on your target machine. If you get errors
 
 If you are using the legacy tokenizer you might also have to switch to the
 PostgreSQL module that was compiled on your target machine. If you get errors

-that PostgreSQL cannot find or access `nominatim.so` then copy the installed
-version into the `module` directory of your project directory. The installed
-copy can usually be found under `/usr/local/lib/nominatim/module/nominatim.so`.
+that PostgreSQL cannot find or access `nominatim.so` then rerun
+
+    nominatim refresh --functions
+
+on the target machine to update the the location of the module.