changeset 481:d68dfbe768e2

Merge example configuration and that used for docker backend
author Tom Gottfried <tom@intevation.de>
date Thu, 23 Aug 2018 18:50:32 +0200
parents 0fcbdb4539d1
children 3e5ed9f40095
files README.md cmd/gemma/gemma.toml.example example_conf.toml
diffstat 3 files changed, 58 insertions(+), 64 deletions(-) [+]
line wrap: on
line diff
--- a/README.md	Thu Aug 23 18:40:34 2018 +0200
+++ b/README.md	Thu Aug 23 18:50:32 2018 +0200
@@ -31,16 +31,17 @@
 ## Running gemma
 
 - Best is to create a configuration file.  Copy the example from
-  `cmd/gemma/gemma.toml.example` to get started:
+  `example_conf.toml` to get started:
   ```
-  cp cmd/gemma/gemma.toml.example gemma.toml
+  cp example_conf.toml gemma.toml
   ```
 
 - Edit `gemma.toml`, some parameters you probably want to change:
 
   * `host` and `port` to make gemma listen on a public interface
-  * `service-password` to match the password for "gemma_service" user
-    of your database.
+  * `metamorph-db-password` to match the password for your database user
+  * `geoserver-url`, `geoserver-user` and `geoserver-password` to match
+     your instance of GeoServer
 
 - `./cmd/gemma/gemma -h` gives you an overview of more available
   options.
--- a/cmd/gemma/gemma.toml.example	Thu Aug 23 18:40:34 2018 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-# ----------------------------------------------------------------------
-# Example configuration for gemma back end
-# ----------------------------------------------------------------------
-
-# ----------------------------------------------------------------------
-# Basic Setup:
-
-# Host and port to listen on:
-#host = "localhost"
-#port = 8000
-
-# Where to find the data of the web client (SPA) to serve:
-web = "./web"
-
-# File to persist session data:
-sessions = "session.data"
-
-# ----------------------------------------------------------------------
-# Database:
-
-# DB connection configuration:
-#dbhost = "localhost"
-#dbname = "gemma"
-#dbport = 5432
-#dbssl = "prefer"
-metamorph-db-user = "meta_login"
-#metamorph-db-password = "SECRET"
-
-# ----------------------------------------------------------------------
-# Mail setup:
-
-# SMTP connection configuration:
-#mail-host = "localhost"
-#mail-password = "SECRET"
-#mail-port = 465
-#mail-user = "gemma"
-
-# Client data to use:
-#mail-from = "noreplay@localhost"
-#mail-helo = "localhost"
-
-# ----------------------------------------------------------------------
-# OGC services setup:
-
-# Connection to GeoServer instance for internal OGC services
-#geoserver-url = "http://localhost:8080/geoserver"
-#geoserver-user = "admin"
-#geoserver-password = "geoserver"
-
-# Proxy settings for external OGC services
-#proxy-key = "SECRET"
-#proxy-prefix = "http://localhost:8000"
-
-# ----------------------------------------------------------------------
-# CORS setup:
-
-#allowed-origins = "http://example.com"
--- a/example_conf.toml	Thu Aug 23 18:40:34 2018 +0200
+++ b/example_conf.toml	Thu Aug 23 18:50:32 2018 +0200
@@ -1,7 +1,57 @@
-dbhost = "gemma_db"
+# ----------------------------------------------------------------------
+# Example configuration for gemma back end
+# ----------------------------------------------------------------------
+
+# ----------------------------------------------------------------------
+# Basic Setup:
+
+# Host and port to listen on:
 host = "0.0.0.0"
+#port = 8000
+
+# Where to find the data of the web client (SPA) to serve:
+web = "./web"
+
+# File to persist session data:
 sessions = "/tmp/gemma_session.data"
-web = "./web"
-geoserver-url = "http://gemma_geoserver:8080/geoserver"
+
+# ----------------------------------------------------------------------
+# Database:
+
+# DB connection configuration:
+dbhost = "gemma_db"
+#dbname = "gemma"
+#dbport = 5432
+#dbssl = "prefer"
 metamorph-db-user = "meta_login"
 metamorph-db-password = "geo2Serv"
+
+# ----------------------------------------------------------------------
+# Mail setup:
+
+# SMTP connection configuration:
+#mail-host = "localhost"
+#mail-password = "SECRET"
+#mail-port = 465
+#mail-user = "gemma"
+
+# Client data to use:
+#mail-from = "noreplay@localhost"
+#mail-helo = "localhost"
+
+# ----------------------------------------------------------------------
+# OGC services setup:
+
+# Connection to GeoServer instance for internal OGC services
+geoserver-url = "http://gemma_geoserver:8080/geoserver"
+#geoserver-user = "admin"
+#geoserver-password = "geoserver"
+
+# Proxy settings for external OGC services
+#proxy-key = "SECRET"
+#proxy-prefix = "http://localhost:8000"
+
+# ----------------------------------------------------------------------
+# CORS setup:
+
+#allowed-origins = "http://example.com"