diff --git a/group_vars/all.yml b/group_vars/all.yml index 658f46ed6..9b876d05d 100644 --- a/group_vars/all.yml +++ b/group_vars/all.yml @@ -25,6 +25,11 @@ oidcng_vhost: "connect.{{ base_domain }}" admin_email: "openconext-admin@example.edu" +# Shown in banner on top right of UI in apps. +# Colour can be: crimson, orange, hotpink or khaki +environment_shortname: "" +environment_ribbon_colour: "" + httpd_csp: lenient: "default-src; object-src 'none'; script-src 'self' 'unsafe-inline'; style-src 'self' 'unsafe-inline'; font-src 'self'; connect-src 'self'; img-src 'self' data:; form-action 'self'; base-uri 'none'" lenient_with_static_img: "default-src; object-src 'none'; script-src 'self' 'unsafe-inline'; style-src 'self' 'unsafe-inline'; font-src 'self'; connect-src 'self'; img-src 'self' {{ static_vhost }} data:; form-action 'self'; base-uri 'none'" diff --git a/roles/engineblock/templates/parameters.yml.j2 b/roles/engineblock/templates/parameters.yml.j2 index bcfa659ed..f05832faf 100644 --- a/roles/engineblock/templates/parameters.yml.j2 +++ b/roles/engineblock/templates/parameters.yml.j2 @@ -162,6 +162,8 @@ parameters: view_default_logo: /images/logo.png view_default_logo_width: 96 view_default_logo_height: 96 + env_name: {{ environment_shortname }} + env_ribbon_color: {{ environment_ribbon_colour }} ui_return_to_sp_link: false diff --git a/roles/invite/templates/serverapplication.yml.j2 b/roles/invite/templates/serverapplication.yml.j2 index 76a750910..78145f253 100644 --- a/roles/invite/templates/serverapplication.yml.j2 +++ b/roles/invite/templates/serverapplication.yml.j2 @@ -83,8 +83,8 @@ institution-admin: gui: disclaimer: - background-color: {{ invite.disclaimer_background_color }} - content: {{ invite.disclaimer_content }} + background-color: {{ environment_ribbon_colour }} + content: {{ environment_shortname }} config: client-url: "https://invite.{{ base_domain}}" diff --git a/roles/manage-server/defaults/main.yml b/roles/manage-server/defaults/main.yml index 6677b637b..3cac3d3ac 100644 --- a/roles/manage-server/defaults/main.yml +++ b/roles/manage-server/defaults/main.yml @@ -4,8 +4,8 @@ manage_snapshot_timestamp: '' manage_jar: manage-current.jar manage_random_source: 'file:///dev/urandom' manage_cronjobmaster: false -manage_disclaimer_background_color: skyblue -manage_disclaimer_content: "{{ env }}" +manage_disclaimer_background_color: "{{ environment_ribbon_colour }}" +manage_disclaimer_content: "{{ environment_shortname }}" manage_service_provider_feed_url: "http://mds.edugain.org/edugain-v2.xml" manage_exclude_edugain_imports_in_push: true manage_show_oidc_rp_tab: false