+ %{logo_img_tag}
-
+ %{logo_img_tag}
- OnDemand provides an integrated, single access point for all of your HPC resources.
- motd_title: "Message of the Day" diff --git a/roles/ood_matlab/tasks/main.yaml b/roles/ood_matlab/tasks/main.yaml index b8dcec48..64f04f24 100644 --- a/roles/ood_matlab/tasks/main.yaml +++ b/roles/ood_matlab/tasks/main.yaml @@ -44,4 +44,4 @@ backup: yes with_items: - { regexp: '^.*This app will launch a .*[Owens Cluster].*$', replace: ' This app will launch a [MATLAB] GUI on the [Cheaha cluster]. You will be able' } - - { regexp: '^.*\[Owens cluster\]:.*supercomputers\/owens$', replace: ' [Cheaha cluster]: https://docs.uabgrid.uab.edu/wiki/cheaha' } + - { regexp: '^.*\[Owens cluster\]:.*supercomputers\/owens$', replace: ' [Cheaha cluster]: {{ docs_url }}' } diff --git a/roles/ood_uab_ui/files/cheaha-logo.png b/roles/ood_uab_ui/files/cheaha-logo.png deleted file mode 100644 index cc4316ef..00000000 Binary files a/roles/ood_uab_ui/files/cheaha-logo.png and /dev/null differ diff --git a/roles/ood_uab_ui/files/cheaha-logo.svg b/roles/ood_uab_ui/files/cheaha-logo.svg new file mode 100644 index 00000000..88508a14 --- /dev/null +++ b/roles/ood_uab_ui/files/cheaha-logo.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/roles/ood_uab_ui/tasks/main.yaml b/roles/ood_uab_ui/tasks/main.yaml index d9023a8a..b212cac9 100644 --- a/roles/ood_uab_ui/tasks/main.yaml +++ b/roles/ood_uab_ui/tasks/main.yaml @@ -7,48 +7,32 @@ app_name: "{{ item }}" with_items: - dashboard - - activejobs - myjobs - shell +- name: Add initializers folder + file: + path: /etc/ood/config/apps/dashboard/initializers + state: directory + - name: Add shared directories into files menu template: src: dashboard/ood_rb.j2 - dest: /var/www/ood/apps/sys/dashboard/config/initializers/ood.rb + dest: /etc/ood/config/apps/dashboard/initializers/ood.rb - name: Add cheaha logo image copy: - src: cheaha-logo.png - dest: /var/www/ood/apps/sys/dashboard/app/assets/images/cheaha-logo.png - -- name: Check if cheaha logo has been set - shell: grep cheaha-logo.png /var/www/ood/apps/sys/dashboard/app/helpers/dashboard_helper.rb - ignore_errors: yes - register: cheaha_logo + src: "{{ ood_dashboard_logo_filename }}" + dest: "/var/www/ood/public" -- name: Add cheaha logo to Dashboard - replace: - path: /var/www/ood/apps/sys/dashboard/app/helpers/dashboard_helper.rb - regexp: '(image_tag\("[^"]*)OpenOnDemand_stack_RGB.svg(.*)$' - replace: '\1cheaha-logo.png\2' - backup: yes - when: cheaha_logo.stdout == "" - -- name: Rebuild assets for apps and force apps to restart +- name: Restart apps to pickup new settings shell: | - scl enable git19 rh-ruby22 nodejs010 -- bin/rake assets:clobber RAILS_ENV=production - scl enable git19 rh-ruby22 nodejs010 -- bin/rake assets:precompile RAILS_ENV=production - touch tmp/restart.txt - args: - chdir: "/var/www/ood/apps/sys/{{ app_name }}" - vars: - app_name: "{{ item }}" + touch /var/www/ood/apps/sys/{{ app_name }}/tmp/restart.txt with_items: - dashboard - - activejobs - myjobs - name: Put motd in place - copy: - src: motd + template: + src: motd.j2 dest: /etc/ood/motd diff --git a/roles/ood_uab_ui/templates/activejobs/env_local.j2 b/roles/ood_uab_ui/templates/activejobs/env_local.j2 deleted file mode 100644 index a26d14cf..00000000 --- a/roles/ood_uab_ui/templates/activejobs/env_local.j2 +++ /dev/null @@ -1,4 +0,0 @@ -RAILS_RELATIVE_URL_ROOT="/pun/sys/activejobs" -OOD_DASHBOARD_TITLE="UAB Research Computing" -BOOTSTRAP_NAVBAR_INVERSE_BG="{{ navbar_inverse_bg }}" -OOD_PORTAL="ondemand" diff --git a/roles/ood_uab_ui/templates/dashboard/env_local.j2 b/roles/ood_uab_ui/templates/dashboard/env_local.j2 index f88430d4..cbc645ba 100644 --- a/roles/ood_uab_ui/templates/dashboard/env_local.j2 +++ b/roles/ood_uab_ui/templates/dashboard/env_local.j2 @@ -1,7 +1,8 @@ -RAILS_RELATIVE_URL_ROOT="/pun/sys/{{ app_name }}" -OOD_DASHBOARD_TITLE="UAB Research Computing" -OOD_DASHBOARD_DOCS_URL="https://docs.uabgrid.uab.edu/wiki/Cheaha_GettingStarted" -BOOTSTRAP_NAVBAR_INVERSE_BG="{{ navbar_inverse_bg }}" +OOD_DASHBOARD_TITLE="{{ ood_dashboard_title }}" +OOD_DASHBOARD_DOCS_URL="{{ docs_url }}" +OOD_DASHBOARD_LOGO="/public/{{ ood_dashboard_logo_filename }}" +OOD_DASHBOARD_LOGO_HEIGHT="{{ ood_dashboard_logo_height }}" +OOD_BRAND_BG_COLOR="{{ brand_bg_color }}" OOD_PORTAL="ondemand" OOD_DATAROOT="{{ user_data_path }}/$USER/$OOD_PORTAL" DISABLE_SAFARI_BASIC_AUTH_WARNING=1 diff --git a/roles/ood_uab_ui/templates/dashboard/ood_rb.j2 b/roles/ood_uab_ui/templates/dashboard/ood_rb.j2 index d66ae43d..6fb1ab38 100644 --- a/roles/ood_uab_ui/templates/dashboard/ood_rb.j2 +++ b/roles/ood_uab_ui/templates/dashboard/ood_rb.j2 @@ -3,23 +3,15 @@ OodFilesApp.candidate_favorite_paths.tap do |paths| # add project space directories projects = User.new.groups.map(&:name).grep(/^P./) - paths.concat projects.map { |p| Pathname.new("{{ project_path }}/#{p}") } + paths.concat projects.map { |p| FavoritePath.new("{{ project_path }}/#{p}") } # add scratch space directories - paths << Pathname.new("{{ scratch_path }}/#{User.new.name}") + paths << FavoritePath.new("{{ scratch_path }}/#{User.new.name}") # add user data directories - paths << Pathname.new("{{ user_data_path }}/#{User.new.name}") + paths << FavoritePath.new("{{ user_data_path }}/#{User.new.name}", title: "Data") # add local scratch directory - paths << Pathname.new("{{ local_scratch_path }}/#{User.new.name}") + paths << FavoritePath.new("{{ local_scratch_path }}/#{User.new.name}") end - - -# don't show develop dropdown unless you are setup for app sharing -#NavConfig.show_develop_dropdown = ENV['OOD_APP_SHARING'].present? && UsrRouter.base_path.directory? -#NavConfig.show_develop_dropdown = UsrRouter.base_path.directory? - -# uncomment if you want to revert to the old menu -# NavConfig.categories = ["Files", "Jobs", "Clusters", "Desktops", "Desktop Apps"] diff --git a/roles/ood_uab_ui/files/motd b/roles/ood_uab_ui/templates/motd.j2 similarity index 92% rename from roles/ood_uab_ui/files/motd rename to roles/ood_uab_ui/templates/motd.j2 index 4cfde85f..124931e6 100644 --- a/roles/ood_uab_ui/files/motd +++ b/roles/ood_uab_ui/templates/motd.j2 @@ -4,7 +4,7 @@ If you encounter any issues, please contact support@listserv.uab.edu with **OOD* Use of this resource is governed by the [UAB Acceptable Use Policy for Computer and Network Resources](https://www.uab.edu/policies/content/Pages/UAB-IT-POL-0000004.aspx) -For more information on Cheaha and the tools available to support research please review the documentation: http://docs.uabgrid.uab.edu/wiki/Cheaha +For more information on Cheaha and the tools available to support research please review the documentation: {{ docs_url }} ------------------- Available Slurm Partitions -------------------------- diff --git a/roles/ood_uab_ui/templates/myjobs/env_local.j2 b/roles/ood_uab_ui/templates/myjobs/env_local.j2 index e62f5420..2ceac895 100644 --- a/roles/ood_uab_ui/templates/myjobs/env_local.j2 +++ b/roles/ood_uab_ui/templates/myjobs/env_local.j2 @@ -1,4 +1,3 @@ -RAILS_RELATIVE_URL_ROOT="/pun/sys/myjobs" -OOD_DASHBOARD_TITLE="UAB Research Computing" -BOOTSTRAP_NAVBAR_INVERSE_BG="{{ navbar_inverse_bg }}" +OOD_DASHBOARD_TITLE="{{ ood_dashboard_title }}" +OOD_BRAND_BG_COLOR="{{ navbar_inverse_bg }}" OOD_PORTAL="ondemand" diff --git a/roles/ood_uab_ui/templates/shell/env_local.j2 b/roles/ood_uab_ui/templates/shell/env_local.j2 index ff7b2d08..1627b271 100644 --- a/roles/ood_uab_ui/templates/shell/env_local.j2 +++ b/roles/ood_uab_ui/templates/shell/env_local.j2 @@ -1 +1 @@ -DEFAULT_SSHHOST="{{ ood_shell_default_host }}" +OOD_SSHHOST_ALLOWLIST="c0[0-9][0-9][0-9]"