From cd4aeb166c2c93f944b4ac0788cc6d223a2b8dbc Mon Sep 17 00:00:00 2001 From: Milson Munakami Date: Wed, 27 Mar 2024 18:56:47 -0400 Subject: [PATCH] updated email templates and also url to renew projects/allocations --- k8s/overlays/prod/configmap.yaml | 2 +- k8s/overlays/staging/configmap.yaml | 2 +- src/email/allocation_activated.txt | 3 +++ src/email/allocation_change_approved.txt | 3 +++ src/email/allocation_change_denied.txt | 3 +++ src/email/allocation_denied.txt | 3 +++ src/email/allocation_expired.txt | 5 ++++- src/email/allocation_expiring.txt | 3 +++ 8 files changed, 21 insertions(+), 3 deletions(-) diff --git a/k8s/overlays/prod/configmap.yaml b/k8s/overlays/prod/configmap.yaml index de707b7..bcd2c50 100644 --- a/k8s/overlays/prod/configmap.yaml +++ b/k8s/overlays/prod/configmap.yaml @@ -23,7 +23,7 @@ data: CENTER_NAME: "New England Research Cloud" CENTER_BASE_URL: "https://coldfront.mss.mghpcc.org" CENTER_HELP_URL: "https://nerc.mghpcc.org/user-guides/" - CENTER_PROJECT_RENEWAL_HELP_URL: "https://nerc.mghpcc.org/user-guides/" + CENTER_PROJECT_RENEWAL_HELP_URL: "https://nerc-project.github.io/nerc-docs/get-started/allocation/project-and-allocation-review/" ACCOUNT_CREATION_TEXT: > Any faculty, staff, student, or external collaborator must request an user account through the MGHPCC Shared Services (MGHPCC-SS) Account Portal. For more information, please see the user guides. EMAIL_ENABLED: 'True' diff --git a/k8s/overlays/staging/configmap.yaml b/k8s/overlays/staging/configmap.yaml index 09e6c1d..4ce21a6 100644 --- a/k8s/overlays/staging/configmap.yaml +++ b/k8s/overlays/staging/configmap.yaml @@ -23,7 +23,7 @@ data: CENTER_NAME: "New England Research Cloud" CENTER_BASE_URL: "https://coldfront-staging.mss.mghpcc.org" CENTER_HELP_URL: "https://nerc.mghpcc.org/user-guides/" - CENTER_PROJECT_RENEWAL_HELP_URL: "https://nerc.mghpcc.org/user-guides/" + CENTER_PROJECT_RENEWAL_HELP_URL: "https://nerc-project.github.io/nerc-docs/get-started/allocation/project-and-allocation-review/" ACCOUNT_CREATION_TEXT: > Any faculty, staff, student, or external collaborator must request an user account through the MGHPCC Shared Services (MGHPCC-SS) Account Portal. For more information, please see the user guides. EMAIL_ENABLED: 'True' diff --git a/src/email/allocation_activated.txt b/src/email/allocation_activated.txt index bbcf374..86c31e5 100644 --- a/src/email/allocation_activated.txt +++ b/src/email/allocation_activated.txt @@ -4,5 +4,8 @@ Your allocation request for {{resource}} has been activated. You now have access To view your allocations information, please go to {{url}} +If you are a student or collaborator under this project, you are receiving this +notice as a courtesy. + Thank you, {{signature}} diff --git a/src/email/allocation_change_approved.txt b/src/email/allocation_change_approved.txt index bed7e5f..30509f5 100644 --- a/src/email/allocation_change_approved.txt +++ b/src/email/allocation_change_approved.txt @@ -4,5 +4,8 @@ Your allocation change request for {{resource}} has been approved. The requested To view your allocation's information, please go to {{url}} +If you are a student or collaborator under this project, you are receiving this +notice as a courtesy. + Thank you, {{signature}} diff --git a/src/email/allocation_change_denied.txt b/src/email/allocation_change_denied.txt index e4939e2..c97fbd2 100644 --- a/src/email/allocation_change_denied.txt +++ b/src/email/allocation_change_denied.txt @@ -4,5 +4,8 @@ Your allocation change request for {{resource}} has been denied. Please login to view a message from the system administrators pertaining to your allocation change request: {{url}} +If you are a student or collaborator under this project, you are receiving this +notice as a courtesy. + Thank you, {{signature}} diff --git a/src/email/allocation_denied.txt b/src/email/allocation_denied.txt index f212ebd..72e2c80 100644 --- a/src/email/allocation_denied.txt +++ b/src/email/allocation_denied.txt @@ -4,5 +4,8 @@ Your allocation request for {{resource}} has been denied. Please login to view a message from the system administrators: {{url}} +If you are a student or collaborator under this project, you are receiving this +notice as a courtesy. + Thank you, {{signature}} diff --git a/src/email/allocation_expired.txt b/src/email/allocation_expired.txt index 7ddc8e8..5c15cb1 100644 --- a/src/email/allocation_expired.txt +++ b/src/email/allocation_expired.txt @@ -1,6 +1,6 @@ Dear {{center_name}} user, -Your access to {{center_name}} resources has expired. Any accounts under these allocation(s) are now unable to +Your access to {{center_name}}'s resources has expired. Any accounts under these allocation(s) are now unable to access the associated resource. If you wish to continue using them, the group owners responsible for the following project(s) must create a new allocation request(s). Below is a list of links to your project(s) containing at least one expired allocation: {% for project_key, project_url in project_dict.items %} @@ -15,5 +15,8 @@ The group owner responsible for this project is required to renew it on a yearly last year, you will be required to before requesting a new allocation. For more information about the yearly renewal, visit our knowledge base: {{ project_renewal_help_url }}. +If you are a student or collaborator under this project, you are receiving this +notice as a courtesy. + Thank you, {{ signature }} diff --git a/src/email/allocation_expiring.txt b/src/email/allocation_expiring.txt index ce7fe31..992f1f8 100644 --- a/src/email/allocation_expiring.txt +++ b/src/email/allocation_expiring.txt @@ -17,5 +17,8 @@ The group owner responsible for this project is required to renew it on a yearly last year, you will be required to before renewing the allocation. For more information about the yearly renewal, visit our knowledge base: {{ project_renewal_help_url }} +If you are a student or collaborator under this project, you are receiving this +notice as a courtesy. + Thank you, {{ signature }}