Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

AV-2004: Send copies of organization approvals to admins #2067

Merged
merged 2 commits into from
Oct 9, 2023
+8 −2
Merged

AV-2004: Send copies of organization approvals to admins #2067

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
feded5b
AV-2004: Send copies of organization approvals to admins
bzar Oct 4, 2023
31142ef
AV-2004: Read organization approval email address list from a variable
bzar Oct 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions cdk/lib/ckan-stack.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@ export class CkanStack extends Stack {
parameterName: `/${props.environment}/opendata/ckan/harvester_instruction_url`,
});

const pCkanOrganizationapprovalEmail = ssm.StringParameter.fromStringParameterAttributes(this, 'pCkanOrganizationapprovalEmail', {
parameterName: `/${props.environment}/opendata/ckan/organizationapproval_email`,
});

bzar marked this conversation as resolved.
Show resolved Hide resolved
const host = props.databaseInstance.instanceEndpoint;

const datastoreHost = props.datastoreInstance.instanceEndpoint;
Expand Down Expand Up @@ -258,6 +262,7 @@ export class CkanStack extends Stack {
SENTRY_ENV: props.environment,
CKAN_SYSADMIN_NAME: pSysadminUser.stringValue,
CKAN_SYSADMIN_EMAIL: pSysadminEmail.stringValue,
ORGANIZATIONAPPROVAL_EMAIL: pCkanOrganizationapprovalEmail.stringValue,
// fuseki
FUSEKI_HOST: `fuseki.${props.namespace.namespaceName}`,
FUSEKI_PORT: '3030',
Expand Down
2 changes: 1 addition & 1 deletion ckan/templates/production.ini.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ ckan.harvest.mq.hostname = {{ environ('REDIS_HOST') }}
ckan.harvest.mq.port = {{ environ('REDIS_PORT') }}
ckan.harvest.mq.redis_db = {{ environ('REDIS_DB') }}

ckanext.organizationapproval.admin_email = {{ environ('SYSADMIN_EMAIL') }}, [email protected]
ckanext.organizationapproval.admin_email = {{ environ('ORGANIZATIONAPPROVAL_EMAIL') }}
ckanext.ytp_request.admin_email = {{ environ('SYSADMIN_EMAIL') }}

ckanext-archiver.archive_dir = {{ environ('CKAN_ARCHIVER_PATH') }}
Expand Down
1 change: 1 addition & 0 deletions docker/.env.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ SOLR_PATH=solr/ckan
# ckan
CKAN_HOST=ckan
CKAN_PORT=5000
ORGANIZATIONAPPROVAL_EMAIL=admin@localhost

# datapusher
DATAPUSHER_HOST=datapusher
Expand Down
Loading