replace PDAS with PVS

c20fd7c4 · Mussab Abdalla · 01369124 · c20fd7c4 · c20fd7c4 · c20fd7c4
Commit c20fd7c4 authored 5 years ago by Mussab Abdalla
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,25 +10,25 @@ build-master:
    - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
  script:
    - VERSION=`grep 'version="*"' core/Dockerfile | cut -d '"' -f2`
-    - IMAGE="$CI_REGISTRY_IMAGE/pdas_core"
+    - IMAGE="$CI_REGISTRY_IMAGE/pvs_core"
    - docker pull "$IMAGE":latest || true
    - docker build --cache-from "$IMAGE":latest -t "$IMAGE":latest -t "$IMAGE":$VERSION core/
    - docker push "$IMAGE":$VERSION
    - docker push "$IMAGE":latest
    - VERSION=`grep 'version="*"' preprocessor/Dockerfile | cut -d '"' -f2`
-    - IMAGE="$CI_REGISTRY_IMAGE/pdas_preprocessor"
+    - IMAGE="$CI_REGISTRY_IMAGE/pvs_preprocessor"
    - docker pull "$IMAGE":latest || true
    - docker build --cache-from "$IMAGE":latest -t "$IMAGE":latest -t "$IMAGE":$VERSION preprocessor/
    - docker push "$IMAGE":$VERSION
    - docker push "$IMAGE":latest
    - VERSION=`grep 'version="*"' client/Dockerfile | cut -d '"' -f2`
-    - IMAGE="$CI_REGISTRY_IMAGE/pdas_client"
+    - IMAGE="$CI_REGISTRY_IMAGE/pvs_client"
    - docker pull "$IMAGE":latest || true
    - docker build --cache-from "$IMAGE":latest -t "$IMAGE":latest -t "$IMAGE":$VERSION client/
    - docker push "$IMAGE":$VERSION
    - docker push "$IMAGE":latest
    - VERSION=`grep 'version="*"' cache/Dockerfile | cut -d '"' -f2`
-    - IMAGE="$CI_REGISTRY_IMAGE/pdas_cache"
+    - IMAGE="$CI_REGISTRY_IMAGE/pvs_cache"
    - docker pull "$IMAGE":latest || true
    - docker build --cache-from "$IMAGE":latest -t "$IMAGE":latest -t "$IMAGE":$VERSION cache/
    - docker push "$IMAGE":$VERSION
@@ -44,22 +44,22 @@ build:
  before_script:
    - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
  script:
-    - IMAGE="$CI_REGISTRY_IMAGE/pdas_core"
+    - IMAGE="$CI_REGISTRY_IMAGE/pvs_core"
    - docker pull "$IMAGE":$CI_COMMIT_REF_NAME || true
    - docker build --cache-from "$IMAGE":$CI_COMMIT_REF_NAME -t "$IMAGE":$CI_COMMIT_REF_SLUG -t "$IMAGE":$CI_COMMIT_REF_NAME core/
    - docker push "$IMAGE:$CI_COMMIT_REF_SLUG"
    - docker push "$IMAGE:$CI_COMMIT_REF_NAME"
-    - IMAGE="$CI_REGISTRY_IMAGE/pdas_preprocessor"
+    - IMAGE="$CI_REGISTRY_IMAGE/pvs_preprocessor"
    - docker pull "$IMAGE":$CI_COMMIT_REF_NAME || true
    - docker build --cache-from "$IMAGE":$CI_COMMIT_REF_NAME -t "$IMAGE":$CI_COMMIT_REF_SLUG -t "$IMAGE":$CI_COMMIT_REF_NAME preprocessor/
    - docker push "$IMAGE:$CI_COMMIT_REF_SLUG"
    - docker push "$IMAGE:$CI_COMMIT_REF_NAME"
-    - IMAGE="$CI_REGISTRY_IMAGE/pdas_client"
+    - IMAGE="$CI_REGISTRY_IMAGE/pvs_client"
    - docker pull "$IMAGE":$CI_COMMIT_REF_NAME || true
    - docker build --cache-from "$IMAGE":$CI_COMMIT_REF_NAME -t "$IMAGE":$CI_COMMIT_REF_SLUG -t "$IMAGE":$CI_COMMIT_REF_NAME client/
    - docker push "$IMAGE:$CI_COMMIT_REF_SLUG"
    - docker push "$IMAGE:$CI_COMMIT_REF_NAME"
-    - IMAGE="$CI_REGISTRY_IMAGE/pdas_cache"
+    - IMAGE="$CI_REGISTRY_IMAGE/pvs_cache"
    - docker pull "$IMAGE":$CI_COMMIT_REF_NAME || true
    - docker build --cache-from "$IMAGE":$CI_COMMIT_REF_NAME -t "$IMAGE":$CI_COMMIT_REF_SLUG -t "$IMAGE":$CI_COMMIT_REF_NAME cache/
    - docker push "$IMAGE:$CI_COMMIT_REF_SLUG"

--- a/cache/Dockerfile
+++ b/cache/Dockerfile
 #------------------------------------------------------------------------------
 #
-# Project: prism data access server
+# Project: prism view server
 # Authors: Stephan Meissl <stephan.meissl@eox.at>
 #
 #------------------------------------------------------------------------------
@@ -27,10 +27,10 @@

 FROM ubuntu:18.04
 MAINTAINER EOX
-LABEL name="prism data access server cache" \
+LABEL name="prism view server cache" \
      vendor="EOX IT Services GmbH <https://eox.at>" \
      license="MIT Copyright (C) 2019 EOX IT Services GmbH <https://eox.at>" \
-      type="prism data access server cache" \
+      type="prism view server cache" \
      version="0.0.1-dev"

 USER root
@@ -39,12 +39,12 @@ ADD install.sh \
 RUN ./install.sh

 ENV COLLECTION_ID= \
-    INSTANCE_ID="prism-data-access-server_cache" \
+    INSTANCE_ID="prism-view-server_cache" \
    RENDERER_HOST= \
-    INSTALL_DIR="/var/www/pdas/" \
+    INSTALL_DIR="/var/www/pvs/" \
    COLLECTION= \
    APACHE_CONF="/etc/apache2/sites-enabled/010_prism_cache.conf" \
-    APACHE_ServerName="pdas_cache" \
+    APACHE_ServerName="pvs_cache" \
    APACHE_ServerAdmin="office@eox.at" \
    APACHE_NGEO_CACHE_ALIAS="/ows" \
    REDIS_HOST= \

--- a/cache/configure.sh
+++ b/cache/configure.sh
@@ -66,19 +66,19 @@ if [ ! -f "${INSTALL_DIR}/index.html" ] ; then
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html>
    <head>
-        <title>PRISM Data Access Service (PDAS) - Cache</title>
+        <title>PRISM View Service (PVS) - Cache</title>
    </head>
    <body>
-        <h1>PRISM Data Access Service (PDAS) - Cache Test Page<br><font size="-1">
+        <h1>PRISM View Service (PVS) - Cache Test Page<br><font size="-1">
        <strong>powered by</font> <a href="https://eox.at">EOX</a></strong></h1>
-        <p>This page is used to test the proper operation of the PRISM Data Access Service (PDAS)
+        <p>This page is used to test the proper operation of the PRISM View Server (PVS)
        cache after it has been installed. If you can read
-        this page it means that the PRISM Data Access Service (PDAS) cache
+        this page it means that the PRISM View Service (PVS) cache
        installed at this site is working properly.</p>
        <p>Links to services:</p>
        <ul>
-            <li><a href="/cache${APACHE_NGEO_CACHE_ALIAS}/wmts/1.0.0/WMTSCapabilities.xml">PDAS WMTS</a></li>
-            <li><a href="/cache${APACHE_NGEO_CACHE_ALIAS}?SERVICE=WMS&REQUEST=GetCapabilities">PDAS WMS</a></li>
+            <li><a href="/cache${APACHE_NGEO_CACHE_ALIAS}/wmts/1.0.0/WMTSCapabilities.xml">PVS WMTS</a></li>
+            <li><a href="/cache${APACHE_NGEO_CACHE_ALIAS}?SERVICE=WMS&REQUEST=GetCapabilities">PVS WMS</a></li>
        </ul>
    </body>
 </html>

--- a/cache/mapcache-template.xml
+++ b/cache/mapcache-template.xml
@@ -25,8 +25,8 @@
  </service>
  <service type="wmts" enabled="true"/>
  <metadata>
-    <title>Pre-rendered View Service (pdas) developed by EOX</title>
-    <abstract>Pre-rendered View Service (pdas) developed by EOX</abstract>
+    <title>Pre-rendered View Service (pvs) developed by EOX</title>
+    <abstract>Pre-rendered View Service (pvs) developed by EOX</abstract>
    <keyword>view service</keyword>
    <accessconstraints>UNKNOWN</accessconstraints>
    <fees>UNKNOWN</fees>

--- a/cache/seeder.py
+++ b/cache/seeder.py
@@ -7,7 +7,7 @@
 #-----------------------------------------------------------------------------
 # Copyright (c) 2018 EOX IT Services GmbH
 #
-# Python script to pre-seed PDAS cache.
+# Python script to pre-seed PVS cache.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
@@ -221,7 +221,7 @@ def seeder_redis_wrapper(
 if __name__ == "__main__":
    parser = argparse.ArgumentParser()
    parser.description = textwrap.dedent("""\
-    Pre-seeds cache of PRISM Data Access Service (pdas).
+    Pre-seeds cache of PRISM View Server (pvs).
    """)

    parser.add_argument(

--- a/client/Dockerfile
+++ b/client/Dockerfile
 #------------------------------------------------------------------------------
 #
-# Project: prism data access server
+# Project: prism view server
 # Authors: Fabian Schindler <fabian.schindler@eox.at>
 #
 #------------------------------------------------------------------------------
@@ -27,10 +27,10 @@

 FROM nginx

-LABEL name="prism data access server client" \
+LABEL name="prism view server client" \
      vendor="EOX IT Services GmbH <https://eox.at>" \
      license="MIT Copyright (C) 2019 EOX IT Services GmbH <https://eox.at>" \
-      type="prism data access server client" \
+      type="prism view server client" \
      version="0.0.1-dev"

 COPY html/ /usr/share/nginx/html/
--- a/client/html/index.html
+++ b/client/html/index.html
@@ -3,14 +3,14 @@
 <head>
  <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
  <meta charset="UTF-8">
-  <title>PRISM Data Access Service</title>
+  <title>PRISM View Service</title>
  <link rel="icon" href="//eox.at/wp-content/uploads/2015/06/cropped-eox_eye-192x192.png" sizes="192x192" />
  <link rel="apple-touch-icon-precomposed" href="//eox.at/wp-content/uploads/2015/06/cropped-eox_eye-180x180.png" />
 </head>
 <body>
  <header id="header" style="width: 100%; height:70px;">
    <h3 style="width:100%;text-align:center;
-    color: #006699;">PRISM Data Access Service (PDAS) Client powered by
+    color: #006699;">PRISM View Service (PVS) Client powered by
    <a href="//eox.at"><img src="//eox.at/wp-content/uploads/2017/09/EOX_Logo.svg" alt="EOX" style="height:25px;margin-left:10px"/></a>
    </h3>
  </header>

--- a/config/emg_index-dev.html
+++ b/config/emg_index-dev.html
@@ -3,14 +3,14 @@
 <head>
  <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
  <meta charset="UTF-8">
-  <title>PRISM Data Access Service</title>
+  <title>PRISM View Service</title>
  <link rel="icon" href="//eox.at/wp-content/uploads/2015/06/cropped-eox_eye-192x192.png" sizes="192x192" />
  <link rel="apple-touch-icon-precomposed" href="//eox.at/wp-content/uploads/2015/06/cropped-eox_eye-180x180.png" />
 </head>
 <body>
  <header id="header" style="width: 100%; height:70px;">
    <h3 style="width:100%;text-align:center;
-    color: #006699;">PRISM Data Access Service (PDAS) Client powered by
+    color: #006699;">PRISM View Service (PVS) Client powered by
    <a href="//eox.at"><img src="//eox.at/wp-content/uploads/2017/09/EOX_Logo.svg" alt="EOX" style="height:25px;margin-left:10px"/></a>
    </h3>
  </header>

--- a/config/emg_index-ops.html
+++ b/config/emg_index-ops.html
@@ -3,14 +3,14 @@
 <head>
  <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
  <meta charset="UTF-8">
-  <title>PRISM Data Access Service</title>
+  <title>PRISM View Service</title>
  <link rel="icon" href="//eox.at/wp-content/uploads/2015/06/cropped-eox_eye-192x192.png" sizes="192x192" />
  <link rel="apple-touch-icon-precomposed" href="//eox.at/wp-content/uploads/2015/06/cropped-eox_eye-180x180.png" />
 </head>
 <body>
  <header id="header" style="width: 100%; height:70px;">
    <h3 style="width:100%;text-align:center;
-    color: #006699;">PRISM Data Access Service (PDAS) Client powered by
+    color: #006699;">PRISM View Service (PVS) Client powered by
    <a href="//eox.at"><img src="//eox.at/wp-content/uploads/2017/09/EOX_Logo.svg" alt="EOX" style="height:25px;margin-left:10px"/></a>
    </h3>
  </header>
@@ -19,7 +19,7 @@
  <script>
  var today = new Date();
  today.setUTCHours(24, 0, 0, 0);
-  var baseUrl = '//emg.pdas.prism.eox.at/';
+  var baseUrl = '//emg.pvs.prism.eox.at/';
  var config = {
    "settings": {
        "rightPanelOpen": true,

--- a/config/emg_mapcache-dev.xml
+++ b/config/emg_mapcache-dev.xml
@@ -25,8 +25,8 @@
  </service>
  <service type="wmts" enabled="true"/>
  <metadata>
-    <title>Pre-rendered View Service (pdas) developed by EOX</title>
-    <abstract>Pre-rendered View Service (pdas) developed by EOX</abstract>
+    <title>Pre-rendered View Service (pvs) developed by EOX</title>
+    <abstract>Pre-rendered View Service (pvs) developed by EOX</abstract>
    <keyword>view service</keyword>
    <accessconstraints>UNKNOWN</accessconstraints>
    <fees>UNKNOWN</fees>

--- a/config/emg_mapcache-ops.xml
+++ b/config/emg_mapcache-ops.xml
@@ -25,9 +25,9 @@
  </service>
  <service type="wmts" enabled="true"/>
  <metadata>
-    <title>Pre-rendered View Service (pdas) developed by EOX</title>
-    <abstract>Pre-rendered View Service (pdas) developed by EOX</abstract>
-    <url>https://emg.pdas.prism.eox.at/cache/ows</url>
+    <title>Pre-rendered View Service (pvs) developed by EOX</title>
+    <abstract>Pre-rendered View Service (pvs) developed by EOX</abstract>
+    <url>https://emg.pvs.prism.eox.at/cache/ows</url>
    <keyword>view service</keyword>
    <accessconstraints>UNKNOWN</accessconstraints>
    <fees>UNKNOWN</fees>

--- a/config/vhr18_index-dev.html
+++ b/config/vhr18_index-dev.html
@@ -3,14 +3,14 @@
 <head>
  <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
  <meta charset="UTF-8">
-  <title>PRISM Data Access Service</title>
+  <title>PRISM View Service</title>
  <link rel="icon" href="//eox.at/wp-content/uploads/2015/06/cropped-eox_eye-192x192.png" sizes="192x192" />
  <link rel="apple-touch-icon-precomposed" href="//eox.at/wp-content/uploads/2015/06/cropped-eox_eye-180x180.png" />
 </head>
 <body>
  <header id="header" style="width: 100%; height:70px;">
    <h3 style="width:100%;text-align:center;
-    color: #006699;">PRISM Data Access Service (PDAS) Client powered by
+    color: #006699;">PRISM View Service (PVS) Client powered by
    <a href="//eox.at"><img src="//eox.at/wp-content/uploads/2017/09/EOX_Logo.svg" alt="EOX" style="height:25px;margin-left:10px"/></a>
    </h3>
  </header>

--- a/config/vhr18_index-ops.html
+++ b/config/vhr18_index-ops.html
@@ -3,21 +3,21 @@
 <head>
  <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
  <meta charset="UTF-8">
-  <title>PRISM Data Access Service</title>
+  <title>PRISM View Service</title>
  <link rel="icon" href="//eox.at/wp-content/uploads/2015/06/cropped-eox_eye-192x192.png" sizes="192x192" />
  <link rel="apple-touch-icon-precomposed" href="//eox.at/wp-content/uploads/2015/06/cropped-eox_eye-180x180.png" />
 </head>
 <body>
  <header id="header" style="width: 100%; height:70px;">
    <h3 style="width:100%;text-align:center;
-    color: #006699;">PRISM Data Access Service (PDAS) Client powered by
+    color: #006699;">PRISM View Service (PVS) Client powered by
    <a href="//eox.at"><img src="//eox.at/wp-content/uploads/2017/09/EOX_Logo.svg" alt="EOX" style="height:25px;margin-left:10px"/></a>
    </h3>
  </header>
  <div id="app" style="width: 100%; top: 60px; bottom: 0; position: absolute; margin: 0; padding:0;"></div>
  <script src="prism.js"></script>
  <script>
-  var baseUrl = '//vhr18.pdas.prism.eox.at/';
+  var baseUrl = '//vhr18.pvs.prism.eox.at/';
  var config = {
    "settings": {
        "rightPanelOpen": true,

--- a/config/vhr18_mapcache-dev.xml
+++ b/config/vhr18_mapcache-dev.xml
@@ -25,8 +25,8 @@
  </service>
  <service type="wmts" enabled="true"/>
  <metadata>
-    <title>Pre-rendered View Service (pdas) developed by EOX</title>
-    <abstract>Pre-rendered View Service (pdas) developed by EOX</abstract>
+    <title>Pre-rendered View Service (pvs) developed by EOX</title>
+    <abstract>Pre-rendered View Service (pvs) developed by EOX</abstract>
    <keyword>view service</keyword>
    <accessconstraints>UNKNOWN</accessconstraints>
    <fees>UNKNOWN</fees>

--- a/config/vhr18_mapcache-ops.xml
+++ b/config/vhr18_mapcache-ops.xml
@@ -25,9 +25,9 @@
  </service>
  <service type="wmts" enabled="true"/>
  <metadata>
-    <title>Pre-rendered View Service (pdas) developed by EOX</title>
-    <abstract>Pre-rendered View Service (pdas) developed by EOX</abstract>
-    <url>https://vhr18.pdas.prism.eox.at/cache/ows</url>
+    <title>Pre-rendered View Service (pvs) developed by EOX</title>
+    <abstract>Pre-rendered View Service (pvs) developed by EOX</abstract>
+    <url>https://vhr18.pvs.prism.eox.at/cache/ows</url>
    <keyword>view service</keyword>
    <accessconstraints>UNKNOWN</accessconstraints>
    <fees>UNKNOWN</fees>

--- a/docker-compose.emg.ops.yml
+++ b/docker-compose.emg.ops.yml
@@ -8,33 +8,33 @@ services:
          size: 536870912
  renderer:
    environment:
-      INSTALL_DIR: "/var/www/pdas/ops/"
+      INSTALL_DIR: "/var/www/pvs/ops/"
    deploy:
      labels:
        # router for basic auth based access (https)
-        - "traefik.http.routers.emg-renderer.rule=Host(`emg.pdas.prism.eox.at`, `a.emg.pdas.prism.eox.at`, `b.emg.pdas.prism.eox.at`, `c.emg.pdas.prism.eox.at`, `d.emg.pdas.prism.eox.at`, `e.emg.pdas.prism.eox.at`, `f.emg.pdas.prism.eox.at`, `g.emg.pdas.prism.eox.at`, `h.emg.pdas.prism.eox.at`) && PathPrefix(`/ows`, `/opensearch`, `/admin`)"
+        - "traefik.http.routers.emg-renderer.rule=Host(`emg.pvs.prism.eox.at`, `a.emg.pvs.prism.eox.at`, `b.emg.pvs.prism.eox.at`, `c.emg.pvs.prism.eox.at`, `d.emg.pvs.prism.eox.at`, `e.emg.pvs.prism.eox.at`, `f.emg.pvs.prism.eox.at`, `g.emg.pvs.prism.eox.at`, `h.emg.pvs.prism.eox.at`) && PathPrefix(`/ows`, `/opensearch`, `/admin`)"
        - "traefik.http.routers.emg-renderer.middlewares=auth@file,compress@file"
        - "traefik.http.routers.emg-renderer.tls=true"
        - "traefik.http.routers.emg-renderer.tls.certresolver=default"
        - "traefik.http.routers.emg-renderer.entrypoints=https"
        # router for basic auth based access (http)
-        - "traefik.http.routers.emg-renderer-redirect.rule=Host(`emg.pdas.prism.eox.at`, `a.emg.pdas.prism.eox.at`, `b.emg.pdas.prism.eox.at`, `c.emg.pdas.prism.eox.at`, `d.emg.pdas.prism.eox.at`, `e.emg.pdas.prism.eox.at`, `f.emg.pdas.prism.eox.at`, `g.emg.pdas.prism.eox.at`, `h.emg.pdas.prism.eox.at`) && PathPrefix(`/ows`, `/opensearch`, `/admin`)"
+        - "traefik.http.routers.emg-renderer-redirect.rule=Host(`emg.pvs.prism.eox.at`, `a.emg.pvs.prism.eox.at`, `b.emg.pvs.prism.eox.at`, `c.emg.pvs.prism.eox.at`, `d.emg.pvs.prism.eox.at`, `e.emg.pvs.prism.eox.at`, `f.emg.pvs.prism.eox.at`, `g.emg.pvs.prism.eox.at`, `h.emg.pvs.prism.eox.at`) && PathPrefix(`/ows`, `/opensearch`, `/admin`)"
        - "traefik.http.routers.emg-renderer-redirect.middlewares=redirect@file"
        - "traefik.http.routers.emg-renderer-redirect.entrypoints=http"
        # router for referrer based access (https)
-        - "traefik.http.routers.emg-renderer_referer.rule=Host(`emg.pdas.prism.eox.at`, `a.emg.pdas.prism.eox.at`, `b.emg.pdas.prism.eox.at`, `c.emg.pdas.prism.eox.at`, `d.emg.pdas.prism.eox.at`, `e.emg.pdas.prism.eox.at`, `f.emg.pdas.prism.eox.at`, `g.emg.pdas.prism.eox.at`, `h.emg.pdas.prism.eox.at`) && PathPrefix(`/ows`, `/opensearch`, `/admin`) && HeadersRegexp(`Referer`, `(https?://)?(panda.copernicus.eu|panda.cdsv3.eu|panda-demo.ondaprism.eu|emg.pdas.prism.eox.at)/?`)"
+        - "traefik.http.routers.emg-renderer_referer.rule=Host(`emg.pvs.prism.eox.at`, `a.emg.pvs.prism.eox.at`, `b.emg.pvs.prism.eox.at`, `c.emg.pvs.prism.eox.at`, `d.emg.pvs.prism.eox.at`, `e.emg.pvs.prism.eox.at`, `f.emg.pvs.prism.eox.at`, `g.emg.pvs.prism.eox.at`, `h.emg.pvs.prism.eox.at`) && PathPrefix(`/ows`, `/opensearch`, `/admin`) && HeadersRegexp(`Referer`, `(https?://)?(panda.copernicus.eu|panda.cdsv3.eu|panda-demo.ondaprism.eu|emg.pvs.prism.eox.at)/?`)"
        - "traefik.http.routers.emg-renderer_referer.middlewares=compress@file"
        - "traefik.http.routers.emg-renderer_referer.tls=true"
        - "traefik.http.routers.emg-renderer_referer.tls.certresolver=default"
        - "traefik.http.routers.emg-renderer_referer.entrypoints=https"
        # router for referrer based access (http)
-        - "traefik.http.routers.emg-renderer_referer-redirect.rule=Host(`emg.pdas.prism.eox.at`, `a.emg.pdas.prism.eox.at`, `b.emg.pdas.prism.eox.at`, `c.emg.pdas.prism.eox.at`, `d.emg.pdas.prism.eox.at`, `e.emg.pdas.prism.eox.at`, `f.emg.pdas.prism.eox.at`, `g.emg.pdas.prism.eox.at`, `h.emg.pdas.prism.eox.at`) && PathPrefix(`/ows`, `/opensearch`, `/admin`) && HeadersRegexp(`Referer`, `(https?://)?(panda.copernicus.eu|panda.cdsv3.eu|panda-demo.ondaprism.eu|emg.pdas.prism.eox.at)/?`)"
+        - "traefik.http.routers.emg-renderer_referer-redirect.rule=Host(`emg.pvs.prism.eox.at`, `a.emg.pvs.prism.eox.at`, `b.emg.pvs.prism.eox.at`, `c.emg.pvs.prism.eox.at`, `d.emg.pvs.prism.eox.at`, `e.emg.pvs.prism.eox.at`, `f.emg.pvs.prism.eox.at`, `g.emg.pvs.prism.eox.at`, `h.emg.pvs.prism.eox.at`) && PathPrefix(`/ows`, `/opensearch`, `/admin`) && HeadersRegexp(`Referer`, `(https?://)?(panda.copernicus.eu|panda.cdsv3.eu|panda-demo.ondaprism.eu|emg.pvs.prism.eox.at)/?`)"
        - "traefik.http.routers.emg-renderer_referer-redirect.middlewares=redirect@file"
        - "traefik.http.routers.emg-renderer_referer-redirect.entrypoints=http"
        # general
        - "traefik.http.services.emg-renderer.loadbalancer.sticky=false"
        - "traefik.http.services.emg-renderer.loadbalancer.server.port=80"
-        - "traefik.docker.network=pdas_extnet"
+        - "traefik.docker.network=pvs_extnet"
        - "traefik.docker.lbswarm=true"
        - "traefik.enable=true"
      resources:
@@ -50,39 +50,39 @@ services:
      labels:
        - "traefik.http.middlewares.cache-stripprefix.stripprefix.prefixes=/cache"
        # router for basic auth based access (https)
-        - "traefik.http.routers.emg-cache.rule=Host(`emg.pdas.prism.eox.at`, `a.emg.pdas.prism.eox.at`, `b.emg.pdas.prism.eox.at`, `c.emg.pdas.prism.eox.at`, `d.emg.pdas.prism.eox.at`, `e.emg.pdas.prism.eox.at`, `f.emg.pdas.prism.eox.at`, `g.emg.pdas.prism.eox.at`, `h.emg.pdas.prism.eox.at`) && PathPrefix(`/cache`)"
+        - "traefik.http.routers.emg-cache.rule=Host(`emg.pvs.prism.eox.at`, `a.emg.pvs.prism.eox.at`, `b.emg.pvs.prism.eox.at`, `c.emg.pvs.prism.eox.at`, `d.emg.pvs.prism.eox.at`, `e.emg.pvs.prism.eox.at`, `f.emg.pvs.prism.eox.at`, `g.emg.pvs.prism.eox.at`, `h.emg.pvs.prism.eox.at`) && PathPrefix(`/cache`)"
        - "traefik.http.routers.emg-cache.middlewares=auth@file,cache-stripprefix,compress@file"
        - "traefik.http.routers.emg-cache.tls=true"
        - "traefik.http.routers.emg-cache.tls.certresolver=default"
        - "traefik.http.routers.emg-cache.entrypoints=https"
        # router for basic auth based access (http)
-        - "traefik.http.routers.emg-cache-redirect.rule=Host(`emg.pdas.prism.eox.at`, `a.emg.pdas.prism.eox.at`, `b.emg.pdas.prism.eox.at`, `c.emg.pdas.prism.eox.at`, `d.emg.pdas.prism.eox.at`, `e.emg.pdas.prism.eox.at`, `f.emg.pdas.prism.eox.at`, `g.emg.pdas.prism.eox.at`, `h.emg.pdas.prism.eox.at`) && PathPrefix(`/cache`)"
+        - "traefik.http.routers.emg-cache-redirect.rule=Host(`emg.pvs.prism.eox.at`, `a.emg.pvs.prism.eox.at`, `b.emg.pvs.prism.eox.at`, `c.emg.pvs.prism.eox.at`, `d.emg.pvs.prism.eox.at`, `e.emg.pvs.prism.eox.at`, `f.emg.pvs.prism.eox.at`, `g.emg.pvs.prism.eox.at`, `h.emg.pvs.prism.eox.at`) && PathPrefix(`/cache`)"
        - "traefik.http.routers.emg-cache-redirect.middlewares=redirect@file"
        - "traefik.http.routers.emg-cache-redirect.entrypoints=http"
        # router for referrer based access (https)
-        - "traefik.http.routers.emg-cache_referer.rule=Host(`emg.pdas.prism.eox.at`, `a.emg.pdas.prism.eox.at`, `b.emg.pdas.prism.eox.at`, `c.emg.pdas.prism.eox.at`, `d.emg.pdas.prism.eox.at`, `e.emg.pdas.prism.eox.at`, `f.emg.pdas.prism.eox.at`, `g.emg.pdas.prism.eox.at`, `h.emg.pdas.prism.eox.at`) && PathPrefix(`/cache`) && HeadersRegexp(`Referer`, `(https?://)?(panda.copernicus.eu|panda.cdsv3.eu|panda-demo.ondaprism.eu|emg.pdas.prism.eox.at)/?`)"
+        - "traefik.http.routers.emg-cache_referer.rule=Host(`emg.pvs.prism.eox.at`, `a.emg.pvs.prism.eox.at`, `b.emg.pvs.prism.eox.at`, `c.emg.pvs.prism.eox.at`, `d.emg.pvs.prism.eox.at`, `e.emg.pvs.prism.eox.at`, `f.emg.pvs.prism.eox.at`, `g.emg.pvs.prism.eox.at`, `h.emg.pvs.prism.eox.at`) && PathPrefix(`/cache`) && HeadersRegexp(`Referer`, `(https?://)?(panda.copernicus.eu|panda.cdsv3.eu|panda-demo.ondaprism.eu|emg.pvs.prism.eox.at)/?`)"
        - "traefik.http.routers.emg-cache_referer.middlewares=cache-stripprefix,compress@file"
        - "traefik.http.routers.emg-cache_referer.tls=true"
        - "traefik.http.routers.emg-cache_referer.tls.certresolver=default"
        - "traefik.http.routers.emg-cache_referer.entrypoints=https"
        # router for referrer based access (http)
-        - "traefik.http.routers.emg-cache_referer-redirect.rule=Host(`emg.pdas.prism.eox.at`, `a.emg.pdas.prism.eox.at`, `b.emg.pdas.prism.eox.at`, `c.emg.pdas.prism.eox.at`, `d.emg.pdas.prism.eox.at`, `e.emg.pdas.prism.eox.at`, `f.emg.pdas.prism.eox.at`, `g.emg.pdas.prism.eox.at`, `h.emg.pdas.prism.eox.at`) && PathPrefix(`/cache`) && HeadersRegexp(`Referer`, `(https?://)?(panda.copernicus.eu|panda.cdsv3.eu|panda-demo.ondaprism.eu|emg.pdas.prism.eox.at)/?`)"
+        - "traefik.http.routers.emg-cache_referer-redirect.rule=Host(`emg.pvs.prism.eox.at`, `a.emg.pvs.prism.eox.at`, `b.emg.pvs.prism.eox.at`, `c.emg.pvs.prism.eox.at`, `d.emg.pvs.prism.eox.at`, `e.emg.pvs.prism.eox.at`, `f.emg.pvs.prism.eox.at`, `g.emg.pvs.prism.eox.at`, `h.emg.pvs.prism.eox.at`) && PathPrefix(`/cache`) && HeadersRegexp(`Referer`, `(https?://)?(panda.copernicus.eu|panda.cdsv3.eu|panda-demo.ondaprism.eu|emg.pvs.prism.eox.at)/?`)"
        - "traefik.http.routers.emg-cache_referer-redirect.middlewares=redirect@file"
        - "traefik.http.routers.emg-cache_referer-redirect.entrypoints=http"
        # general
        - "traefik.http.services.emg-cache.loadbalancer.sticky=false"
        - "traefik.http.services.emg-cache.loadbalancer.server.port=80"
-        - "traefik.docker.network=pdas_extnet"
+        - "traefik.docker.network=pvs_extnet"
        - "traefik.docker.lbswarm=true"
        - "traefik.enable=true"
    networks:
      - extnet
  registrar:
    environment:
-      INSTALL_DIR: "/var/www/pdas/ops/"
+      INSTALL_DIR: "/var/www/pvs/ops/"
  # redis-manager:
  #   environment:
-  #     INSTALL_DIR: "/var/www/pdas/ops/"
+  #     INSTALL_DIR: "/var/www/pvs/ops/"
  client:
    configs:
      - source: client-ops
@@ -90,19 +90,19 @@ services:
    deploy:
      labels:
        # router for basic auth based access (https)
-        - "traefik.http.routers.emg-client.rule=Host(`emg.pdas.prism.eox.at`)"
+        - "traefik.http.routers.emg-client.rule=Host(`emg.pvs.prism.eox.at`)"
        - "traefik.http.routers.emg-client.middlewares=auth@file,compress@file"
        - "traefik.http.routers.emg-client.tls=true"
        - "traefik.http.routers.emg-client.tls.certresolver=default"
        - "traefik.http.routers.emg-client.entrypoints=https"
        # router for basic auth based access (http)
-        - "traefik.http.routers.emg-client-redirect.rule=Host(`emg.pdas.prism.eox.at`)"
+        - "traefik.http.routers.emg-client-redirect.rule=Host(`emg.pvs.prism.eox.at`)"
        - "traefik.http.routers.emg-client-redirect.middlewares=redirect@file"
        - "traefik.http.routers.emg-client-redirect.entrypoints=http"
        # general
        - "traefik.http.services.emg-client.loadbalancer.sticky=false"
        - "traefik.http.services.emg-client.loadbalancer.server.port=80"
-        - "traefik.docker.network=pdas_extnet"
+        - "traefik.docker.network=pvs_extnet"
        - "traefik.docker.lbswarm=true"
        - "traefik.enable=true"
    networks:

--- a/docker-compose.emg.yml
+++ b/docker-compose.emg.yml
@@ -8,7 +8,7 @@ services:
      - env/emg.env
      - env/emg_db.env
    environment:
-      INSTANCE_ID: "prism-data-access-server_database"
+      INSTANCE_ID: "prism-view-server_database"
    deploy:
      placement:
        constraints: [node.role == manager]
@@ -24,7 +24,7 @@ services:
    networks:
      - intnet
  renderer:
-    image: registry.gitlab.eox.at/esa/prism/vs/pdas_core:latest
+    image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:latest
    volumes:
      - type: tmpfs
        target: /tmp
@@ -33,15 +33,15 @@ services:
        target: /cache-db
      - type: volume
        source: instance-data
-        target: /var/www/pdas
+        target: /var/www/pvs
    env_file:
      - env/emg.env
      - env/emg_db.env
      - env/emg_django.env
      - env/emg_obs.env
    environment:
-      INSTANCE_ID: "prism-data-access-server_renderer"
-      INSTALL_DIR: "/var/www/pdas/dev/"
+      INSTANCE_ID: "prism-view-server_renderer"
+      INSTALL_DIR: "/var/www/pvs/dev/"
    deploy:
      replicas: 1
    networks:
@@ -49,7 +49,7 @@ services:
    command:
      ["/wait-for-database.sh", "/run-httpd.sh"]
  cache:
-    image: registry.gitlab.eox.at/esa/prism/vs/pdas_cache:latest
+    image: registry.gitlab.eox.at/esa/prism/vs/pvs_cache:latest
    volumes:
      - type: tmpfs
        target: /tmp
@@ -60,7 +60,7 @@ services:
      - env/emg.env
      - env/emg_obs.env
    environment:
-      INSTANCE_ID: "prism-data-access-server_cache"
+      INSTANCE_ID: "prism-view-server_cache"
      RENDERER_HOST: renderer
    deploy:
      replicas: 1
@@ -69,7 +69,7 @@ services:
    command:
      ["/run-httpd.sh"]
  seeder:
-    image: registry.gitlab.eox.at/esa/prism/vs/pdas_cache:latest
+    image: registry.gitlab.eox.at/esa/prism/vs/pvs_cache:latest
    volumes:
      - type: tmpfs
        target: /tmp
@@ -81,7 +81,7 @@ services:
      - env/emg_obs.env
      - env/emg_redis.env
    environment:
-      INSTANCE_ID: "prism-data-access-server_seeder"
+      INSTANCE_ID: "prism-view-server_seeder"
      RENDERER_HOST: renderer
    deploy:
      replicas: 0
@@ -90,13 +90,13 @@ services:
    command:
      ["/run-seeder.sh"]
  preprocessor:
-    image: registry.gitlab.eox.at/esa/prism/vs/pdas_preprocessor:latest
+    image: registry.gitlab.eox.at/esa/prism/vs/pvs_preprocessor:latest
    env_file:
      - env/emg.env
      - env/emg_obs.env
      - env/emg_redis.env
    environment:
-      INSTANCE_ID: "prism-data-access-server_preprocessor"
+      INSTANCE_ID: "prism-view-server_preprocessor"
    deploy:
      replicas: 1
    networks:
@@ -104,21 +104,21 @@ services:
    command:
      ["/run-preprocessor.sh"]
  registrar:
-    image: registry.gitlab.eox.at/esa/prism/vs/pdas_core:latest
+    image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:latest
    volumes:
      - type: tmpfs
        target: /tmp
      - type: volume
        source: instance-data
-        target: /var/www/pdas
+        target: /var/www/pvs
    env_file:
      - env/emg.env
      - env/emg_db.env
      - env/emg_obs.env
      - env/emg_redis.env
    environment:
-      INSTANCE_ID: "prism-data-access-server_registrar"
-      INSTALL_DIR: "/var/www/pdas/dev/"
+      INSTANCE_ID: "prism-view-server_registrar"
+      INSTALL_DIR: "/var/www/pvs/dev/"
      SCALEFACTOR: "1"
      IN_MEMORY: "false"
    deploy:
@@ -128,7 +128,7 @@ services:
    command:
      ["/wait-for-database.sh", "/run-registrar.sh"]
  # redis-manager:
-  #   image: registry.gitlab.eox.at/esa/prism/vs/pdas_core:latest
+  #   image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:latest
  #   volumes:
  #     - type: tmpfs
  #       target: /tmp
@@ -140,8 +140,8 @@ services:
  #     - env/emg_db.env
  #     - env/emg_redis.env
  #   environment:
-  #     INSTANCE_ID: "prism-data-access-server_redis-manager"
-  #     INSTALL_DIR: "/var/www/pdas/dev/"
+  #     INSTANCE_ID: "prism-view-server_redis-manager"
+  #     INSTALL_DIR: "/var/www/pvs/dev/"
  #     CACHE_DB_PATH: "/cache-db/emg_mapcache_cache.sqlite"
  #   deploy:
  #     replicas: 0
@@ -150,7 +150,7 @@ services:
  #   command:
  #     ["/wait-for-database.sh", "/run-redis-manager.sh"]
  client:
-    image: registry.gitlab.eox.at/esa/prism/vs/pdas_client:latest
+    image: registry.gitlab.eox.at/esa/prism/vs/pvs_client:latest
    deploy:
      replicas: 1
 configs:

--- a/docker-compose.vhr18.ops.yml
+++ b/docker-compose.vhr18.ops.yml
@@ -8,33 +8,33 @@ services:
          size: 536870912
  renderer:
    environment:
-      INSTALL_DIR: "/var/www/pdas/ops/"
+      INSTALL_DIR: "/var/www/pvs/ops/"
    deploy:
      labels:
        # router for basic auth based access (https)
-        - "traefik.http.routers.vhr18-renderer.rule=Host(`vhr18.pdas.prism.eox.at`, `a.vhr18.pdas.prism.eox.at`, `b.vhr18.pdas.prism.eox.at`, `c.vhr18.pdas.prism.eox.at`, `d.vhr18.pdas.prism.eox.at`, `e.vhr18.pdas.prism.eox.at`, `f.vhr18.pdas.prism.eox.at`, `g.vhr18.pdas.prism.eox.at`, `h.vhr18.pdas.prism.eox.at`) && PathPrefix(`/ows`, `/opensearch`, `/admin`)"
+        - "traefik.http.routers.vhr18-renderer.rule=Host(`vhr18.pvs.prism.eox.at`, `a.vhr18.pvs.prism.eox.at`, `b.vhr18.pvs.prism.eox.at`, `c.vhr18.pvs.prism.eox.at`, `d.vhr18.pvs.prism.eox.at`, `e.vhr18.pvs.prism.eox.at`, `f.vhr18.pvs.prism.eox.at`, `g.vhr18.pvs.prism.eox.at`, `h.vhr18.pvs.prism.eox.at`) && PathPrefix(`/ows`, `/opensearch`, `/admin`)"
        - "traefik.http.routers.vhr18-renderer.middlewares=auth@file,compress@file"
        - "traefik.http.routers.vhr18-renderer.tls=true"
        - "traefik.http.routers.vhr18-renderer.tls.certresolver=default"
        - "traefik.http.routers.vhr18-renderer.entrypoints=https"
        # router for basic auth based access (http)
-        - "traefik.http.routers.vhr18-renderer-redirect.rule=Host(`vhr18.pdas.prism.eox.at`, `a.vhr18.pdas.prism.eox.at`, `b.vhr18.pdas.prism.eox.at`, `c.vhr18.pdas.prism.eox.at`, `d.vhr18.pdas.prism.eox.at`, `e.vhr18.pdas.prism.eox.at`, `f.vhr18.pdas.prism.eox.at`, `g.vhr18.pdas.prism.eox.at`, `h.vhr18.pdas.prism.eox.at`) && PathPrefix(`/ows`, `/opensearch`, `/admin`)"
+        - "traefik.http.routers.vhr18-renderer-redirect.rule=Host(`vhr18.pvs.prism.eox.at`, `a.vhr18.pvs.prism.eox.at`, `b.vhr18.pvs.prism.eox.at`, `c.vhr18.pvs.prism.eox.at`, `d.vhr18.pvs.prism.eox.at`, `e.vhr18.pvs.prism.eox.at`, `f.vhr18.pvs.prism.eox.at`, `g.vhr18.pvs.prism.eox.at`, `h.vhr18.pvs.prism.eox.at`) && PathPrefix(`/ows`, `/opensearch`, `/admin`)"
        - "traefik.http.routers.vhr18-renderer-redirect.middlewares=redirect@file"
        - "traefik.http.routers.vhr18-renderer-redirect.entrypoints=http"
        # router for referrer based access (https)
-        - "traefik.http.routers.vhr18-renderer_referer.rule=Host(`vhr18.pdas.prism.eox.at`, `a.vhr18.pdas.prism.eox.at`, `b.vhr18.pdas.prism.eox.at`, `c.vhr18.pdas.prism.eox.at`, `d.vhr18.pdas.prism.eox.at`, `e.vhr18.pdas.prism.eox.at`, `f.vhr18.pdas.prism.eox.at`, `g.vhr18.pdas.prism.eox.at`, `h.vhr18.pdas.prism.eox.at`) && PathPrefix(`/ows`, `/opensearch`, `/admin`) && HeadersRegexp(`Referer`, `(https?://)?(panda.copernicus.eu|panda.cdsv3.eu|panda-demo.ondaprism.eu|vhr18.pdas.prism.eox.at)/?`)"
+        - "traefik.http.routers.vhr18-renderer_referer.rule=Host(`vhr18.pvs.prism.eox.at`, `a.vhr18.pvs.prism.eox.at`, `b.vhr18.pvs.prism.eox.at`, `c.vhr18.pvs.prism.eox.at`, `d.vhr18.pvs.prism.eox.at`, `e.vhr18.pvs.prism.eox.at`, `f.vhr18.pvs.prism.eox.at`, `g.vhr18.pvs.prism.eox.at`, `h.vhr18.pvs.prism.eox.at`) && PathPrefix(`/ows`, `/opensearch`, `/admin`) && HeadersRegexp(`Referer`, `(https?://)?(panda.copernicus.eu|panda.cdsv3.eu|panda-demo.ondaprism.eu|vhr18.pvs.prism.eox.at)/?`)"
        - "traefik.http.routers.vhr18-renderer_referer.middlewares=compress@file"
        - "traefik.http.routers.vhr18-renderer_referer.tls=true"
        - "traefik.http.routers.vhr18-renderer_referer.tls.certresolver=default"
        - "traefik.http.routers.vhr18-renderer_referer.entrypoints=https"
        # router for referrer based access (http)
-        - "traefik.http.routers.vhr18-renderer_referer-redirect.rule=Host(`vhr18.pdas.prism.eox.at`, `a.vhr18.pdas.prism.eox.at`, `b.vhr18.pdas.prism.eox.at`, `c.vhr18.pdas.prism.eox.at`, `d.vhr18.pdas.prism.eox.at`, `e.vhr18.pdas.prism.eox.at`, `f.vhr18.pdas.prism.eox.at`, `g.vhr18.pdas.prism.eox.at`, `h.vhr18.pdas.prism.eox.at`) && PathPrefix(`/ows`, `/opensearch`, `/admin`) && HeadersRegexp(`Referer`, `(https?://)?(panda.copernicus.eu|panda.cdsv3.eu|panda-demo.ondaprism.eu|vhr18.pdas.prism.eox.at)/?`)"
+        - "traefik.http.routers.vhr18-renderer_referer-redirect.rule=Host(`vhr18.pvs.prism.eox.at`, `a.vhr18.pvs.prism.eox.at`, `b.vhr18.pvs.prism.eox.at`, `c.vhr18.pvs.prism.eox.at`, `d.vhr18.pvs.prism.eox.at`, `e.vhr18.pvs.prism.eox.at`, `f.vhr18.pvs.prism.eox.at`, `g.vhr18.pvs.prism.eox.at`, `h.vhr18.pvs.prism.eox.at`) && PathPrefix(`/ows`, `/opensearch`, `/admin`) && HeadersRegexp(`Referer`, `(https?://)?(panda.copernicus.eu|panda.cdsv3.eu|panda-demo.ondaprism.eu|vhr18.pvs.prism.eox.at)/?`)"
        - "traefik.http.routers.vhr18-renderer_referer-redirect.middlewares=redirect@file"
        - "traefik.http.routers.vhr18-renderer_referer-redirect.entrypoints=http"
        # general
        - "traefik.http.services.vhr18-renderer.loadbalancer.sticky=false"
        - "traefik.http.services.vhr18-renderer.loadbalancer.server.port=80"
-        - "traefik.docker.network=pdas_extnet"
+        - "traefik.docker.network=pvs_extnet"
        - "traefik.docker.lbswarm=true"
        - "traefik.enable=true"
      resources:
@@ -50,39 +50,39 @@ services:
      labels:
        - "traefik.http.middlewares.cache-stripprefix.stripprefix.prefixes=/cache"
        # router for basic auth based access (https)
-        - "traefik.http.routers.vhr18-cache.rule=Host(`vhr18.pdas.prism.eox.at`, `a.vhr18.pdas.prism.eox.at`, `b.vhr18.pdas.prism.eox.at`, `c.vhr18.pdas.prism.eox.at`, `d.vhr18.pdas.prism.eox.at`, `e.vhr18.pdas.prism.eox.at`, `f.vhr18.pdas.prism.eox.at`, `g.vhr18.pdas.prism.eox.at`, `h.vhr18.pdas.prism.eox.at`) && PathPrefix(`/cache`)"
+        - "traefik.http.routers.vhr18-cache.rule=Host(`vhr18.pvs.prism.eox.at`, `a.vhr18.pvs.prism.eox.at`, `b.vhr18.pvs.prism.eox.at`, `c.vhr18.pvs.prism.eox.at`, `d.vhr18.pvs.prism.eox.at`, `e.vhr18.pvs.prism.eox.at`, `f.vhr18.pvs.prism.eox.at`, `g.vhr18.pvs.prism.eox.at`, `h.vhr18.pvs.prism.eox.at`) && PathPrefix(`/cache`)"
        - "traefik.http.routers.vhr18-cache.middlewares=auth@file,cache-stripprefix,compress@file"
        - "traefik.http.routers.vhr18-cache.tls=true"
        - "traefik.http.routers.vhr18-cache.tls.certresolver=default"
        - "traefik.http.routers.vhr18-cache.entrypoints=https"
        # router for basic auth based access (http)
-        - "traefik.http.routers.vhr18-cache-redirect.rule=Host(`vhr18.pdas.prism.eox.at`, `a.vhr18.pdas.prism.eox.at`, `b.vhr18.pdas.prism.eox.at`, `c.vhr18.pdas.prism.eox.at`, `d.vhr18.pdas.prism.eox.at`, `e.vhr18.pdas.prism.eox.at`, `f.vhr18.pdas.prism.eox.at`, `g.vhr18.pdas.prism.eox.at`, `h.vhr18.pdas.prism.eox.at`) && PathPrefix(`/cache`)"
+        - "traefik.http.routers.vhr18-cache-redirect.rule=Host(`vhr18.pvs.prism.eox.at`, `a.vhr18.pvs.prism.eox.at`, `b.vhr18.pvs.prism.eox.at`, `c.vhr18.pvs.prism.eox.at`, `d.vhr18.pvs.prism.eox.at`, `e.vhr18.pvs.prism.eox.at`, `f.vhr18.pvs.prism.eox.at`, `g.vhr18.pvs.prism.eox.at`, `h.vhr18.pvs.prism.eox.at`) && PathPrefix(`/cache`)"
        - "traefik.http.routers.vhr18-cache-redirect.middlewares=redirect@file"
        - "traefik.http.routers.vhr18-cache-redirect.entrypoints=http"
        # router for referrer based access (https)
-        - "traefik.http.routers.vhr18-cache_referer.rule=Host(`vhr18.pdas.prism.eox.at`, `a.vhr18.pdas.prism.eox.at`, `b.vhr18.pdas.prism.eox.at`, `c.vhr18.pdas.prism.eox.at`, `d.vhr18.pdas.prism.eox.at`, `e.vhr18.pdas.prism.eox.at`, `f.vhr18.pdas.prism.eox.at`, `g.vhr18.pdas.prism.eox.at`, `h.vhr18.pdas.prism.eox.at`) && PathPrefix(`/cache`) && HeadersRegexp(`Referer`, `(https?://)?(panda.copernicus.eu|panda.cdsv3.eu|panda-demo.ondaprism.eu|vhr18.pdas.prism.eox.at)/?`)"
+        - "traefik.http.routers.vhr18-cache_referer.rule=Host(`vhr18.pvs.prism.eox.at`, `a.vhr18.pvs.prism.eox.at`, `b.vhr18.pvs.prism.eox.at`, `c.vhr18.pvs.prism.eox.at`, `d.vhr18.pvs.prism.eox.at`, `e.vhr18.pvs.prism.eox.at`, `f.vhr18.pvs.prism.eox.at`, `g.vhr18.pvs.prism.eox.at`, `h.vhr18.pvs.prism.eox.at`) && PathPrefix(`/cache`) && HeadersRegexp(`Referer`, `(https?://)?(panda.copernicus.eu|panda.cdsv3.eu|panda-demo.ondaprism.eu|vhr18.pvs.prism.eox.at)/?`)"
        - "traefik.http.routers.vhr18-cache_referer.middlewares=cache-stripprefix,compress@file"
        - "traefik.http.routers.vhr18-cache_referer.tls=true"
        - "traefik.http.routers.vhr18-cache_referer.tls.certresolver=default"
        - "traefik.http.routers.vhr18-cache_referer.entrypoints=https"
        # router for referrer based access (http)
-        - "traefik.http.routers.vhr18-cache_referer-redirect.rule=Host(`vhr18.pdas.prism.eox.at`, `a.vhr18.pdas.prism.eox.at`, `b.vhr18.pdas.prism.eox.at`, `c.vhr18.pdas.prism.eox.at`, `d.vhr18.pdas.prism.eox.at`, `e.vhr18.pdas.prism.eox.at`, `f.vhr18.pdas.prism.eox.at`, `g.vhr18.pdas.prism.eox.at`, `h.vhr18.pdas.prism.eox.at`) && PathPrefix(`/cache`) && HeadersRegexp(`Referer`, `(https?://)?(panda.copernicus.eu|panda.cdsv3.eu|panda-demo.ondaprism.eu|vhr18.pdas.prism.eox.at)/?`)"
+        - "traefik.http.routers.vhr18-cache_referer-redirect.rule=Host(`vhr18.pvs.prism.eox.at`, `a.vhr18.pvs.prism.eox.at`, `b.vhr18.pvs.prism.eox.at`, `c.vhr18.pvs.prism.eox.at`, `d.vhr18.pvs.prism.eox.at`, `e.vhr18.pvs.prism.eox.at`, `f.vhr18.pvs.prism.eox.at`, `g.vhr18.pvs.prism.eox.at`, `h.vhr18.pvs.prism.eox.at`) && PathPrefix(`/cache`) && HeadersRegexp(`Referer`, `(https?://)?(panda.copernicus.eu|panda.cdsv3.eu|panda-demo.ondaprism.eu|vhr18.pvs.prism.eox.at)/?`)"
        - "traefik.http.routers.vhr18-cache_referer-redirect.middlewares=redirect@file"
        - "traefik.http.routers.vhr18-cache_referer-redirect.entrypoints=http"
        # general
        - "traefik.http.services.vhr18-cache.loadbalancer.sticky=false"
        - "traefik.http.services.vhr18-cache.loadbalancer.server.port=80"
-        - "traefik.docker.network=pdas_extnet"
+        - "traefik.docker.network=pvs_extnet"
        - "traefik.docker.lbswarm=true"
        - "traefik.enable=true"
    networks:
      - extnet
  registrar:
    environment:
-      INSTALL_DIR: "/var/www/pdas/ops/"
+      INSTALL_DIR: "/var/www/pvs/ops/"
  # redis-manager:
  #   environment:
-  #     INSTALL_DIR: "/var/www/pdas/ops/"
+  #     INSTALL_DIR: "/var/www/pvs/ops/"
  client:
    configs:
      - source: client-ops
@@ -90,19 +90,19 @@ services:
    deploy:
      labels:
        # router for basic auth based access (https)
-        - "traefik.http.routers.vhr18-client.rule=Host(`vhr18.pdas.prism.eox.at`)"
+        - "traefik.http.routers.vhr18-client.rule=Host(`vhr18.pvs.prism.eox.at`)"
        - "traefik.http.routers.vhr18-client.middlewares=auth@file,compress@file"
        - "traefik.http.routers.vhr18-client.tls=true"
        - "traefik.http.routers.vhr18-client.tls.certresolver=default"
        - "traefik.http.routers.vhr18-client.entrypoints=https"
        # router for basic auth based access (http)
-        - "traefik.http.routers.vhr18-client-redirect.rule=Host(`vhr18.pdas.prism.eox.at`)"
+        - "traefik.http.routers.vhr18-client-redirect.rule=Host(`vhr18.pvs.prism.eox.at`)"
        - "traefik.http.routers.vhr18-client-redirect.middlewares=redirect@file"
        - "traefik.http.routers.vhr18-client-redirect.entrypoints=http"
        # general
        - "traefik.http.services.vhr18-client.loadbalancer.sticky=false"
        - "traefik.http.services.vhr18-client.loadbalancer.server.port=80"
-        - "traefik.docker.network=pdas_extnet"
+        - "traefik.docker.network=pvs_extnet"
        - "traefik.docker.lbswarm=true"
        - "traefik.enable=true"
    networks:

--- a/docker-compose.vhr18.yml
+++ b/docker-compose.vhr18.yml
@@ -8,7 +8,7 @@ services:
      - env/vhr18.env
      - env/vhr18_db.env
    environment:
-      INSTANCE_ID: "prism-data-access-server_database"
+      INSTANCE_ID: "prism-view-server_database"
    deploy:
      placement:
        constraints: [node.role == manager]
@@ -24,7 +24,7 @@ services:
    networks:
      - intnet
  renderer:
-    image: registry.gitlab.eox.at/esa/prism/vs/pdas_core:latest
+    image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:latest
    volumes:
      - type: tmpfs
        target: /tmp
@@ -33,15 +33,15 @@ services:
        target: /cache-db
      - type: volume
        source: instance-data
-        target: /var/www/pdas
+        target: /var/www/pvs
    env_file:
      - env/vhr18.env
      - env/vhr18_db.env
      - env/vhr18_django.env
      - env/vhr18_obs.env
    environment:
-      INSTANCE_ID: "prism-data-access-server_renderer"
-      INSTALL_DIR: "/var/www/pdas/dev/"
+      INSTANCE_ID: "prism-view-server_renderer"
+      INSTALL_DIR: "/var/www/pvs/dev/"
    deploy:
      replicas: 1
    networks:
@@ -49,7 +49,7 @@ services:
    command:
      ["/wait-for-database.sh", "/run-httpd.sh"]
  cache:
-    image: registry.gitlab.eox.at/esa/prism/vs/pdas_cache:latest
+    image: registry.gitlab.eox.at/esa/prism/vs/pvs_cache:latest
    volumes:
      - type: tmpfs
        target: /tmp
@@ -60,7 +60,7 @@ services:
      - env/vhr18.env
      - env/vhr18_obs.env
    environment:
-      INSTANCE_ID: "prism-data-access-server_cache"
+      INSTANCE_ID: "prism-view-server_cache"
      RENDERER_HOST: renderer
    deploy:
      replicas: 1
@@ -69,7 +69,7 @@ services:
    command:
      ["/run-httpd.sh"]
  seeder:
-    image: registry.gitlab.eox.at/esa/prism/vs/pdas_cache:latest
+    image: registry.gitlab.eox.at/esa/prism/vs/pvs_cache:latest
    volumes:
      - type: tmpfs
        target: /tmp
@@ -81,7 +81,7 @@ services:
      - env/vhr18_obs.env
      - env/vhr18_redis.env
    environment:
-      INSTANCE_ID: "prism-data-access-server_seeder"
+      INSTANCE_ID: "prism-view-server_seeder"
      RENDERER_HOST: renderer
    deploy:
      replicas: 0
@@ -90,13 +90,13 @@ services:
    command:
      ["/run-seeder.sh"]
  preprocessor:
-    image: registry.gitlab.eox.at/esa/prism/vs/pdas_preprocessor:latest
+    image: registry.gitlab.eox.at/esa/prism/vs/pvs_preprocessor:latest
    env_file:
      - env/vhr18.env
      - env/vhr18_obs.env
      - env/vhr18_redis.env
    environment:
-      INSTANCE_ID: "prism-data-access-server_preprocessor"
+      INSTANCE_ID: "prism-view-server_preprocessor"
    deploy:
      replicas: 1
    networks:
@@ -104,21 +104,21 @@ services:
    command:
      ["/run-preprocessor.sh"]
  registrar:
-    image: registry.gitlab.eox.at/esa/prism/vs/pdas_core:latest
+    image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:latest
    volumes:
      - type: tmpfs
        target: /tmp
      - type: volume
        source: instance-data
-        target: /var/www/pdas
+        target: /var/www/pvs
    env_file:
      - env/vhr18.env
      - env/vhr18_db.env
      - env/vhr18_obs.env
      - env/vhr18_redis.env
    environment:
-      INSTANCE_ID: "prism-data-access-server_registrar"
-      INSTALL_DIR: "/var/www/pdas/dev/"
+      INSTANCE_ID: "prism-view-server_registrar"
+      INSTALL_DIR: "/var/www/pvs/dev/"
      SCALEFACTOR: "1"
      IN_MEMORY: "false"
    deploy:
@@ -128,7 +128,7 @@ services:
    command:
      ["/wait-for-database.sh", "/run-registrar.sh"]
  # redis-manager:
-  #   image: registry.gitlab.eox.at/esa/prism/vs/pdas_core:latest
+  #   image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:latest
  #   volumes:
  #     - type: tmpfs
  #       target: /tmp
@@ -140,8 +140,8 @@ services:
  #     - env/vhr18_db.env
  #     - env/vhr18_redis.env
  #   environment:
-  #     INSTANCE_ID: "prism-data-access-server_redis-manager"
-  #     INSTALL_DIR: "/var/www/pdas/dev/"
+  #     INSTANCE_ID: "prism-view-server_redis-manager"
+  #     INSTALL_DIR: "/var/www/pvs/dev/"
  #     CACHE_DB_PATH: "/cache-db/vhr18_mapcache_cache.sqlite"
  #   deploy:
  #     replicas: 0
@@ -150,7 +150,7 @@ services:
  #   command:
  #     ["/wait-for-database.sh", "/run-redis-manager.sh"]
  client:
-    image: registry.gitlab.eox.at/esa/prism/vs/pdas_client:latest
+    image: registry.gitlab.eox.at/esa/prism/vs/pvs_client:latest
    deploy:
      replicas: 1
 configs:

--- a/preprocessor/Dockerfile
+++ b/preprocessor/Dockerfile
 #------------------------------------------------------------------------------
 #
-# Project: prism data access server
+# Project: prism view server
 # Authors: Stephan Meissl <stephan.meissl@eox.at>
 #
 #------------------------------------------------------------------------------
@@ -27,10 +27,10 @@

 FROM osgeo/gdal:alpine-normal-latest
 MAINTAINER EOX
-LABEL name="prism data access server preprocessor" \
+LABEL name="prism view server preprocessor" \
      vendor="EOX IT Services GmbH <https://eox.at>" \
      license="MIT Copyright (C) 2019 EOX IT Services GmbH <https://eox.at>" \
-      type="prism data access server preprocessor" \
+      type="prism view server preprocessor" \
      version="0.0.1-dev"

 USER root