",
- "style":"normal",
- "matrixset":"PM",
- "maxzoom":"22"
- }
- },
- "data_providers" : {
- "csw" : [
- {
- "title" : "Catalogue GéoBretagne",
- "url": "https://geobretagne.fr/geonetwork/srv/fre/csw",
- "baseref": "https://geobretagne.fr/geonetwork/srv/eng/catalog.search?node=srv#/metadata/"
- },
- {
- "title" : "Catalogue Région Bretagne",
- "url": "https://applications.region-bretagne.fr/geonetwork/srv/fre/csw",
- "baseref": "https://applications.region-bretagne.fr/geonetwork/srv/fre/catalog.search#/metadata/"
- },
- {
- "title" : "Catalogue de la Région Grand Est",
- "url": "https://geobretagne.fr/geonetwork/srv/fre/csw",
- "baseref": "https://www.cigalsace.org/geonetwork/"
- },
- {
- "title" : "Catalogue de la Région Pays de la Loire",
- "url": "../proxy/?url=https://www.geopal.org/geonetwork/srv/fre/csw",
- "baseref": "https://www.geopal.org/geonetwork/"
- }
- ],
- "wms" : [
- {
- "title" : "Serveur WMS de la Région",
- "url": "https://ows.region-bretagne.fr/geoserver/rb/wms"
- }
- ]
- },
- "default_params" : {
- "layer": {
- "info_format": "text/html"
- }
- }
- }
-}
diff --git a/docker/nginx-default.conf b/docker/nginx/default.conf.template
similarity index 60%
rename from docker/nginx-default.conf
rename to docker/nginx/default.conf.template
index 363af7b9..d12b3f75 100644
--- a/docker/nginx-default.conf
+++ b/docker/nginx/default.conf.template
@@ -1,20 +1,13 @@
-upstream mviewerstudio {
- server mviewerstudio:8000;
-}
-
-upstream mviewer {
- server mviewer:80;
-}
-
server {
- listen 8080;
- server_name localhost;
+ listen 80;
+ server_name ${NGINX_HOST};
location /mviewer/ {
- proxy_pass http://mviewer/;
+ proxy_pass http://mviewer:80/;
}
- location / {
- proxy_pass http://mviewerstudio;
+
+ location /${MVIEWERSTUDIO_URL_PATH_PREFIX}/ {
+ proxy_pass http://mviewerstudio:8000/${MVIEWERSTUDIO_URL_PATH_PREFIX}/;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
@@ -24,5 +17,10 @@ server {
#proxy_set_header sec-roles "ROLE_ADMINISTRATOR;ROLE_MVIEWER_ADMIN";
#proxy_set_header sec-org "geobretagne";
}
+
+ location / {
+ server_name_in_redirect off;
+ return 302 /${MVIEWERSTUDIO_URL_PATH_PREFIX};
+ }
}
diff --git a/docker/readme.md b/docker/readme.md
new file mode 100644
index 00000000..36c85dd8
--- /dev/null
+++ b/docker/readme.md
@@ -0,0 +1,22 @@
+# mviewerstudio Dockerfile
+
+## Which one ?
+The maintained dockerfile is the python one. The php one is there for historical reasons and will probably soon be dropped.
+
+## Environment variables
+
+- EXPORT_CONF_FOLDER is the "staging" folder where studio will store draft configs and work in progress
+- CONF_PATH_FROM_MVIEWER is the url path given to mviewer to access the same map files
+- MVIEWERSTUDIO_PUBLISH_PATH is the "production" folder where studio will copy the map files when you ask to *Publish*
+- CONF_PUBLISH_PATH_FROM_MVIEWER is the url path given to mviewer to access the same map files
+- MVIEWERSTUDIO_URL_PATH_PREFIX allows to serve studio on a non-root path, see [#271](https://github.com/mviewer/mviewerstudio/pull/271)
+
+## Default configuration
+
+The default configuration (env vars defined in the dockerfile and json config file copied) assume that:
+- the mviewer _apps_ folder is mounted at EXPORT_CONF_FOLDER=/home/apprunner/apps
+- /home/apprunner/apps/store and /home/apprunner/apps/prod are existing folders (you might need to create them manually beforehand)
+- it is using config-python-sample.json, which at some point you will probably want to override with your own config.
+
+
+It is also configured to serve the frontend (static files) with gunicorn, which is usually not recommended. Later versions might use an nginx container to serve the frontend.
diff --git a/index.html b/index.html
index 65a7f19b..e883fdc6 100755
--- a/index.html
+++ b/index.html
@@ -213,7 +213,7 @@