From a5771ecd997b013a6efc37e2590d51a62faac599 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= <valtri@civ.zcu.cz>
Date: Fri, 1 Nov 2024 07:56:11 +0000
Subject: [PATCH] Tune access and welcome page on ENVRI-Hub

---
 envri-hub/deployments/envri-hub.yaml             |  2 ++
 .../deployments/envri-templates/egi-login.html   | 16 ++++------------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/envri-hub/deployments/envri-hub.yaml b/envri-hub/deployments/envri-hub.yaml
index 7d653e4..c838cf3 100644
--- a/envri-hub/deployments/envri-hub.yaml
+++ b/envri-hub/deployments/envri-hub.yaml
@@ -70,6 +70,8 @@ hub:
         - 52cc7599bd1553c9d63e34e4c90b7e84d44967490c28bb4c53fe97b0c881d677@egi.eu
       allowed_groups:
         - urn:mace:egi.eu:group:envri-hub-next-all#sso.egi.eu
+        - urn:mace:egi.eu:group:vo.envrihub.eu:role=member#aai.egi.eu
+        - urn:mace:egi.eu:group:envri-vre:role=member#aai.egi.eu
       claim_groups_key: "eduperson_entitlement"
     EGICheckinAuthenticator:
       checkin_host: "{{ secrets['checkin_host']}}"
diff --git a/envri-hub/deployments/envri-templates/egi-login.html b/envri-hub/deployments/envri-templates/egi-login.html
index aeaf116..82e4765 100644
--- a/envri-hub/deployments/envri-templates/egi-login.html
+++ b/envri-hub/deployments/envri-templates/egi-login.html
@@ -28,8 +28,8 @@
     </p>
     <p>
     Access requires a valid <a href="https://docs.egi.eu/users/check-in/signup">EGI account</a>
-    and <a href="https://aai.egi.eu/registry/co_petitions/start/coef:111">enrolling to the
-    vo.notebooks.egi.eu VO</a>.
+    and <a href="https://aai.egi.eu/registry/co_petitions/start/coef:671">enrolling to the
+    envri-vre:members VO</a>.
     </p>
     {% endblock main_intro %}
     {% block checkin_button %}
@@ -41,14 +41,6 @@
     </p>
     <div class="spacer-sm"></div>
     {% endblock checkin_button %}
-    {% block main_outro %}
-    <p>
-    User communities/advanced users can have their customised ENVRI-Hub VRE service
-    instance. ENVRI-Hub NEXT offers consultancy and support, as well as can operate the setup.
-    Order a <a href="https://marketplace.eosc-portal.eu/services/egi-notebooks">community
-    notebooks instance via the EOSC Marketplace</a>.
-    </p>
-    {% endblock main_outro %}
 </div>
 
 </div>
@@ -76,8 +68,8 @@
         co-funded by <a href="https://www.egi.eu/projects/egi-ace/">EGI-ACE</a>.
       </div>
       <div class="col-sm-4 text-right">
-        <a href="/policies/privacy-policy.html">Privacy Notice</a> |
-        <a href="/policies/terms-of-use.html">Terms of Use</a>
+        <a href="https://notebooks.egi.eu/policies/privacy-policy.html">Privacy Notice</a> |
+        <a href="https://notebooks.egi.eu/policies/terms-of-use.html">Terms of Use</a>
       </div>
     </div>
   </div>
-- 
GitLab