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

Jump to bottom

F/opc 737 thumbnail email #281

Open
wants to merge 2 commits into
base: oc-master
Choose a base branch
from
Open

F/opc 737 thumbnail email #281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
857327d
f/OPC-737-thumbnail-email
Sep 8, 2022
f589727
Added production_management_email to config
Sep 13, 2022
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
3 changes: 2 additions & 1 deletion libraries/default.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -902,12 +902,13 @@ def install_init_scripts(current_deploy_root, opencast_repo_root)
end
end

def install_multitenancy_config(current_deploy_root, admin_hostname, admin_protocol, engage_hostname, engage_protocol)
def install_multitenancy_config(current_deploy_root, admin_hostname, admin_protocol, engage_hostname, engage_protocol, production_management_email)
template %Q|#{current_deploy_root}/etc/org.opencastproject.organization-mh_default_org.cfg| do
source 'org.opencastproject.organization-mh_default_org.cfg.erb'
owner 'opencast'
group 'opencast'
variables({
production_management_email: production_management_email,
hostname: admin_hostname,
admin_hostname: admin_hostname,
admin_protocol: admin_protocol,
Expand Down
7 changes: 5 additions & 2 deletions recipes/deploy-admin.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,11 @@
rest_auth_info = get_rest_auth_info
admin_user_info = get_admin_user_info
stack_name = stack_shortname

using_local_distribution = is_using_local_distribution?

# OPC-737 Admin UI thumbnail mailto
production_management_email= node.fetch(:production_management_email, '')

# S3 file archive service
region = node.fetch(:region, 'us-east-1')
s3_file_archive_bucket_name = get_s3_file_archive_bucket_name
Expand Down Expand Up @@ -146,7 +148,7 @@
install_init_scripts(most_recent_deploy, opencast_repo_root)
install_opencast_log_configuration(most_recent_deploy)
install_opencast_log_management
install_multitenancy_config(most_recent_deploy, public_admin_hostname, public_admin_protocol, public_engage_hostname, public_engage_protocol)
install_multitenancy_config(most_recent_deploy, public_admin_hostname, public_admin_protocol, public_engage_hostname, public_engage_protocol, production_management_email)

install_elasticsearch_index_config(most_recent_deploy, stack_name)
install_smtp_config(most_recent_deploy)
Expand Down Expand Up @@ -208,6 +210,7 @@
stack_name: stack_name,
workspace_cleanup_period: 86400,
activemq_bind_host: activemq_bind_host,
production_management_email: production_management_email,
distribution_type: distribution
karendolan marked this conversation as resolved.
Show resolved Hide resolved
})
end
Expand Down
5 changes: 4 additions & 1 deletion recipes/deploy-all-in-one.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,9 @@
helix_sheet_id = helix_googlesheets_config[:helix_sheet_id]
helix_email_enabled = helix_googlesheets_config[:change_notification_email_enabled]

# OPC-737 Admin UI thumbnail mailto
production_management_email= node.fetch(:production_management_email, '')

capture_agent_monitor_url = node.fetch(
:capture_agent_monitor_url, 'http://example.com/monitor_url'
)
Expand Down Expand Up @@ -169,7 +172,7 @@
install_init_scripts(most_recent_deploy, opencast_repo_root)
install_opencast_log_configuration(most_recent_deploy)
install_opencast_log_management
install_multitenancy_config(most_recent_deploy, public_hostname, public_hostname, public_engage_protocol)
install_multitenancy_config(most_recent_deploy, public_hostname, public_hostname, public_engage_protocol, production_management_email)
install_smtp_config(most_recent_deploy)
install_default_tenant_config(most_recent_deploy)
install_auth_service(
Expand Down
5 changes: 4 additions & 1 deletion recipes/deploy-engage.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,9 @@
s3_distribution_bucket_name = get_s3_distribution_bucket_name
s3_distribution_base_url=get_base_media_download_url(public_engage_hostname)

# OPC-737 Admin UI thumbnail mailto
production_management_email= node.fetch(:production_management_email, '')

# Configuration for searching transcripts
search_content_index_url = node.fetch(:transcript_search_endpoint, '')
search_content_lambda_name = node.fetch(:transcript_index_function, '')
Expand Down Expand Up @@ -138,7 +141,7 @@
install_init_scripts(most_recent_deploy, opencast_repo_root)
install_opencast_log_configuration(most_recent_deploy)
install_opencast_log_management
install_multitenancy_config(most_recent_deploy, public_admin_hostname, public_admin_protocol, public_engage_hostname, public_engage_protocol)
install_multitenancy_config(most_recent_deploy, public_admin_hostname, public_admin_protocol, public_engage_hostname, public_engage_protocol, production_management_email)
# remove_felix_fileinstall(most_recent_deploy)
install_smtp_config(most_recent_deploy)

Expand Down
5 changes: 4 additions & 1 deletion recipes/deploy-worker.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@
nodename = node[:opsworks][:instance][:hostname]
private_admin_hostname = get_private_admin_hostname

# OPC-737 Admin UI thumbnail mailto
production_management_email= node.fetch(:production_management_email, '')

activemq_bind_host = private_admin_hostname

database_connection = get_database_connection
Expand Down Expand Up @@ -81,7 +84,7 @@
install_init_scripts(most_recent_deploy, opencast_repo_root)
install_opencast_log_configuration(most_recent_deploy)
install_opencast_log_management
install_multitenancy_config(most_recent_deploy, public_admin_hostname, public_admin_protocol, public_engage_hostname, public_engage_protocol)
install_multitenancy_config(most_recent_deploy, public_admin_hostname, public_admin_protocol, public_engage_hostname, public_engage_protocol, production_management_email)
# remove_felix_fileinstall(most_recent_deploy)
# install_smtp_config(most_recent_deploy)
if ldap_enabled
Expand Down
5 changes: 5 additions & 0 deletions templates/default/org.opencastproject.organization-mh_default_org.cfg.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,3 +361,8 @@ prop.admin.notification.position.global=top-center
prop.org.opencastproject.admin.series.thumbnail_upload_dir=https://dce-deac-cluster-configs.s3.amazonaws.com/public-resources/series-thumbnails/
# default stock video thumbnail for series
prop.org.opencastproject.admin.series.default_thumbnail=https://dce-deac-cluster-configs.s3.amazonaws.com/public-resources/thumbnail-shield-spring-2022.png

# If the property is specified, the admin ui will use this email address in a mailto to upload thumbnails,
# if missing, the To: field will just be empty.
# #DCE OPC-737 email to field requests to admin
prop.org.opencastproject.admin.support.email=<%= @production_management_email %>
33 changes: 0 additions & 33 deletions ...lates/default/org.opencastproject.signaldetection.impl.SignalDetectionServiceImpl.cfg.erb
View file
Open in desktop

This file was deleted.