Skip to content

Commit b5e781b

Browse files
committed
There's no need for config-dockerfile.yaml anymore
1 parent b18815d commit b5e781b

3 files changed

Lines changed: 18 additions & 12 deletions

File tree

Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@ COPY dbsync.py .
3535
COPY dbsync_daemon.py .
3636
COPY log_functions.py .
3737

38-
# base DB sync config file (the rest is configured with env variables)
39-
COPY config-dockerfile.yaml ./config.yaml
4038
ENV PATH="${PATH}:/geodiff/build"
4139

4240
ENTRYPOINT ["python3", "dbsync_daemon.py"]

config-dockerfile.yaml

Lines changed: 0 additions & 5 deletions
This file was deleted.

config.yaml.default

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,31 @@
1+
# How to connect to Mergin Maps server
12
mergin:
23
url: https://app.merginmaps.com
34
username: john
45
password: mysecret
56

7+
# How to initialize the sync - one of the two options:
8+
# - "gpkg" - use existing GeoPackage from given Mergin Maps project (and create database schema during init)
9+
# - "db" - use existing database schema (and create GeoPackage in Mergin Maps project during init)
610
init_from: gpkg
711

812
connections:
913
- driver: postgres
10-
conn_info:
11-
modified: mergin_main
12-
base: mergin_base
14+
# Parameters to PostgreSQL database
15+
conn_info: "host=localhost dbname=mydb user=myuser password=mypassword"
16+
# Database schema that will be synchronized with Mergin Maps project
17+
# (it must exist if doing init from database, it must not exist if doing init from geopackage)
18+
modified: myproject_data
19+
# Extra database schema that will contain internal data and should never be edited
20+
# (it must not exist before the sync starts - it will be created automatically)
21+
base: myproject_data_base
22+
23+
# Mergin Maps project to use (<workspace>/<project>)
1324
mergin_project: john/myproject
14-
sync_file: sync.gpkg
15-
skip_tables: []
25+
# Path to the GeoPackage within the Mergin Maps project above
26+
# (it must exist if doing init from geopackage, it must not exist if doing init from database)
27+
sync_file: data.gpkg
1628

1729
daemon:
30+
# How often to synchronize (in seconds)
1831
sleep_time: 10

0 commit comments

Comments
 (0)