From 39c519e1c181b2181baec6c91062182b1b61b97f Mon Sep 17 00:00:00 2001 From: Bo-Chun Louis Chen Date: Wed, 20 Jul 2022 13:54:41 -0500 Subject: [PATCH 01/10] Add docs_url in group_vars --- group_vars/all | 1 + 1 file changed, 1 insertion(+) diff --git a/group_vars/all b/group_vars/all index 6ad5b921..42289870 100644 --- a/group_vars/all +++ b/group_vars/all @@ -265,6 +265,7 @@ scratch_path: "/data/scratch" user_data_path: "/data/user" local_scratch_path: "/scratch" + docs_url: "https://uabrc.github.io" # User Registration enable_user_reg: true From f41dad446c2f7a9fc83396169ebc362a8ed4dbf8 Mon Sep 17 00:00:00 2001 From: Bo-Chun Louis Chen Date: Wed, 20 Jul 2022 13:57:27 -0500 Subject: [PATCH 02/10] Replace docs url in files --- roles/ood_matlab/tasks/main.yaml | 2 +- roles/ood_uab_ui/tasks/main.yaml | 4 ++-- roles/ood_uab_ui/templates/dashboard/env_local.j2 | 2 +- roles/ood_uab_ui/{files/motd => templates/motd.j2} | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) rename roles/ood_uab_ui/{files/motd => templates/motd.j2} (92%) 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/tasks/main.yaml b/roles/ood_uab_ui/tasks/main.yaml index d9023a8a..b3fb7cc5 100644 --- a/roles/ood_uab_ui/tasks/main.yaml +++ b/roles/ood_uab_ui/tasks/main.yaml @@ -49,6 +49,6 @@ - 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/dashboard/env_local.j2 b/roles/ood_uab_ui/templates/dashboard/env_local.j2 index f88430d4..9d4d7464 100644 --- a/roles/ood_uab_ui/templates/dashboard/env_local.j2 +++ b/roles/ood_uab_ui/templates/dashboard/env_local.j2 @@ -1,6 +1,6 @@ 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" +OOD_DASHBOARD_DOCS_URL="{{ docs_url }}" BOOTSTRAP_NAVBAR_INVERSE_BG="{{ navbar_inverse_bg }}" OOD_PORTAL="ondemand" OOD_DATAROOT="{{ user_data_path }}/$USER/$OOD_PORTAL" 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 -------------------------- From 339ea8bed13be2782420c397aa150baa1a831b73 Mon Sep 17 00:00:00 2001 From: Bo-Chun Louis Chen Date: Tue, 26 Jul 2022 23:16:10 -0500 Subject: [PATCH 03/10] Remove config file for activejobs Ref: https://osc.github.io/ood-documentation/latest/release-notes/v2.0-release-notes.html#activejobs-configuration-changes --- roles/ood_uab_ui/tasks/main.yaml | 2 -- roles/ood_uab_ui/templates/activejobs/env_local.j2 | 4 ---- 2 files changed, 6 deletions(-) delete mode 100644 roles/ood_uab_ui/templates/activejobs/env_local.j2 diff --git a/roles/ood_uab_ui/tasks/main.yaml b/roles/ood_uab_ui/tasks/main.yaml index b3fb7cc5..a520a981 100644 --- a/roles/ood_uab_ui/tasks/main.yaml +++ b/roles/ood_uab_ui/tasks/main.yaml @@ -7,7 +7,6 @@ app_name: "{{ item }}" with_items: - dashboard - - activejobs - myjobs - shell @@ -45,7 +44,6 @@ app_name: "{{ item }}" with_items: - dashboard - - activejobs - myjobs - name: Put motd in place 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" From 94aa27c0e3bf1d935cd3830ffe8acf35550b05c9 Mon Sep 17 00:00:00 2001 From: Bo-Chun Louis Chen Date: Tue, 26 Jul 2022 23:51:10 -0500 Subject: [PATCH 04/10] Rename variable for dashboard bg color Ref: https://osc.github.io/ood-documentation/latest/customization.html#branding --- group_vars/all | 2 +- roles/ood_uab_ui/templates/dashboard/env_local.j2 | 2 +- roles/ood_uab_ui/templates/myjobs/env_local.j2 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/group_vars/all b/group_vars/all index 42289870..dd4cf1d6 100644 --- a/group_vars/all +++ b/group_vars/all @@ -260,7 +260,7 @@ s3_shibboleth_object_name: UAB_SHIB_OBJECT #UAB UI customize - navbar_inverse_bg: "rgb(0,99,65)" + brand_bg_color: "rgb(0,99,65)" project_path: "/data/project" scratch_path: "/data/scratch" user_data_path: "/data/user" diff --git a/roles/ood_uab_ui/templates/dashboard/env_local.j2 b/roles/ood_uab_ui/templates/dashboard/env_local.j2 index 9d4d7464..4f734636 100644 --- a/roles/ood_uab_ui/templates/dashboard/env_local.j2 +++ b/roles/ood_uab_ui/templates/dashboard/env_local.j2 @@ -1,7 +1,7 @@ RAILS_RELATIVE_URL_ROOT="/pun/sys/{{ app_name }}" OOD_DASHBOARD_TITLE="UAB Research Computing" OOD_DASHBOARD_DOCS_URL="{{ docs_url }}" -BOOTSTRAP_NAVBAR_INVERSE_BG="{{ navbar_inverse_bg }}" +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/myjobs/env_local.j2 b/roles/ood_uab_ui/templates/myjobs/env_local.j2 index e62f5420..5700926f 100644 --- a/roles/ood_uab_ui/templates/myjobs/env_local.j2 +++ b/roles/ood_uab_ui/templates/myjobs/env_local.j2 @@ -1,4 +1,4 @@ RAILS_RELATIVE_URL_ROOT="/pun/sys/myjobs" OOD_DASHBOARD_TITLE="UAB Research Computing" -BOOTSTRAP_NAVBAR_INVERSE_BG="{{ navbar_inverse_bg }}" +OOD_BRAND_BG_COLOR="{{ navbar_inverse_bg }}" OOD_PORTAL="ondemand" From f79e9be58d785517d8337081b72201b972994970 Mon Sep 17 00:00:00 2001 From: Bo-Chun Louis Chen Date: Tue, 26 Jul 2022 23:54:30 -0500 Subject: [PATCH 05/10] Add ood dashboard variables --- group_vars/all | 3 +++ roles/ood_uab_ui/templates/dashboard/env_local.j2 | 4 +++- roles/ood_uab_ui/templates/myjobs/env_local.j2 | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/group_vars/all b/group_vars/all index dd4cf1d6..857178ac 100644 --- a/group_vars/all +++ b/group_vars/all @@ -260,6 +260,9 @@ s3_shibboleth_object_name: UAB_SHIB_OBJECT #UAB UI customize + ood_dashboard_title: "UAB Research Computing" + ood_dashboard_logo_filename: "cheaha-logo.svg" + ood_dashboard_logo_height: 157 brand_bg_color: "rgb(0,99,65)" project_path: "/data/project" scratch_path: "/data/scratch" diff --git a/roles/ood_uab_ui/templates/dashboard/env_local.j2 b/roles/ood_uab_ui/templates/dashboard/env_local.j2 index 4f734636..8f58d755 100644 --- a/roles/ood_uab_ui/templates/dashboard/env_local.j2 +++ b/roles/ood_uab_ui/templates/dashboard/env_local.j2 @@ -1,6 +1,8 @@ RAILS_RELATIVE_URL_ROOT="/pun/sys/{{ app_name }}" -OOD_DASHBOARD_TITLE="UAB Research Computing" +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" diff --git a/roles/ood_uab_ui/templates/myjobs/env_local.j2 b/roles/ood_uab_ui/templates/myjobs/env_local.j2 index 5700926f..142385d3 100644 --- a/roles/ood_uab_ui/templates/myjobs/env_local.j2 +++ b/roles/ood_uab_ui/templates/myjobs/env_local.j2 @@ -1,4 +1,4 @@ RAILS_RELATIVE_URL_ROOT="/pun/sys/myjobs" -OOD_DASHBOARD_TITLE="UAB Research Computing" +OOD_DASHBOARD_TITLE="{{ ood_dashboard_title }}" OOD_BRAND_BG_COLOR="{{ navbar_inverse_bg }}" OOD_PORTAL="ondemand" From 241a52df2e1ba83ff74bb5bf6a5699a4a8bfde4d Mon Sep 17 00:00:00 2001 From: Bo-Chun Louis Chen Date: Wed, 27 Jul 2022 00:14:36 -0500 Subject: [PATCH 06/10] Put new logo in place with new method, e.g. using OOD environment variable to point to the logo file --- roles/ood_uab_ui/files/cheaha-logo.png | Bin 7800 -> 0 bytes roles/ood_uab_ui/files/cheaha-logo.svg | 1 + roles/ood_uab_ui/tasks/main.yaml | 17 ++--------------- 3 files changed, 3 insertions(+), 15 deletions(-) delete mode 100644 roles/ood_uab_ui/files/cheaha-logo.png create mode 100644 roles/ood_uab_ui/files/cheaha-logo.svg 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 cc4316ef9c1501b147415bc24e298aae3b30b302..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7800 zcmXAu2RNH=7sf;Ey^^Zgro)O+tEf>GV($>trYK5LdxaVe)l#c=?Z&3|ialx+RY4K0 z+FOZIeChvtuPbln^}Nq>?%%o3d7r$}*M-y5aL@n%0D28|m>~c_l23fCMnyq9CwzRX zM|>jlexzYcMLdG39Ab&@sXf)rya50v=)VUEt~=%r@x$vrsz@Irk0(BUwqA|^KR-Va zmuIft_O_mmA|75&nY;2F008%~229!5KWiu3&;RkSl%^$bILofINO%{!ScE<)ge zvk*xt7xy0Dd*jWQ^vfW3Lj4;-ahwn@PgvZ`NrV%E*Mdu8F+V)F6OxTZs7OkHYd|<4 zhQuDF+!YHv?!u9LC4GTyz&nv#0-*dfYwjEFf4CD+5i+VPxNQE9kHsit7@GitzZnC({SH<~HqzCVvahZ#=1fQYD{FM#hpwA{yU+>U_FRHLjoB-Poo$l&RaDvYi{n+o zWAGnNA3oMrzF#V^E|*L%SbqGnzVw-X+i?e9uDc8FawzM%1jp3Ddu||YNi5ezM$#}j zB`F_i35gQ`UQ``geZaOtQ`#uJqf8l_6g`_X0MYzK8rRVK;i z))(U;zf#Pug}JL1|I(4VlR|p}9P292sUkghFv<5dqm<8NS6yxc0SHT-4qv`0Y~799 zq`tuy;F;827_XUOZbE$+PxIzo&yRds5nQSZiYp{DUMPR^Ph3K;N!{#2*3~m)WQE9# z+F{AGlYU$Lb3fHSe0h0SjG$MO|Kf6~E=2If!R1N&(OB8&C;fyDRW&w) zjlZg-k7@os;I1MoLye9y#DIUo{SqPuJ*Pa zo0~UyiS@UUbg_2yd)3sfQhK>YZ+$iQ;61qbpT2hiOJp?R0@+Q4U?iC_X_x@bTF6A- zIrnSTDf*t|N%rk4H#)H8eF_{Su1@Hv0Y+l*lqvd!UxEk|rF7&o@>!8#Ul0fCuJN`< z?-UcdWKAqhiC8%Kox)1%$Cq3F$IEbP!vwKL5h4+9UvT4 z8wHdkhr$XExxa#5pI8&19R#az?7=j-$pppQu{>32FKTSU8?{Uftjrl z-Y_W(7)%%~Oi>Fwa1G8ihxz*Fd@D0t8&I*R>s>O>-SMb2Yj8WtlJ)+(8#?ymhn)v5 zS)f2gM_h!~qYbUg<`4$D(mM5G>$Xil)TGAT=$5vD?VCtJ>d+!B_%7pxo(U!OOo(81 zr?X7M$E=t?1bE3WwNZJh$Gk(i4efQ;lI7bxBVsSDq9i8yO);^y-w;oQp+y|0bjzFh zo{O#m*$-~$%e)I$30Ju%w1UK|kGOvW*JF>clQwO0oahn>qQkMj3F#bX=zp0#{)GcE z1h!=yL7dih3&j#NjrdQ7N2f|Ww%y+c4gd42%>GK*VZtLm!N3gM4_i0CRl_?8&J{Oq z`N~pEY&Kf8*YasjPjsq(gwT*O9#(TDzyOat4h1|NZ->oICg`@6c-bN+mfnVv&w>=Y zPOytA4$VJI19Cdm>T0F$K;EEO^FHBnb(GFLCd72^uP&AN-q}9+ zOtFa_+`7mDUFvfQVGP1@#r!#Z(__+9kd$>v;widsYQx%4t9Obg^q&}>^zoRmqQ2uV zc7FgnDMDF@(tOV8x*&*N|Kx7GkWD&sjOSTUMd{qgjSLkO6k@spTKk9T|K!=TlK7cb zvGD%)BAWcXxAs_08LfU9_Qlc;nSv^|33or^6J#y4`@lTVof*a`Z^bq?pBy2}eI1|B z7Z<}&`8qp4C%Dg4L3#WAK4YB5L^}5ATV2&qn!l%Ko>tH2$b5fapF_Zkj;_5PU>hUB zcBKd1xu(Uj?R<1>kB`A#5&iOo#{9qJp|-FL1*Yo~@&`DoW9B1?Ru)FiAKu+2`e;^uQ;}Cjd4q3=alYuohg)H4YBH*y0ulu zQF$%V%xB7RGOi6M5BS@`pVfGGs#|7KWuu3dL4ShPc*P4b#$tQT^l?z^rcOtd-tRPL zJvhPH=wB-PT;CUhj?@daMVsAbEQDlK_*~|T+8g*TZTJ7OKyebYn}^@5$&>8$r60mk zES!?&$NA=Y>?se6>2%<6=~3R;z|u_)%&}@?wB6;mbO(>=(+1)DqvLFed>mBb?OUOO!Dm&rm?f{P`=IrpjgQb*|g4#hjwSy=2l`9Mesr=SA z4#|EfWz{{)b*gH9qS@&=DEn$QMH+VUVCp;|8Nu=gv*&Z!g`M#J_r1*_38qV{`v$e z!sI!($9_ujMo>b5A*%S%Cca!(ZPV9t(muxs(`?xrtoZW>4+Q=zf56L^%|GV~n9DvM z`-oY^t>|e5oq7<zcqD=6LzIwt_?qL)I3 z529^?V|S=Ktcg8ITErjjRsocFVEDIZehA(~cOTm-BLgxQL&w(Gjt_%Jn?ZWt{SQ9P z;OHY^zHk_V^;L0Qcy6M+o{cbg^f$#m*Z$+%Vdj>5ubL%@$XU|<!bHU#VIVU;&E)NqnFI%a zj}W_m;DInfS2J2tMHn0{Nzo*2H`g295FEZptXd06rg_i3p}b4vRL0HGi{#roNAdyFE;;5*P5K!LGP;@8{Fjlcy()%VxZ`YoKIdMYPuc_BZi8zppXU4A2NL{>A*U#red z+wPV=g%VtDJrU?I1q(P!bWJUL{*F(Iq9wdlyVB;BH8R!%%JO`+1Zuwn=tTG^#poc* zhPOGp0}Q_N80Okw1@pTn*FDS62**Ah{f~jESBH@O+tr0oLp)kij?2YvvCVPzh5gL# zp5t@C^Py|YY~|)>X&bgL0#Rupzm&?BLXYp6>hjmosjC_zIWG9{&&u;v^qhMm?t=le zpCROX1Y_x#o{4)!Z{)@A>W(!-yr>&G7v9;G=K|iu4ztS69&}ntgar1J)=&rnHJL%F zYThVAXs|4IdAH_u;jZ!`jO0RzwGom71Py+iT{bmgv|H)#_0oKz|$}+VPm1+!Bwp9H(PZR)bNXFYoTux zaox`4mfg0<*wZc~>hp7)ik;YlHL<>XX-*2@`sQ1w0kqX0`cA2~l#fHr3bA*D<$Ra_ zx#a5CzGuu$Dd2NWffWf@uBqckyn+#12e#-{VJs>?mZ9$?f}#IWdyJi|L=P(Qw^bji z6UYc;OjD&<+${i%Sba0H4t9pm`G~6+jqc7>=JnB%pdV- zQ6Go@qN43fgWung_20;n829-Wa{oFLx>SKitAM9CzTZ~pw5JAi@gC{8?{jc-pAye_ z(HCWkbP+X#<>DTcmYrQ9_RW*2ITc0!cIx|glwd=!Ib_PT9 z5jE6EB|OL=h^*|wJG{ykEx^61h!w{h;A?8tm2(9sIQVluruTV+i^HRz7?+*|fKKW6 z*N9(ry2`JqGZGuRabP>m?{3{y{^Mjdn^*a7XwSULT?Uqn44}=0UdrIrA&pOVF0)CF z?8Vw@HaR)AU0drm+mXlAnGer$>=$h5J&TNB*@e}Ta%`u9#pz>RE%C*XDaf##nQF?d zOvl8CXMT5tp|4lJ{B_h>jrd&+(q{mxo)+0?_d|1TF0}hmyt3`=89;Rs&$_L95jJRr z>Lm^7hLRNI>>tT0D%XDjbKP227xptXrW+gP@omArQVfhhzA6K%ce*O-dMEslMszB_ zZ3hL=+g6kqpRaQqoJKUA`o}Y_$ceF^+gZ@quiFj=^8Pf)t0q>f34#1)hC~`U>zH)= z*uFYU9^G;2PM$imal?+x_X5RZR;S0S!S>E#lNWH4*C0j9*A>sCZMrDval>M9PrSpJ zz~y56Z{3Z>PI|xRZEU7myh*8;iziq9I@y-NHTfukS#pop_vES;>@5oIdCDy!635o| zPIH-i5Id^J<-_xfxFu%a+| z@cHBU${17~+QgC?^ka>w;me`3l??xA(6#JajC_njUjQtmbWAD_w}zZ9j2`TJ*#IK6?};qp{m&*ILZz$X`U#w8Ok>L zzu0;gvEF}#at)UcOx0LQ(=VsQxf9tXNl8n3P-hc{7qp@9G>+~)Rl;v#4xOFi@`gou zEIl7lHR~fvrj%hh`FVz-Ns?jDxf=*mMw`{01ybp8!5|Z1JJtO?opg&p3j-OCwD!px zNg^MTYwz{(K9x#p#<0?kzC^sg5x1(^OEofSLEJqE`dGn;XEP9Gk=NGiVw)7evbl}l zW|g#ga!8AftGAF2skYx*y@FgcU(2?=qfhePnmG5g+6(2$ZMu;k@=+Zi@~@T|;kke- zE3g30eJkhJ7?k~Wb4w-maaDT_hn^a@r#&LzQ#s$e@0JHE>-q^fw?l&k2QMKlqJ!*F zOqg@h^Ba?M`L5k3k!qA)!4$#F@$_9aJ6$y}oR7lj&GGr_{1K^iuMNTNc-kx7w-qtdTS~oH#;A5{v{KC3YV>w~+vdIdy?nTiDAJcs;d7f`-+x$|R47l!v(~(v)4=6S`fJPH3B6X2eA^9%dI=oF0S}r6k|Dp2?Fe}Wnu9q6hHWQ<>xVYQDkAFdTa&?c#!e6Jz&*B^3 zPaXUu5qC=NoY{~J~3&EAo=MoF#AUbc%PJlJ-vpIbx&X!_v@s z?%bYv8|7-6DFDA_C#wG@^%8hjA&-;J=9_W_bYZ?MAvzrUh0dl9d6Ri*LV`9 zaf(CW5pkW=zNN|TJsRq=21kGn!h(c4VdMu};;mmqNv>D|!y&0AI=yx1Ed zokpj1@5`kwDci#s2iNhrTJLn%r zgK~BRKZk1xu7RD}Jl%FjNW0`>a$-|7C6 z2|*Z-18=(dL4rkF!(DKe^|g4|%CZR*?r22RaUe>88^}uBbPGZ6Z_C0-9FebbD-G%Y zvYa{+BRDDmg5IbOOz28V?m^n(d{nuf^(L{ha-LaOwC(0Kf3N{Icr;u;=XRrzHYKhT zs0{DK3P9kwx2S|VXuHRCU2P|8J0 zOttnY2>GV~p_?c}L8Hqodj=)ONrXI9hakivv@dDW@2EkX%NrI-(mN8@X|0tgXd8K6 z-(lsmGODREigBL{ixx;1EbrNlLCQSu97p@f1fq>#35q)YCs``tN_I2_tzStR+v=8o zQr6TyyoztW4CG+3d}AiDXE%J;V9S+$RoB84!BerZtiYA9!1FH_ImB4p#9LPjGFb|z zTy3VF?cA@L>$vnH-kU7fwU&1s+T?WS_h23?#`jEk{{w}yyKXI>{257y*1&E{Q`OlK z;eM!L$$Ev49*KYnsEx&+SPC{d7U=;n2fgz6soUjVs?uPYL!SLln1g?EyU8>hf$ zP9EFA!ydx!0+sqOkxq@zGwj^g_w=V#D=L*({3)9rAqqBE~=BdZ_gA=KYg1fw3$-3@h<7{{-{8Pk^LC~wkN3d0UG=D+%+iZx} zHaN>law{*RpZlt&y~dXUoNb~}=epCJ>Ym4)Kn4*fJ(Wnk)^NRvJG}&>u_gR!uo|Cb zh9g~jj%XK?S!FZ0zp)p^#tqCO;==E}MHl+pJ@4^HH=ld+i)Q>V0~fbaH+Z)h2&(%O*sUlMhGAa)O`#g3lD z0CKj8jFhq^gyGo|dzRUqxd6Qz1s`T0;w)Q-L6C2gD~^bens+k{6bXIkvxIKa05ArF z9yAEA!t50ztr%rUWq4%R%fzn2Fy^euT5`&WTsIE}BIgVP5A8+s%%{>vMIkq#d8cXcU9gLre8{l}5sv9XZ03M8$$Th`(u<(tRX*>d~%{ zId`j+|JAauLl9J^L|F9`DSO&Vi#6GRhvuPKNO{K47wKKIuRjPAl@PBK(0^)a><5Ns ztXd~1VErB;%EIkzl<@hz=a8hR9lk!)5zIkjiv&s$O_8SUA$1Ju+S=I}lxzgPkCO_> zE!wmHW>PqPPM%&bWjbG}X%G!c+F|-X1h*#O>q(NMSMd!C>>i=}f&Os>hHk-tnDDAk z5)8CsReF!v`D;|d>oIdyKl{_}eJ&JEQmg;?l)Hh^=WXmKx;*v4D`N{*%qByg(FWF`g{w1IPqGSQnHJMH`l)qZr;X0@DcKOxdFM4oPhYfon)@XOgr_NtvNy_fqqF!$R zlTMO%&NG-7_5MUEVa`CRNVTX%W(VDSxH!$tMfrb%=n${t2FFoXB%uP35@*hfm==vp zZ*s!PY%|cUI|MXiVrl(A`Nh6mOZz(*ES%Y$Yqzu_;K$L*r9wl;T&3ptCahByu zAc?{BhkKB4qB3DCmDs22Y>=c|kSjsRk~RuzQB8Rs3h{dWfY4?LyG&pCqJ`w{cb#t@ zl~Q;ozM(+!?CBO6vut)Yp?j`Z07AU{4TEU}a^-vAHmU^)V{p9^q)Hw?M~03u8r{~- z7w*f3hzkrUT#=s&gVVoc%-6IR%&V@vygic>|La~+QULOBlN>TBm(Rd_J?@vm3!48# z3|B>1Q|k6epO2F)f)kY}zYQ=$#0_En=)pgb!w}{G<}w>GYFf=E!J$tJALsTv)64cB z;yobZTCidYf-vQ7Px5GmdvNrU&AF5oY(<(`Rt2UDO5C$gbU&7)@W%l#oS~UruVj4Q6stax%n77|`2vvvq z0t{@Ph?#qFnw+i0f17Dgi=acs5Xssnn=TvgNh0p;93WrLo0oqbtwTy}S!Re+$SM?J zD=_8@XZ~?Vp;S=B^jZ?vQMLF3C!6CrX`AzV1lJ@EZ;eVN&aFltag&fBfqf&yg*J>P z{3AxLtnbenAO^G9zB3|AVk9_o=kptuM3wN*;qSy|mV>a|m=;OT7mGk`#`4m_zhUCW XkLJI^Cx(ds5(6|;bzzl{Y$E;#0A}^D 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 @@ +Supercomputer-logo \ 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 a520a981..d3f1cead 100644 --- a/roles/ood_uab_ui/tasks/main.yaml +++ b/roles/ood_uab_ui/tasks/main.yaml @@ -17,21 +17,8 @@ - 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 - -- 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 == "" + src: "{{ ood_dashboard_logo_filename }}" + dest: "/var/www/ood/public" - name: Rebuild assets for apps and force apps to restart shell: | From e99b2a55d93bedcd81f3f885dd2563039683a51a Mon Sep 17 00:00:00 2001 From: Bo-Chun Louis Chen Date: Wed, 27 Jul 2022 00:17:34 -0500 Subject: [PATCH 07/10] Update ood.rb initializer Move initializer to new location Replace with newer FavoritePath object Remove unused code --- roles/ood_uab_ui/tasks/main.yaml | 7 ++++++- roles/ood_uab_ui/templates/dashboard/ood_rb.j2 | 16 ++++------------ 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/roles/ood_uab_ui/tasks/main.yaml b/roles/ood_uab_ui/tasks/main.yaml index d3f1cead..763fee70 100644 --- a/roles/ood_uab_ui/tasks/main.yaml +++ b/roles/ood_uab_ui/tasks/main.yaml @@ -10,10 +10,15 @@ - 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: 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"] From b09915d839ba2dfb33faa97072d27279e2bcbcb9 Mon Sep 17 00:00:00 2001 From: Bo-Chun Louis Chen Date: Wed, 27 Jul 2022 00:20:17 -0500 Subject: [PATCH 08/10] Remove steps rebuild assets Since it's not required with OOD 2.0 --- roles/ood_uab_ui/tasks/main.yaml | 10 ++-------- roles/ood_uab_ui/templates/dashboard/env_local.j2 | 1 - roles/ood_uab_ui/templates/myjobs/env_local.j2 | 1 - 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/roles/ood_uab_ui/tasks/main.yaml b/roles/ood_uab_ui/tasks/main.yaml index 763fee70..b212cac9 100644 --- a/roles/ood_uab_ui/tasks/main.yaml +++ b/roles/ood_uab_ui/tasks/main.yaml @@ -25,15 +25,9 @@ src: "{{ ood_dashboard_logo_filename }}" dest: "/var/www/ood/public" -- 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 - myjobs diff --git a/roles/ood_uab_ui/templates/dashboard/env_local.j2 b/roles/ood_uab_ui/templates/dashboard/env_local.j2 index 8f58d755..cbc645ba 100644 --- a/roles/ood_uab_ui/templates/dashboard/env_local.j2 +++ b/roles/ood_uab_ui/templates/dashboard/env_local.j2 @@ -1,4 +1,3 @@ -RAILS_RELATIVE_URL_ROOT="/pun/sys/{{ app_name }}" OOD_DASHBOARD_TITLE="{{ ood_dashboard_title }}" OOD_DASHBOARD_DOCS_URL="{{ docs_url }}" OOD_DASHBOARD_LOGO="/public/{{ ood_dashboard_logo_filename }}" diff --git a/roles/ood_uab_ui/templates/myjobs/env_local.j2 b/roles/ood_uab_ui/templates/myjobs/env_local.j2 index 142385d3..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="{{ ood_dashboard_title }}" OOD_BRAND_BG_COLOR="{{ navbar_inverse_bg }}" OOD_PORTAL="ondemand" From 736f011cac9a22b2ea90cad33c8bdc6d395807d9 Mon Sep 17 00:00:00 2001 From: Bo-Chun Louis Chen Date: Wed, 27 Jul 2022 00:21:58 -0500 Subject: [PATCH 09/10] Update shell app config Remove Default host since it's set in cluster.d Add allowhost list for all compute nodes --- roles/ood_uab_ui/templates/shell/env_local.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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]" From 752a07f7205dc1649e7e1e3c15da815dc2405e57 Mon Sep 17 00:00:00 2001 From: Bo-Chun Louis Chen Date: Wed, 27 Jul 2022 00:23:58 -0500 Subject: [PATCH 10/10] Update easter egg --- roles/ood_easter_egg/files/en.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/roles/ood_easter_egg/files/en.yml b/roles/ood_easter_egg/files/en.yml index 25645b89..f4e43b50 100644 --- a/roles/ood_easter_egg/files/en.yml +++ b/roles/ood_easter_egg/files/en.yml @@ -2,10 +2,9 @@ en: dashboard: welcome_html: |
- logo + %{logo_img_tag} -
+

OnDemand provides an integrated, single access point for all of your HPC resources.

- motd_title: "Message of the Day"