diff --git a/cache/configure.sh b/cache/configure.sh
index 3e478fe9059ea52c03c3b0b0a5edd3224fd2917a..6a475a8b9661e686f20edebef60656300c5aa206 100755
--- a/cache/configure.sh
+++ b/cache/configure.sh
@@ -87,14 +87,14 @@ 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 View Service (PVS) - Cache</title>
+ <title>PRISM View Server (PVS) - Cache</title>
</head>
<body>
- <h1>PRISM View Service (PVS) - Cache Test Page<br><font size="-1">
+ <h1>PRISM View Server (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 View Server (PVS)
cache after it has been installed. If you can read
- this page it means that the PRISM View Service (PVS) cache
+ this page it means that the PRISM View Server (PVS) cache
installed at this site is working properly.</p>
<p>Links to services:</p>
<ul>
diff --git a/cache/mapcache-template.xml b/cache/mapcache-template.xml
index b5fba92d1793df5b13a879ad9234fe41c8c482db..d575c7d5d05745c219c113b98cd7799fbba89f11 100644
--- a/cache/mapcache-template.xml
+++ b/cache/mapcache-template.xml
@@ -25,9 +25,9 @@
</service>
<service type="wmts" enabled="true"/>
<metadata>
- <title>PRISM Data Access Service (PASS) developed by EOX</title>
- <abstract>PRISM Data Access Service (PASS) developed by EOX</abstract>
- <keyword>view service</keyword>
+ <title>PRISM View Server (PVS) developed by EOX</title>
+ <abstract>PRISM View Server (PVS) developed by EOX</abstract>
+ <keyword>View Server</keyword>
<accessconstraints>UNKNOWN</accessconstraints>
<fees>UNKNOWN</fees>
<contactname>Stephan Meissl</contactname>
diff --git a/client/html/index.html b/client/html/index.html
index cc0385b4b2846082ba3d207482741c1b39f9e597..4c6afa7abd1bfb2a560f3c38921d8eaa6b3d5993 100644
--- 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 View Service</title>
+ <title>PRISM View Server</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 View Service (PVS) Client powered by
+ color: #006699;">PRISM View Server (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>
diff --git a/config/dem_index-dev.html b/config/dem_index-dev.html
index 0910272d712bbf487d5ca41fe1ec7ebb8a1798d1..cfe60b1abd446a2e9ca6456cbaa639287da5e201 100644
--- a/config/dem_index-dev.html
+++ b/config/dem_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 View Service</title>
+ <title>PRISM View Server</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 View Service (PVS) Client powered by
+ color: #006699;">PRISM View Server (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>
diff --git a/config/dem_index-ops.html b/config/dem_index-ops.html
index 5951e5d05f54e5dcb50029b779b7b2ad870eb068..f704d7321c63a66744abeda59d2c576024654f5f 100644
--- a/config/dem_index-ops.html
+++ b/config/dem_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 View Service</title>
+ <title>PRISM View Server</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 View Service (PVS) Client powered by
+ color: #006699;">PRISM View Server (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>
diff --git a/config/emg_index-dev.html b/config/emg_index-dev.html
index 77f2e062aa561562839f79404b8f0f3e5cc83268..823d9aaa9399e4d0383ddf253648430e3ecc2633 100644
--- 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 View Service</title>
+ <title>PRISM View Server</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 View Service (PVS) Client powered by
+ color: #006699;">PRISM View Server (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>
diff --git a/config/emg_index-ops.html b/config/emg_index-ops.html
index 35751e0543e725987d654c88cc07c2374380dcab..d53feee51897b8140659d17d89a3df538a5b746a 100644
--- 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 View Service</title>
+ <title>PRISM View Server</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 View Service (PVS) Client powered by
+ color: #006699;">PRISM View Server (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>
diff --git a/config/emg_mapcache-dev.xml b/config/emg_mapcache-dev.xml
index a94d9fd48306fd8579b87714005c5d3c7d6428bf..76a1a714dae9015aaf213c62dde98e68f354464d 100644
--- a/config/emg_mapcache-dev.xml
+++ b/config/emg_mapcache-dev.xml
@@ -19,9 +19,9 @@
</service>
<service type="wmts" enabled="true"/>
<metadata>
- <title>PRISM Data Access Service (PASS) developed by EOX</title>
- <abstract>PRISM Data Access Service (PASS) developed by EOX</abstract>
- <keyword>view service</keyword>
+ <title>PRISM View Server (PVS) developed by EOX</title>
+ <abstract>PRISM View Server (PVS) developed by EOX</abstract>
+ <keyword>View Server</keyword>
<accessconstraints>UNKNOWN</accessconstraints>
<fees>UNKNOWN</fees>
<contactname>Stephan Meissl</contactname>
diff --git a/config/emg_mapcache-ops.xml b/config/emg_mapcache-ops.xml
index 02cc2f8e2d6d42cf658402e12d1cca6b73abbfa3..9888c3d669dd2dec7ef0c5fd406abcda34c6574c 100644
--- a/config/emg_mapcache-ops.xml
+++ b/config/emg_mapcache-ops.xml
@@ -19,10 +19,10 @@
</service>
<service type="wmts" enabled="true"/>
<metadata>
- <title>PRISM Data Access Service (PASS) developed by EOX</title>
- <abstract>PRISM Data Access Service (PASS) developed by EOX</abstract>
+ <title>PRISM View Server (PVS) developed by EOX</title>
+ <abstract>PRISM View Server (PVS) developed by EOX</abstract>
<url>https://emg.pvs.prism.eox.at/cache/ows</url>
- <keyword>view service</keyword>
+ <keyword>View Server</keyword>
<accessconstraints>UNKNOWN</accessconstraints>
<fees>UNKNOWN</fees>
<contactname>Stephan Meissl</contactname>
diff --git a/config/vhr18_index-dev.html b/config/vhr18_index-dev.html
index a82c5f25b611e2917cea7496023e9adfc157f5a8..8f76a18e61173acfcba64bf65c6b04759243b46a 100644
--- 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 View Service</title>
+ <title>PRISM View Server</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 View Service (PVS) Client powered by
+ color: #006699;">PRISM View Server (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>
diff --git a/config/vhr18_index-ops.html b/config/vhr18_index-ops.html
index 40ca29025aa8b5b40ed1ff75cbd898323898b3be..aeffffb3b6b1be47e0dc4f6b18dfeead803dadec 100644
--- a/config/vhr18_index-ops.html
+++ b/config/vhr18_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 View Service</title>
+ <title>PRISM View Server</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 View Service (PVS) Client powered by
+ color: #006699;">PRISM View Server (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>
diff --git a/config/vhr18_mapcache-dev.xml b/config/vhr18_mapcache-dev.xml
index 50e0ddfe45ce224f72c2ceaab74e4eeb19b8f55f..61d4394fa3dcc41e3d3be54b8189c9eeaf40c4ab 100644
--- a/config/vhr18_mapcache-dev.xml
+++ b/config/vhr18_mapcache-dev.xml
@@ -19,9 +19,9 @@
</service>
<service type="wmts" enabled="true"/>
<metadata>
- <title>PRISM Data Access Service (PASS) developed by EOX</title>
- <abstract>PRISM Data Access Service (PASS) developed by EOX</abstract>
- <keyword>view service</keyword>
+ <title>PRISM View Server (PVS) developed by EOX</title>
+ <abstract>PRISM View Server (PVS) developed by EOX</abstract>
+ <keyword>View Server</keyword>
<accessconstraints>UNKNOWN</accessconstraints>
<fees>UNKNOWN</fees>
<contactname>Stephan Meissl</contactname>
diff --git a/config/vhr18_mapcache-ops.xml b/config/vhr18_mapcache-ops.xml
index 688a57ade03e2e7820f415e0ba1366964221a5da..0a26a68f70bc0dfa8ba120e1188983c69ded1172 100644
--- a/config/vhr18_mapcache-ops.xml
+++ b/config/vhr18_mapcache-ops.xml
@@ -19,10 +19,10 @@
</service>
<service type="wmts" enabled="true"/>
<metadata>
- <title>PRISM Data Access Service (PASS) developed by EOX</title>
- <abstract>PRISM Data Access Service (PASS) developed by EOX</abstract>
+ <title>PRISM View Server (PVS) developed by EOX</title>
+ <abstract>PRISM View Server (PVS) developed by EOX</abstract>
<url>https://vhr18.pvs.prism.eox.at/cache/ows</url>
- <keyword>view service</keyword>
+ <keyword>View Server</keyword>
<accessconstraints>UNKNOWN</accessconstraints>
<fees>UNKNOWN</fees>
<contactname>Stephan Meissl</contactname>
diff --git a/traefik-dynamic.yml b/traefik-dynamic.yml
index 1d01c8632d83dfc635224113ac98a12b5927c06e..c74442564a3f281cb0c528b4a55dd4f7bc1bc43e 100644
--- a/traefik-dynamic.yml
+++ b/traefik-dynamic.yml
@@ -12,12 +12,12 @@ http:
middlewares:
apiauth:
basicAuth:
- realm: "PRISM View Service (PVS)"
+ realm: "PRISM View Server (PVS)"
users:
- "***REMOVED***"
auth:
basicAuth:
- realm: "PRISM View Service (PVS)"
+ realm: "PRISM View Server (PVS)"
users:
- "***REMOVED***"
compress: