diff --git a/assets/src/bundles/add_forge/forge-admin-email.ejs b/assets/src/bundles/add_forge/forge-admin-email.ejs --- a/assets/src/bundles/add_forge/forge-admin-email.ejs +++ b/assets/src/bundles/add_forge/forge-admin-email.ejs @@ -18,10 +18,14 @@ pull the public repositories it contains and clone them into the Software Heritage archive. -Would you be so kind as to reply to this message to acknowledge the -reception of this email and let us know if there are any special steps -we should take in order to properly archive the public repositories -hosted on your infrastructure? +Please let us know if there are any technical issues to consider before + we launch the archival of the public repositories hosted on your + infrastructure.(use "Reply all" to ensure our system will process + your answer properly) + +In the absence of an answer to this message, we will start to archive +your forge in the coming weeks (only the publicly accessible +repositories will be archived) Thank you in advance for your help. diff --git a/assets/src/bundles/add_forge/request-dashboard.js b/assets/src/bundles/add_forge/request-dashboard.js --- a/assets/src/bundles/add_forge/request-dashboard.js +++ b/assets/src/bundles/add_forge/request-dashboard.js @@ -58,7 +58,7 @@ // Setting data for the email, now adding static data $('#contactForgeAdmin').attr('emailTo', forgeRequest.forge_contact_email); $('#contactForgeAdmin').attr('emailCc', forgeRequest.inbound_email_address); - $('#contactForgeAdmin').attr('emailSubject', `Software Heritage archival request for ${forgeRequest.forge_domain}`); + $('#contactForgeAdmin').attr('emailSubject', `Software Heritage archival notification for ${forgeRequest.forge_domain}`); populateRequestHistory(data.history); populateDecisionSelectOption(forgeRequest.status); } catch (e) { diff --git a/cypress/e2e/add-forge-now-request-dashboard.cy.js b/cypress/e2e/add-forge-now-request-dashboard.cy.js --- a/cypress/e2e/add-forge-now-request-dashboard.cy.js +++ b/cypress/e2e/add-forge-now-request-dashboard.cy.js @@ -51,7 +51,7 @@ To: ${requestData.forge_contact_email} Cc: ${requestInboundEmailAddress} Reply-To: ${requestInboundEmailAddress} -Subject: Software Heritage archival request for test.example.com +Subject: Software Heritage archival notification for test.example.com Content-Language: en-US From: Test Admin Content-Type: text/plain; charset=UTF-8; format=flowed @@ -59,21 +59,26 @@ Dear forge administrator, -The mission of Software Heritage is to collect, preserve and share all the -publicly available source code (see https://www.softwareheritage.org for more -information). +The mission of Software Heritage is to collect, preserve and share all +the publicly available source code (see +https://www.softwareheritage.org for more information). -We just received a request to add the forge hosted at https://test.example.com to the -list of software origins that are archived, and it is our understanding that you -are the contact person for this forge. +We just received a request to add the forge hosted at <%= forgeUrl %> +to the list of software origins that are archived, and it is our +understanding that you are the contact person for this forge. -In order to archive the forge contents, we will have to periodically pull the -public repositories it contains and clone them into the +In order to archive the forge contents, we will have to periodically +pull the public repositories it contains and clone them into the Software Heritage archive. -Would you be so kind as to reply to this message to acknowledge the reception -of this email and let us know if there are any special steps we should take in -order to properly archive the public repositories hosted on your infrastructure? +Please let us know if there are any technical issues to consider before + we launch the archival of the public repositories hosted on your + infrastructure.(use "Reply all" to ensure our system will process + your answer properly) + +In the absence of an answer to this message, we will start to archive +your forge in the coming weeks (only the publicly accessible +repositories will be archived) Thank you in advance for your help. @@ -135,7 +140,7 @@ cy.get('#contactForgeAdmin') .should('have.attr', 'emailsubject') - .and('include', `Software Heritage archival request for ${requestForgeDomain}`); + .and('include', `Software Heritage archival notification for ${requestForgeDomain}`); }); it('should not show any error message', function() {