Skip to content

Commit

Permalink
add new variable for piplines to pass
Browse files Browse the repository at this point in the history
  • Loading branch information
sszafGCA committed Oct 17, 2023
1 parent 26fae15 commit 4796336
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 3 deletions.
2 changes: 1 addition & 1 deletion apps/server/src/shared/infra/mail/mail.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export class MailService {
if (mails === undefined) {
return mails;
}
const domainBlockList = Configuration.get('ADDITIONAL_BLACKLISTED_EMAIL_DOMAINS') as string;
const domainBlockList = Configuration.get('BLACKLIST_OF_EMAIL_DOMAINS') as string;
const domainBlockListArray = domainBlockList.split(',').map((domain) => domain.trim());
const notBlacklistedEmailsArray: string[] = [];

Expand Down
6 changes: 5 additions & 1 deletion config/default.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,6 @@
},
"ADDITIONAL_BLACKLISTED_EMAIL_DOMAINS": {
"type": "string",
"default":"schul-cloud.org",
"description": "Add custom domain to the list of blocked domains (comma separated list)."
},
"FEATURE_TSP_AUTO_CONSENT_ENABLED": {
Expand Down Expand Up @@ -1010,6 +1009,11 @@
"default": "mail-drop",
"description": "Routing key name for mail sending"
},
"BLACKLIST_OF_EMAIL_DOMAINS": {
"type": "string",
"default":"schul-cloud.org",
"description": "Add domain to the list of blocked domains (comma separated list)."
},
"MEMORY_INTERVAL_TIME": {
"type": "integer",
"default": 0,
Expand Down
3 changes: 2 additions & 1 deletion config/development.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,5 +70,6 @@
"FEATURE_COLUMN_BOARD_SUBMISSIONS_ENABLED": true,
"FEATURE_COLUMN_BOARD_LINK_ELEMENT_ENABLED": true,
"FEATURE_COLUMN_BOARD_EXTERNAL_TOOLS_ENABLED": true,
"ADDITIONAL_BLACKLISTED_EMAIL_DOMAINS": "schul-cloud.org"
"BLACKLIST_OF_EMAIL_DOMAINS": "schul-cloud.org"

}

0 comments on commit 4796336

Please sign in to comment.