From 6612631cc370922bc3db0364991a22d20b73d19c Mon Sep 17 00:00:00 2001 From: Andy Bottom Date: Fri, 12 Oct 2018 14:32:34 -0500 Subject: [PATCH 1/5] Added Monica to foundation apps. --- app/Item.php | 1 + app/SupportedApps/Monica.php | 12 ++++++++++++ readme.md | 1 + storage/app/public/supportedapps/monica.png | Bin 0 -> 30977 bytes 4 files changed, 14 insertions(+) create mode 100644 app/SupportedApps/Monica.php create mode 100644 storage/app/public/supportedapps/monica.png diff --git a/app/Item.php b/app/Item.php index 04e1a5e7..7fd0a551 100644 --- a/app/Item.php +++ b/app/Item.php @@ -51,6 +51,7 @@ class Item extends Model 'Lidarr' => \App\SupportedApps\Lidarr::class, 'Mcmyadmin' => \App\SupportedApps\Mcmyadmin::class, 'Medusa' => \App\SupportedApps\Medusa::class, + 'Monica' => \App\SupportedApps\Monica::class, 'MusicBrainz' => \App\SupportedApps\MusicBrainz::class, 'Mylar' => \App\SupportedApps\Mylar::class, 'NZBGet' => \App\SupportedApps\Nzbget::class, diff --git a/app/SupportedApps/Monica.php b/app/SupportedApps/Monica.php new file mode 100644 index 00000000..5fe03fb0 --- /dev/null +++ b/app/SupportedApps/Monica.php @@ -0,0 +1,12 @@ +l|SyFnW1jzK^gln`ko1f-;4=oFAH6$B}1q`SLO>FyL5y1U-xd+YrV z&$SR3X72CYIOpuM_qkzjROGRql0St&AXthDGH)Regww|_G!*d4-^rzL@D0gXN>Kw1 z{PRZp5DI=rcTmuEhCr~p9={Oc*{~_Vi)1ia9hkbkIn2%2$qeG==EiAdXYFii>|n-e z?_`m@|AHI>c?MCGk<@Tc*;4%UC3W&q~2E@DLwWR&1%XzZ?OJgY+(Vr zwpyHi-q;T==rdXw73>gtJXnwp@X*(<_%uTcyL5xo$jhWiZA{Q_Au53@5RDH~l2G*@1m9;PBO_A+ zg`Go`(2i`wJ6GUc^ZOq(KLt86@S%vJLf4dHW+Dq9-b0_bitX;#({^_$M?QU!LZM-hdl>lSDHbFL4 z!S89%GXgAYJi5}lI^l;{fB%;G0Lc_n2qFr^@;Nl&y=dDss^Gizn}M?#uSzz!Yh$x$ zTOQA$H3CxDAbmcozpcfxwXnK2G}UWN7L_i$zH)AFfvB$6ktGXZ5%nd;$PWfh>>d){ z;3;0-3O<<-p0}0H;lF>QOAA}X_?u?K*_mLm2y7y2YyedSiZJFT%E$Bf8#Qjws%PWJdUSc$J==!C2Lq zh}uywd2{;DyGoRPleT6E;fP0{2$eW>z6N%Qt!1gz7h~{tvyW(IXHN^ML@dj0rW#M^!pOqO%Y78IFnEcw*e(&v7F*%7|zg1R|1Llb?U4#e1g3!FCghySDf**d3&|-5FuK=EK>ue}8P7mR7OY zuu0s#7}Y>tu&WK>`9-tbf30L=z}@k`=jDOsoZU|%5r6JrrO#s1MZ;Q^>q(@Ok}!s<>uzs4L?fD)9|Gzb8=%| zWy#vPJs-01ZU{7dP^zlEOU?jSs9+9Vj|oc*cX5V8xAlHH_ZLGHBs+d( z=(P1^fm$L`QWt5Ku!kfSrIRp^Z--z+lAO*<(gIt4bZz;Tr|)OHdkJym01V1!L`3vV zTwJ{CW3{V=k}@(kBn2mf?04>4gt7%n?{AqVwhlWL1Mh07#cX9d!Djk7l!>Ivv$aGz zFN-9w?a(R+Lr+DmB0lKrr}#O%S$^Vg#0kaV>7Vb)F7hKUAJdNs3aZm9pdnLE1Px6vK6NgnQ)C*=-)-{vTE>%=loz2Uxc+K; zOhAC5`HBjJOAf+15~nh@Don+Gf1h`{nm#`wDa;kMhpDjT`IqnUDVt?1Xic~eC)zpw zGQ0DA_*gp^NTj)!$4dI!{|m%ZvSZ1OuKzi=jWMNlMxD0#hkqZ0&ZC|`e=b>|R~Zm( zVmDcHQ~j&{O$~bUTc0+UgGG*-n#qbZgat5ahmY|I4rQxpZ*)?yk!R13K#xmOY*%#u z5r`g~B<7O%oDX&K$@V4@QT)=sjSa1|9ZeAakr9oM4|(L687hot?Ba2T{`|StgneC7 zR3F}R^}-BnpsqThxWYoc>0AGk66wj5!NABk!x3rZof~>`9}9O&N}RNU>^TsHh&j>@ru}1LRAlG@ex7L)q?j(yXM2h={C|dZ^8d$Fnw6;EnN2 z^8+@W7!fRqnpWoHZC;X|xXHm{vsorS+D&W~*tpxGKlpEWn6a`sj#we3F9Xm$02~aRB;^)ng>Ju;lr(N=-y`o`QGnwNP9ox-M}7i`k>_R3 zpPAwQ{(hRskHcjF`wqgH?F*uiF7gQ`04C{%@mh%m^5tyttjDv3k>~Gde1;nz{LiEwhf649gH0ZB%J|Y z>-AW+V}|$@mnc3CS~eCgTb-A8Aoi=fyJ{!H`HT_lGcb~z?WGGFm!%7jvgdy&rtXiR zr6UJ;P`0kIxBu9W=I*(_mZQ>}tX^^vJCC4#0NY~dqa#@=Bd*LnNgt*lM>s$L=sqoI|*`y(dqzE6R_kw zUHjnC5;TavmT>jAfM9s70`~9-n_vL2n@s{B!q29w6|N%R4@iS3B132Kt{Pg7~EPW>XVoj#&;12ZyYOF4>* zydED~zBik(VE-V-!lD3^8JL)yT%9gA6^5~p)YsPwd&6;^a8j>YJv=;?QzD`jLU&z7 z4RpnlkAsKA4%&in3wM%*^!to{3P;QwfWf3)K*gOXEzib~80vs-kr(QL=KPlkx`jCqFpz zu_<2z;^GLqdYPXwFv!5zw`Oea6<$@)KmUE-`=F|+Nh$7)_Bh&~KT>j@P>_MubakI| zKc_X}`6cw^QhUv4Ng+Q!-&Zp}?-&x~5gUQ4esXaU()r~!;R!Vn5eM|UYGHBl=fCS+ zgQ=qB&b`>Xv(*I5s%eB&5xDe3ax!wY3uVUAwx)*j@JDpo%lpg7BP{~=q)e|^K~Ygs zul3~1q!8Bgg~raIAyrtBd6aWBA}aR#%|WV5<2fyxg$5!sGqX%nyiB&wm0z}g{MaEs znUx~}_+mAgvab6?C#dhW8X*G%104qkme1HVt$+X#0s=y&=@-ws1-spuW(o=++pY~| ziZ7|D%HQ@vxsoxr7K+UoaXWo4C-r<1|(P|?<6hg4^f2o|I>Gc#kZu+A;pvP#KVPZSW1 zUY~UiXLNGgOgkW|rd z#?+mdbD){^UQ`Yv|i z!|cEDXFAfQ)*mEQ=Mka}7klZtNWmPWgR#52Nelu$1)_`u2|j`RDk|y<##%DzK3<=0 zaKX^1ZdX&1`f!*v79T%396`t!f0=AC-rLooXBs5-{2BKLKSk!qN!Q#xOU-geeb=y*!&tsDFt~S zG8RA4*g`V?Zg_2NO&TO>bO=93A{r>8KCzWHJ)Kf+Njrbd9Q>yrX1o%Be7PDiw56a! z_m(3Bf7_}4&yJ^L^CLjVv3NsKy-rEHxF&p~ecW_1*cta+Xr&{9GuPOKZoJ%7{^{+qC6?G@g^n1KUQJqGBSCDHFBNDGvh^ zQ@crqBpsdB-|rkemc#G$d5&JOga`EZE7dJTLHPo4l^x2&K7W>-+rIW}7JGCAFUmT} z8=at(cL$3;4!u-vbk%OnG2v)Ss&!)p1g%=&o&6SIH{+^#zEc!i&vFn#XG&QUKMZrHdf@R7p;hNMP_7jcGq4aO%EJs7Y zC7D8hs5{frhmCZPL>< zbh~neN@6Ois5!evsx@YPm7(4+Rmb`i_xr2OGSeH^5w%b*lkeCnc_%6FC?;nZ3(5~w zt{LeD;#*rKa+Q;#xmxt2*q96zyHhSH8y7xZEZ#tz4U;3z_vRv^rM)9F3mjd1iwC(J zUZ>jAbrG2MM0Q*J^b4EIQw|w0C!h+!HNYa{C1lg`4JP9|kaXbQOMO|jV(#Krv%?N& zl}_QbQm7;V(<*H}Vlqs;qcbrvk?E!F;^xq+YJ1$$6Rwu7oP=mF&?Tftj0KL_R4neO z;EaclAJBM^_Q~w8_WL&fPnm1DbV}~-!fC!6ONpWvE>%%cL{uS(KLP|@{PH<5@fw0? z2Rh&*Sw}OQMyt8`LSxwWLAU0^%k4VlCPa31j!y?@Xwz2MD@wQ~42DIBV52Z&W8*}z z8^(U$BeS585HQnF*pnwu9EQX$Opfwi$A0}v2gT<336;><(Y^fpEBzZ&{b6QAxyiak zl?Wzn)Nt{;7vlP5xP0b|fy5koq0!Px0U7&)u0BJ<@3sj-E|Wq-(V9+=+1$@(HgU=lCsdk_${}(2&2I#m2+0G%UI)!M z_Je-O-`&1myK4+vZQ?kofamB`z@C>hpF>B~(2hi`tgLiuycs#`mZiX{NO{2uugVR$ z9RTa!8St5gmNVKFg-M2smX_9i|BB?Wzx4qzIV#QfYirr$+2`x0p4Hfrp^Be_g5IC+ zCLEsfJ>=q$N?|(vW=vS^#36YmSd$88k)hUf@yTcjFx*U5IQbg)p|@h4%}Ruv_6Y+M zqwz@Z&vd^Bgv=~l5e+b+=Tm52fC{(kF0%VWAdb~nY}zNEgM(MkgciFN+=kM153{$B zQv*{+nK5_}Wy_cM$@q?LF)CLMRHb)=LVHL%mDTNg{5G59*j^_IxHgoOj#rjrhM%HK ze;^?w3`#KaAQD>O*Mt#D_35JEP=f%+CD$8GB`Z(+g!`}qtozcmatpR@=s&3IZfFd# zPk?b}a9FeyTD~-RSNZ!Dy3<$6L{y(iqo;I}cSLNXNZ?;TE3kn)NaI&Qnkwo>4EAW$ zf3o=9+JMmJ*oO)8;6Q=qkimK>u~SeA_Nlqs?(d*s=UO-iC4L^*h#@g_#~aI4CIKTd zmzHpi3;n(Gr&bL0E@`ymHE+Gdw-KDBjK!@qj$Apn8awKG5JNAl9u$)gjd`Ck0SsV= zhj(0T5rp&w@B~|p<*wbMQfKFI2PMu2p(m_OXm1YpsEVtY6%EenZ|1qX2oS-H%*%DS zcfuYz_xLsBLx)KD-MJ0@*0BCdn^G{7avi7bYx2TPpMGQ27wG=f1=orG{*b2IKZR8% zgtX$UK10;=zBk1HD1tSxEbQ9)^R##;;w-AtiFqZbiiKAoc;r$Jbr-vTJ6g$q*Tg22|PYkH( zBu%xlv<%Q0+ES)AMoZoX@dNy0dbIC#kOhDMwP8j}zE+n)_{5z$82ONSy^ML|NxE{N zGV8Nv5a-S2=*8xnP_WH-fMAlYI|}~I!kTFcRoadnizm`v!XVf8?r(3IV8`asc=-~t znDRhOO3%&x21YpQ zzMn*XF&q4t?cJcMSCrF5%1kCfUi-~BYn&8ZP!w93w_={BT@hT(N?xtWNQe)d%*=W1 zzj2}#+Pvx$JVGUN7rik`TJKRtcz_iY-0z=JdwG9{lV&@TYX)*ed8paA%cK>QHNM;- z$##8o+Kdny1k+Pfx*&db9v-}E0fFiI%0;ZcP#yj9@x`Q{M)S+!Em5p+4_R48H8r&? z2<#9_KGGdaD}6M7!Zn<46%@;~mHa(eIt1HzNgNvU`t6d1u(P2pKz|QgLzj)zy|fM6 z^Ywi9C%ctpI^-^Xa%i-E?;}_8^L}O+Ffew1awES1U=ubNuL_CtiVKD3Y8Gl;9;DO* zuQ6i@!X3K2x?1T@FqG5RXC6`OGm1z2Q_<5>H-fyd?iBA_#+YVC=LvAG`%zB9NCu)9 zD5~7^zzB(=2QERulO9lJ9#TZ&di@ePx9sH8Hchp05=qgs*N<^C)0kH()O@zqK4$ah zPb}GtUN_!lrPQ&wDWR=Atv7EpaEXWnkRVZi(Ol0azB$}fZDpF`N_i_ay6!DoRIi56 z)PzNkHt`g>Kr4+b|GZ0j!I%`-JU@PcYkT%ex!dPL;u+YiE_vnVE8<9U0Xcl{Ni6nuCUgMF8T+YUiK7e;v*yv{&BPmB3jBa017+`nRK* z>>BrfXPONPd;JN#z~g!z9$;~QM+2M#cL5nSFz881zujh z1c<`LzveFIv4c7SD=U8VXk3%Xx;hp2?JWz-3q{jCS7@b{`>~vAEz#Qh#Pt=gFw{Yb zRtdY7E8@p?MwUiS)MX&E6QdZwJzUM(OLg z3)=`%)Y#07wy|w_G%}MOYRQ>TCNJuD?qt<}ocCt(N5L^%FiIx>%cIL z9KK4|>lQ{>38p3g^lM^Zg;wCU<>(nyiX2~D^zPUgeb!^SuMP zUn!i!rJ;g)Y=Ik{Q-7#mE=5D^pK<5Ll-Jt@ODt7{RN@H>F*6xSMe^?gAx0}P98)yIja zT7^V&HFiW)-GrnTZXfC@#K+cWJ@rrB0N=E;taM_GY&6#5LqQ{{!@@F2bdnPQc7KC`e#+kWCvQ%C2k3(Q^iqaHqq zkfpMg;X%a|-{ky{EwVxM=cb<{%G=NR_?R}ovm0O+PJFZhi$0L;C9Iw6GNmPQOcq~?oRzZC&-N>_Zd-`Fa`Y08GOW~yJ(EcM+Q<7Nub_!6IV z2T{w6G*Iw*qMISuKtTfsZbZ}MEk5}DB@DCE;hA>%ue;R2U5-p%Qt0!2mH8jh|JMtk zzx&8>7qBFTr^14^48!c1^dA{%j z#e~%9m%P9>!}Yh9u^5@t)HYD=PQe|uf$dJ?kr+AU!%3m0OS3kbh_WQkF9WEr4*)M@ za&l2Sh-je>J|GPUx0XvM0Z?xP)EI=@d3*eq>%aX~SEq-DZ;)~ueRc|26m1ju&Y4&2 zky%$aZ2)2gFW`;Q0F!?!V=+2vTdUgnY<4vsceFn!DCilN#L^VDok(}Py<J8ST>szSN=c{!aiy}I zzTu=K47M|e4LWeXC4p(SYmAV+aGB85re`nuL3yKsMjI8Ek`hTR<{2Kn!Z<0$$fMRE zEt1Uvf0Sw?OHvbAJ7Um5&JfrCiubgQ4l zQw)ssf~cjpfWbtfg2H4#{WFs9Y%#ruEllYe^mzn9sEagDB~{AYoJqfgueCD-XMGib zXBJl0kE1S9ogKJSJlL)wi02HVo~OH?&i9fpen)6(#*>QMu)KQx8e~(-|0R_0sn*=y z5-Z8S?HGH%OAEG<$Lsv{e-sI+)b3I%jgen7O0u9YPTtr|_UZ!R-fXpetMA?L!R^UN z>C%wX)kyvl8Nh<68me<~Q$T?CQ5E4^Ks+xybtbbkRgoNkZc z&BBY5Q+1sxIQuC&AtqX<7aJU|G^s zgvq8|+*J_Iw&Em$Wxr%no^HR?0*qvriy~L$aCtmm9jjH* z6qFv_k7e{FdIG(m;N;=C>`W~eDnU=O_l0oqh>FFeP^KvapZN6OzaWj0ioHx{_f=5O zI*utjNnB6;Ia=#I`rR8*_P#x26!XW`)s^w(Azq!yYCL?Zl!o-%{#3F8!^N^ByHN`! z;H|pD2$*Gh5gayVj?*Or9dD|v9E88h_VRSOOc@3OzA++tMWkm5pwpabh;oB!6CklF zDeF{W(YcSfLdbgR#v7-+s*2FQiZDO?}y## za>UZ6TYT63d0ObJEU*A8+lt?~eXdi{u(64$ayag)8>0F=#~=a?6v zgDYXWmG?Lx24$MUSC`v=I&P+pmH!)4ePr38D&OM1e>VZgMyJ(R3|e*I{~x6#gXwy> zJmkJRB7Zpgy7FkJv^6|>jG>@_4wSs!_g5D1@%l>D^T}c@wx>^z!N|1G@Lu7#)sBvi zQrXSeg1;T42~M3i!GO=8<>66-VGcMB9<`$$tcCw&em`VKAhGtO%*|fVuHKAwzurRb zTLLAXGw}S5l!umZ^fj)|+NBZ_s$MprRse$V-4Q%1X8Ck$EOX6rzo3xmhvy&$A`LSX z@tL-y1!kQ-3{5qXMnV#XG!Xy&`)Y~bV%TQd9S#^yrgx-&yR@Z)k;EvJi0yksv=pq$ z>w;5>R06xSRUAh^Kmd$repQi^2s?`xc3Ad@vm`y%VhwHww9sIoL1$sg4lkEc%=)># z^G}$!b|WH5e*iS!%6q^{9$O4 z>$&_1^*?GHQ`x)bBa!)F(;SRosY%VyFnUOh*1c{0!E9IUE5f7(@%^ZMwp6DR53 z-n}dIORl)t7fC$mE~hMx7%S^>E2Kka)AA`Oc>bxY(ld0yRMGEOPlhBq*J31|4(^C7 zH zBN(Bo3mWEA-~8-s8HLi9m&{sDPPIr5>pb9Wu@)Oi=sOQogG^}#3amPdjfDZH#Ab1z z-+>%ND&Sd_&%AY6QM=@eQQC4`0Vf@Ggbpbk?vB-#E;FQ^R9>$XmbMU5b*gjdO&3vs zswb$3jZoaMzh3sT|D|dqmDeXYn&Iz1e>x-%QufuYVbxVuV{%|IP!@I-EbniHjz%LY zWqV^M!AUX(P65oYSx%SC6(%f5eN64aDvKCH+FQs! zy59Bq+?o63N{FR`Hr-FZnsCpJsKYLT%Cft>p8)oR{`^T3j76YD(A?9OY$2%%L|bHe zzb|AjMnK|H_CnQFR}XBw_h3FgK9-T^`8*`??(@{ftu_qv$@0xXYaT_BTtRVhcO;ox zvfaV;(vSLd#3Jn&YOx?fv~n?6^~MuOu9t$<#>)9jrBU1dLZeJCcf8P|JC%`-)vSf5 zI4wvE^KMIGr)b&e;Sn*WJqr)K>!#KBh}WGR3u@XXrCj_^2j& z2*Ymz`|Fa!!yz~l zr|CmfawgesOFpQ{LiYGnS-*p^saT-_y~5A3rGh@nv;{0nZ^G*Hlwq@>BOL-b0t); zLCsNm|EZGDyj|rCw|n245uPMK7UWFVjWp$v{{AqKG@;Yt{R2)q(9x1Y`QqWWGSl=j zC?Md;i-(l@dk%VfdgIzTkjw~83qD>t!;FzrlO5`3{XZe%JrXQ(-w6M0u8CZ~86U44 zx<|dbs(STO)vlHTN8%R$How>>svb~mHGni6Kksv9Koj%1#ogw|XpJNOO zRgQEaH#T6FYu%5SFRv{0wzKlUiZ&ggoH0~a0oq|qY*Qc^2P86M64tm#Zju>b2qLq`$wqke2)p-XJ8JIsUSCm74e^k~MatuzB~289Ow0*P zNc0FK>q)dHfwkE-tepS)#nRQ=`#9A{D^&nKy+lD<~-7Qgv4qu(BO(+zQF` zUScG-N<6B~ZT=7>6l4TQT|s715#@xy1Pd#BP(eX}x~JWZs)X@ejV;_Fz+&9WXUu^` z2m}PxX&b?JZV(Cbk;KqIwO};MF}A>vMCN0!gBE(ta%%;ke}Vjs5YqXHp^>V*yxejw zm%|2&vj2^~H|5R6L2rxCO_|3D(=7=6zY2=@Sa%MGsmy{^1h!kbdVd3M(;aBwwtV(bU#9 z-Az;jR&Y1%B_@(8wcMlVdu|B_1qXk08knEge@v!@+J08y)u#tdH)*E?Lnb-3UHM%X88;~pT5f7GY_G%P*|bRw`vaw=4yR3HOwW?+ z9XhduK5F$NJmciV7E(?P@BYcz9fCn@0?r>8X+huuzzMcDaoi zt!Di}J3}`=J_MWD+Hw&49hbvNHwh^yA|7=r3=+-`P*@t5>%eSFfk38HV}op0w<2dS zCo-2{X%Ea+{=1^)a8m$HYXL-kHz#G+-Bjipl6*;g0Tk_G+S< zL)CVn0T~tN9t5ty>+?M}Xh2>A=;0u(2n+jyoQg320w>FFte2rx1{7R!eX(ZJCCzrc zTE*9t0ORvk8GzHf-+bWv;;8G}8(7PyOM^#)xeRR--nE#VY$ykdJEsXBz3NXD#ZepS zp$>{qOboq{xWrX`ar7bZL^`rZq*oq;1bA|~VZPHMuE3K@9d@5c%f7Nlmsf|#kWQo# zOG!y7@i}{BeBhf43- zPZ9(#ET=~C1ph6qdqU$=)psZ_g{52X^!e06JUcr(GL5N$(Qjj~_p#E4^yrq<(1V=_%v@V< zk1+&o`OUTK0ODO~@jBqkE)E7gKJQ0*BUT(3BBGB&KyQ%o`X8c9({VN^6h%!fn1-hW z>oXbexV4U?1?7f2=^b;$(CzKQe`)qGfo*G*!qs}) z5$iG!`l{TG&m%fKH#SEr%w9JgZFn;%!WJ(&K4WAXY5z=NA5wnv&EZl@5|z(LQk73q zQo?Z+Nvrhxnv4JdEhI*sWMN@pnOV13rkF8e;uxPkeQKz!1|SH;GWcTjjL+G6LU7f| zurv<6u<&$jO;YBgQX+JKB_rP(8vO(!?0v}%*mZDXnm_EY@Jq^=m}Ktv_K>|D_Df!I zOT)9ZV&vz?+;rIjX&_Mi#wMPBlS1OKP5N!jM*y`@)bkdLyhK6x(5ZDT-rq}{X%Cbz zJy^6^nA=+NgUCfv=6i{zJ;lN4Wh-rYnmkapAh}Zw`;9+>w;gY@7=RstjNLrPot^%! zxQGUGv8(5u&&|0&w`-}9@6l&C8f0)c*X=A@5u_0K><$w>=(Dg-=il@pbNRnk)DSy+eIU zrs*?b2Bb=AKPgzG96C03PrSBaj+dy!-D%cvv69)vg!VN~?ZtL{xW+ejmj>VCv$8pt zhbH?+wPUi>hzly0`UDZtanU1}eD@9!5%!bYSV7W)+eq?YtT)yy(D3Rwf-8Ia>CvF* zgVkk&p?%~}hx&cnUj^Z%t%g}%qULd1PP9}0fr34%iRoSxdTQ*%FT{7ypUWX@mkOHO z1p+X{6WuQ43CHxmoj6hjZ9-8%!g*W(Hgu-W?yj!)t6gl5Xan3Fk^YWZY#={0GGun= zd6#fDV&{1S59lMZ7KE{So0$sPZN*e`pXk9MLYRSd$v)_ca$tZA+hu(~%+7`- ztg6(DOFVc(Zk(KCdfO!Inz2A{2FR4Zdm_oQyePa}4|)IxqT*QgY&Ws z!I`m2&~_HKa?>(3Ir&PgAujgW5^Iv&(^o3{#CaBo4G$aKhSm)$u6*oKk03=>{-utN za8HcTP}#=MoHJ3Q3qb%(%eK|@S_1)ZgIGK>1vRmMGFT13w(Dq~W zJuT%lXn^7Qj;%e{JR5VFHn{L38vL>Kw1F%b)?!$x2SbW%+~oygVOaFam!KddW!33| zzc>=`B?^IWdvmo}H8olnu7g5WlBoV{Oe%y_2y?X$K>*)JL_4b7-`|Hmwvu$xM>;x_ zz$$H7I!V8MeBI+L;<}qi`z@TDw_WC2^k6PaIIWPK#QkO9zHQ>~7?k;CK<1_c>aU?T zE1^9Qg`P=n*PIXV9EDxU{jjZBO&C&)L&<@Xn*oL=nC3Ig#F@Mtl~ibk+28LVVpxMP zno0kRk+FN6CJ7Ron3(NF0kW+be(8=t5*|G_G~rTcHd6(toF z(a-l63cW(ZFx&M9hhi8g}QWIjIH1v(zcN27NEF>BSgLSs%N^29$)%#)P2H%lC7nbWnZx37|% zd8~1$UPf$h^DemdjMS&|U0Ecg%ATV;lBqBQCh)Vl; z$Nas_0j2PXvw&!~iR8mQA~=NK2b{#^V|K=WR}na=S&!^Rt4{?Ck|s1l)4D<5fdM1U zpBdJ6=VHU={_<3FX&}RZe!>hdQ4tZ1VFc0|dnusQVp+-CH+!DpgQ+sOH@R^Fi3xO+ zf_xm=p{zShL|R7H{Qc|KukXLW`~NwAG2XBOHJ7aXu+j&OxP4pD6`onAGsyT-Zq|A@ zO1TO_LY@8;{`~&HrZ;*IU@JnZwUh>zJtk;?yar2y*v?pSIx`bf8tTgy>ChcK8m@~E zNdWg|=jBC2f7%!G42@3zQ8vsiJv&ot|C4sF4-hy{LvUy&n^W7`UQXZM0pCJ1XmllL znKJ6zyp$htboG1*ARyd)-hPOk6Z_=NJDDriXSTJ0zbC0$?mz>Zh7E}H+G<7w`Qk;Zf zC?3Q&R3U8~12w{}DM2Ws@Qr>j4k-tjOPP}M&#jiFba`ySHqQ6R+sGaO1%A-uS4&r72iY zkooJ^aBPitaXKmz5}Hv1N}uT1LebC&*^~v+yPt;qoBW*yrgF-x9~Cs>D8*2UNp&Gl zpGI!w{K*B(njPZzB7~mBbTUS{0KB=9N@hs$5e+DlT$TWpvg9Z2RgEu*P|UP{OqRaRbnExHHX)! zTg6|4QYf9pN#a<-Tjw^Yj#!X_@ON#GZNV!`8QEZUU zpL<@&e;+tn>*4SyC^~J9N2*{SfWla`VL`1tM=5C__@O7+TmSNqv>yp@3B-1z_S_yW z&w`_!K^fYe1R!XbXt-38&O}5+!PPF;r_VcQzy8iw@9|k$Ct44#Hj8U}CSsRu=DzDz z1E{X5|g|La|LqOq2<3`IMbUF1!9cx}*H=&_@Nyq#F>~9jr%x3TR(5CmcI%sGoaO8M*cAL z2_GR08MqK=T^vEPQ-S(Yv7tv!dL%K zj&-rLw57S)l8{PLF|s#3fig|BV`LECw1!E5YDe&1FkVy$xXH@0L)7+*w+B@!nBJY1l6F!64Js*32M(V%n;6r8rZ@!|h8h>nKwr zB={U96BDT|P=^?m8gq_F~=>Y{Ym3Ni$IgISYJiQx*M;!G|tx#YpJ>4ZpomeLJKNa751;5&EbNAuTe&R zxNCdDh-}gPgah8=x3uJaC!i6i;yyN(Ce|n`e;Hx&TMiSUZ7Ex{8^N;p3|W8!p5lCE zk(kQJuW{mmp2R9nt1Y=y@0_j>>4<{Iy(Mw!Wo%WLZc5!0M*p@XAqyNla1{=7oT?> z6+|k)X9qsh^OP9&Z$IxRC-G>B7HFpciTydW$0#Ls_XI80!df5a5)0fFFIY#e-pfGz zqGzaTA8sO9sO2;i8|P?#I&0s8N7Zf$bcV~zHCd@yY%IP_6w<|y3wkGCy5+9+Zw?Mm zhERj5ia!q|3sHEwzcCH1!?O!*ZB+)yh)T>;V+p2v{u8e9aO*&leLlFIZWw zRibA#YkZ+9VGs#~CUh&&Dwh*>IM-zc&;RuTWVYB(?DaHxIDZC%gW4R-QD|b~*oFHR z>BZxgEx^vYW@e0wNe{VY=gN&)@d+|^1NG)- zAO9sfuuYGSzO}h@Z3e|5{aPrkX)d(*hKn#qZk8G-F&A-1m4L`xsj0DQW2WDi>%R|KH5f(1h-W2C7C+9(W1%yG^Fs8Dap;j<5hWI1=C}5y;(kA4)7+y#cKba^>{|PlC;5+HYFlT{J z2soV&BLLRNQ1H}&Kvh#qYqcGf8rN6Fb*{z)BblY0mKF_Gx*DbfN;#^7JEc?eE^P0SkCK&P*C18KOCSx zPs{3gx}P7;;0b%YTI4p*gSEcCF6GSsVX4K({o(FHruWykNc!NEO9KOF}Js0@dX z_uIUY7m#*H%p^XncF%C7mzBMNMM9e|78~F86Gw+f3wDRb8m>ZJ0CuZK#aUemp^0<- z9K7vnI=L3}lt!^2CXxzsMuL9FwEP#CXfYEzT&pnG`r4)a*~Li)*vfgg1F^Th3Y2BA=bYAY{L&zdKVY4~z8t?cNp}DMS{PQ$Q?& z0TnWqOgKt7vC)#avWNO!Z^<`3cMzGbXE&%oih0f7SZ^&P@-&Hs*XMyvyQHm1H%8Hg z;2KCL%TYp0plp)lbq)BC;<2QY;;e|#@MLVy+Um>U<7kCP%$go1`_|5f3vLuLy^u{x z=gk(^4a9d}O|bjMq=|A0KP)`};l}Z1uQsFTk%7Ox-YErIiBi5D_cooWq|ixhW2WT| zsE*!JYAav(51Ry>Mfmz|u)sko2G=2gJhxgi`vP3(*l#k0ZnOx>H_Tjs%MY3KXcINI z?~LEIO`3tqqwYLOQOeH(sA~?JRAbqqO!b_+#HW8=c??F_v-TwBR$>YiTCygJunzs? z1{nwa!GHTLICt;teuSIK$B-|cKi-o8ola%Of!>?%LqH+qya{?B(7H*bFZRU%{|TDe z#Qpy=>jx(orr5fxmgeT7xIOG}ez35hm@N_dFmGO6q_iK8ai;e1nFWwJH}YS!X3%o( z5dn@pH(%WWsI$RU3EwJ7+?0L>Z;jc>OZv9Z+6rm{fUew}9Ixeh8e5u<_!6*Ei@rA; z`Y!7-ozxWZ3Gv3WRdZ!#f6b+5$HF6j%CE1l(j>cwBP0#N$M)6b){pP9Dc%QLaPi(F z2>hEK$$DG{okp!z^_i4G%>EQdp^`f9fVk#ki5*TWTE3*+2W$}$FCL%Sy*l$z%}XEw zIqbkXTY-l%skRWmtF;+fzxMp<_&?2k_dnJD`~Q)Uk-hgSgb*1A*-3?$7TF`a%wt4W zwqr#hqd16=jIw8TStn#~<;dP6<9nU==b!lYLvA;o^YMHJp-jdRA+744H6O=v zC`J*HE458_=PP??U%#!BF1{Nk;9);> zyZ8+m;=dOY?84`Jvuu`sWdj|Aq2KeqAz?bw<2EXU`0y{wSiyJd`SQWsJRSA;-MCk~MDVuFYuK#Pmn0gR>9u&^#&jBGRG&WwsOzG`=Wh878Ji;2n~%-b(2W1t z`D$m~@==)|=f?u0zXP1hZTy^W;iSGe>&xDI8ft5QuDi9~!qVgnmfPyWl!}N|QK04> zEl4{)J~z2X-p{ruo3(rWt1!-3!i=iE&iLqUzC~7+)Sa=A70+;b+rS^U^ys7OK{Fx| zL4wJK6CR+=0uD7$=f%W(Dk}!pSdjOHzt$w_$u0_By~@auZ5q|~66P4jD*kc}YC;xH zEbTO5jp3uFYOMgUWme4paHx*Rgg~tSG?mqYVoR4rDICLln5^*S+4v*W`Jd;ZSZBIN z^~Dr0&4@T%YK~y3An3C4^73gwcSX`kdRLyIbKod-i~%K+cowuHN6*lul*KFksJPbh zUL%iM7`K$jT@=MqOl`E!lFd)(%q>x}T>DEc=qE@^RV^F^arszrM|x0A=1rjhblhJG z0m}j=3jtj5&4f}b*Nw$s=u~xotF9xOwEQ^q;#D0@xA@1GVG}*skd^=`2ROwas6nDc zelw`+VH`KsJ><_U2RQMdxPQwATAib_?tC*HC^VH<#TT3 zXi247utFis1Vgd4y{%p9=f&Zzq0y%INvz&hrdS~*g zk(`t?Yjj-uH305Y^}gs>6;>V|m13>vfBUO+9L;Rcp$VA!nPQ;m_S2D)EXKeI$EMy{ zCc2&e;NW0vL%p$A$HMw$6L(SIEJG7HBkjW!FY=syNNX!US@>d z-3_-t@R0|igHYHr+Qfw;E8c+L>+5mL#kJ5kyU(iNEuMheH*x?~z|YmSN*Q@0*p>a~ zJO)xa#a}~9pfY_QkQA^K{1ndl`D)`aSx9IoI@ZEaW)fA7yO6_43RpGYv35nIFK&W@ z$RzI5O0^^?3v*MwA5&)0~^NE(ioL7>NdS@MFp{@2_~RvqSS^bRV& z;0pAxne|aDru};?$oUT$?oPb`sukT?nw`gHdvIe;t85`7qddIO3vz=MP!Ev+)v zfl=U}&v0}1JR_v~_P_4``|Tz|Dr{q+`V(OsbO>9z5T z;pPw?66xngx4rz*;HS~SjX2s_LhEJUgp(wWeX&>L<4U+dPM++v)(ZeIMDW6Z0EoIf#JFmC}jZ-ZNi3mO>y(il|Li4$b0BgY}fZad)`6$B``?t zJ{NfJ{p!}V5T#wfnGDd2_z$yA@hSzawe>KdG$fY6CPW482kAd9d) zCi`K}Acz5JpLz222Ov@X6E7bzmJ?Z9*VGmM6ZTx0X%4o1bA-A?T%#S-_n>Xc@95x< z%+rG&44pzkax#;t&yuybuP<6>lX-y4kHTVh79*+fQ&eV}7dh)J?F{{xtOokp2}(in z{!5XLXG>*w;KJf?AwOu@*b1vZQ7AU&blsa|B101W0`O!r((X58A-q+tO6Gwc1H z%BmqoDD1|8R{3>$MKrm@55%gZ$r=g#ci&!nhzc9Gik{6)Hd8?}ifZI}OMx*_-M=Xk zJR>k;ZqKQ96}YLPk-Z0LJ!!js)f_WPD=RDaF2!XI#(eZ6^DCaKa2~%5^CmZEC%c?6 zG=@W-Qb_1T-If~BlX|@+THp3(;Zw4$-R+hX-}b291GexMg7U{)j-ke^{~j;#2}<@` ze~9a76Z_^=nU$Y^3)OB7(mZSjXC9Xe+0rjjQmTF%p46X(`p#pMIx729@+yh8i}v#^bdP)>gQ%WSSYZlg4KaB@n{ZUr@E@uVyshskxg&8-1(YRB0_-kCe-_O0L`YedV zo{)(M#B+{&KN8;gUp9;4?~0o4d$=-qwU^$VJ@D$V(_Nhg#`nF4ci}4Jz1G;nE^@py z^Y3EFm}7)4)aLHX&{Wfl#Td*vz}f`G#56TD4i5v8^)tT|(a*4Z=m=a9zH+)LNkL2q z*%TtZagddnIwG(M$O*)}g84jf2x|I4YM@{^948dt0*(VTelEgTP?b7lG@Cbl3q{j7 zUW?Q@OamW>oSoI+ni?clXtycWu&BcGHkU?oN%vz1&a8!+dzD`7Hf&g!>g$ICwTJuPhDCZeu%i7rp(_%4T&J+``*&7Z*}XTE zS_#yw4(dQS!+x>954j3A27cVU$$RArYYdyrqulw=FHVldefMga<+donRf62!Mc{wK z-@=XndEUou3rd9X8wS_cY`Ez4bKzH$rQDGjBdJMYSs?G!seank)y1rIYTEsF`y-Bi zGJ%4)?(`@P_e)f3*Xq5z7bSEKTHh)90wK^8te61Hd$b$dm|)F9*uAgp za}%|e9$0MhS>@jTn%%I@W@7wwXlS@qZ+dkV$RAw(MBjMli^VuiCWzZ_(PLSXzqqxL zVM%w}n=13&*+Ws$kxN(ad{;W3NndZ`NrLE=a8m*ywZob@Zc}=?F4?( zpV_S_bQO0goEqmTAI9nfA>Fy*ap331BU+Gcys;|KPT)V@Z&Z}< z`0E!D8T0Vin}l+uBPWvXzfG~ei}6a(88dH|LH8HD@m!C-aRLPFuOJM>QIw>9+LOH= zn>)f+2mD?)gOpM##BOnOHT5EUmUb#P4{&L}Gi+{cse;bF#D3s1gq4V1tb$g;#)^C2 zy!4wX`jG}d`OCWRA^;Mr-rbl@pFh}S7cr`!&)eF@LI{5G;sw3DDQIl5tEo-~jTVZ4 z9Ma3j*4p)F65Kf0;8WLhbd>o@j)y}=ZQuQB{giiP-tgE`kKjP6N9tguy3Cul`x-$S=k)NmH<$kb!3UkUA$5rY59Qu5c9uo| z{*gQzJMOHe(<`A7Hw4^ym|iTb(ogeot~*y{WtrdioUlhmnyBX;XMc5UxW789tI_q} zDrY{1aI$Ii(Iq7_d(BvOY|q$Q00S#)lvu;@?d<@24WMr|JASS&9#h=jpY~+yf z=FF$_a&tfK^=4oQ{Qv^`YTmyayQ6fxLD>6FQ5ZR2fTwoX?<+OIuGg!TBgP=VKod=i zsH(n1_T7}t(CJP+EV$C~ldya=8W;*!{L@P|Twd({9>$FpCeL;J42I<1ax>w96ks=~ z@78bS_061_O`=*$9}Ue51zf1mIkXbYtEnL?e0V^R1G=R42}wrshR69!0)}ruhNt_Y z+=YghkME)UpJEgFS7~>I4@~S1%d8971;9Rs>%|5Qr_TY+tpqZqzfyvr7nZc`{U$7F z8rs;{h)e$g>YwV7DwTbs+;hsJ6vSR^xP&#cDAO-?Joxk?d+P27SrILhuvwYu6+NXH z{$PUpAEv^A8gl_~!U9g;@wgiQs}E?xDLEdj7BE>+%(usM7&$j)AFbEh4I2+!{CFqX zs{f1_ty9el;m-s8z7p{(t>=&Bb*lUWT@Q3y0(n#Mj_d2!X=!L}rxH1Yi+{!zli3Rv zG-FRZspZuN-@&26okLHond`=buW=uHb!B@!0+Md@X|F9EUj{cGGymP| zrf)Z|MBmKDv1?FpUOO-RsEGDRt?o*n4!Y%NVJPT z>HM$AsF6m}rdu7a#}uf>F9@4mdG6v??RU?UHFV!zS2r`xzG<1n`i6q|Zi+0au)d%0 zlOF#|K-e~4$gkZv8RK%9KA~#D+ur2fTH`8K)03=p~xzbQL0D;$pRS%bslVzOL?K5bfnzNQ-nB zelj%K33jkjF1IMQ?{M5#!>@Jg?-WN%_+)g0kdTx6 zawa4MGLs`*w!P^z8FOR|?Ds;397Og1H5FXkIXJ+X8r#@AaOesR@2{dq%ctowvQnWH z^K|M9>9l_>nY^c+<8~dn3}FM891bN5 z4v)OG^!7eae33PTrgAEZQFL&$O-FmZUY_l}|4}54LjUlm<<~eySMwp_qX-)Dk!KPD z1h}IbYAXtICeg62obP|+QWMgA&%xk*`=g!aveB>7sUz_@2~rfxnas1<;@Y)GyBS-B z&2pNzrH#UCtw|?(r{I({QnIa%a7N{N+{X~pdY}0dsvGnfJcDl~ zHAc#wlmGl#VZOg+61C2LSqn4+v@kWrC%gx=VNnUfbhzgZ+w`>RoB0VL)#&)OzJG)ihy?11)!~-)NQGb8T=INx9XS>{ zN9T-GG9Fv`0!sYDxoT|VJEZX8-i@?>atR3&^FpIXZpe(1lpZ{?1`#+kn1rfoVJI;( zlbiptr^@H4#ek-z-Pzn7wQzB_9Hj3jN0a1Y6N!L^(}sz3NNdI`P9mTaW7W4d2_lLI z^-A{>_#xxu`RIEMND%#Bm#^0xVg8b7#&Nc7Sg6g=qrU1Ad^RZB%hTX6-gT4(`x+Y; z+^LU;u`zqY(Z zZnb?gGv>@OH}MM%7K@FDjZ^_48a7{#@6C^|*56-it$j(wto&YBr3A~32(thDSliMt zT#M#TrABR_pZ+)&YqF;7iPXDi2u@_%Q~|6Mrgnq*uQb!&;PVDx7Z>3uvVe?OVli)X zaC8)UidDAJ@wOeW%i1l!Qqi(x9xcT! zTnZqHsBWBbz(bY=g~5 zp?j!@w{~}1a9Ae~X*UfRXbHE4TUZu#K1NYvAad{`Ti&=?SxG*ae7tITell}`D^jj_ zxhF$DS$c*$*?Q2#YiVxD>C(jW#anSFUlWytf$r@OWt6D=34+fi_R3T(AF7WebuJ$-CF{GLYkfxa3`wZ}Bg#wo7b+V)5>^q-=qE8!3?a|7@}ektrt<=zQg`xO`>~Ugn{~|{-k)ezhp!^3k9*l?%)9Dc8yixqfajT zI0^VI@$2Mdt6z63y_=U*)3tPZCX}e9`>EJFug;kNQ0JH)A|oT)*c*3_?BzzrkK~dQ zQ_>%Kq8&H`jtrvdR z4V+cnlIQQ*A4832h~r9IUAT2Zyh6(Q&ZN!r;c1DtjXX88s^32UdwW-cjip~76%SYAoswN60ZJTqjqR%30 z-aY>#1b%ErsIX;;Xm?q%xTxN$_>IuA9_jIYgc5&E%bQ1^O+!7Dj=AAkHtlF~sX?Wq zZd*0@sdDP3nH?#@e5l}!!S&TRT+Xe@`D)gk5Btg9YW=@USk5jHal#m{M2a6p!_(=LuT8A4<*Y z`a$_^J&Q1~huDdNT-4fJO{22vo`nTZR3Bru{^u#o{fKrTx)LWeXO36$*VWaD!^Kgv z-P!LU-Pkj72Kk={+)}f6`>db>FLK^eN}``2(`#Mzjz!R>G$IRQWZY%*6{CS>jEIV2 z%utmob{sAi6p|w^2k_;0lz98b99oPgclsinhxqt-TQ_C%`wyqXJz{46F9s`p5xrIP zJrp};eLsIptcq|T{KpzN&Q?dsZ)WSE$gowQIp+T7A|1;)G}uyphHLn@*3qelpHi&x zUR(T^wNoS97q4jK3BJ@i2BpY<<+ZN%bDT%c(d`jLh=J|``Qm#}ec8t;EI6^zQWM=u zAds}}`Q|ZfB7po|HlgT4aaku-1Q~3ntf4{lVM>Omt<4rj?Pbts=`=~th_wTOR5>-0 zK+tE&DM;<`GdnR&&N%=rv{NoA_>_7 zZ2a2=r45`t8XT@8b@Xm$bm!6#!9R@JY2*iDBtn*qT=LtuXd#4Qq?7Ac0LH&9p?HNp z*5c+b9vY`eUc%8o-&Gjf(v&CnsdVIZ#e%2haNt8IN%q-JEij10#$ z1)L5LXie5y?XOLOpVGsV11KtI=XL*ZgMM_^itZV-wOZ=uJ1`)eLq%E2#uMGLA}1qj z^-F9xm&$>c5XmZZ<4BrB_sxn53tPZ#(e-5455EXv<altFJ0)6T z;@aG!y4^kbo!^Pa#Z?Cs?Qv}AM1kx7h?DQ!N}seY9lfUEWqeh8I$KA_37h#vsn3lv>yye&D7kx%<8t{x!CtWscL;~cx;R5fx$+RYycyzYHAxn(rkSF$( znYgqe#`w5sPhMTqn6&3z7GaZE>D{)s7us7NN1vXMG<9@nqA0PE zot@HEs}KW2F(VitDk z4kLgA^ZF-puU-TsOs_{>$~=ovN?B}!SkK7Qj=hR+h6Iu0erwp^(=S#mkN%wj z-RiS9EqW-VNH>mL#!u!%6<&G(o~iELJ8H%kRFpie!BDF!94^oucmiA^xW4&TXc@|VbBam`qm8QsKI|D~Qnp91bj*JHf_m6a87{jK^UwdzDf z%WP9C>AdR(beV+yT0Sl7v6<#awmd}1_Y-VvY(#h%cD{fbQi9 zsS0WdFBf-OVO}t9S5^4Gwxhd$Rv#(DL zYRu*zKUO`HFNNek`B(8QMZumo3XRst%U_N7Y_^+ud_3oXN>D(T;#swUfc9;ROpMIeHKDYlrUEvJc&zli^hGK1jh)>kphL zlLVU9lUFh_gqV_)NMno!9~c-!fZ7S4VcU%+a3=AE9Lx90-8jXm)t!!sbe4%AH9aVf zdCD)fh?tgTkep%COv}^6)K+HNE>lTK-l1m>lqZ07jM59H~{Wek>}Y7|2tM z9vr-cx!*ctU|DLda0RI*-p(8J%z`JAXB25;kIce}G-D)wGqhx#)%!mX4#nTX= zQI)zZDM>fqF&V73)|h;ln{r8Py*W?!eK7+EhQ5*ohnR7pKc!{le00G)9>+)nw%8@s z+cx}{JT!0Jiomg}M%*kitUgC|;{X9A2>@HKEh&YdiI>jEf#I)Y{on2@7pWwr!%0@Y zdrGvmwHcJYkUMvdkeZ82H+hD1(;S#>-t)V|8@=+*ElWjo8GKRQvbAlN<*RT6sY*5+ zqF=lU>mw%i`36E^OG_fJoDwp;mMpdK_}7CR_)c=-1)eMN9)IaS+6hbD?J z&gki$n7UVfvna{YTS?pWm^7)!m$aTT2VTbbs(1DDv{e@B^If|}`)tg6kQ@=>{RI+5 z^Y05t8EMp^flo-e&Dai1E_%a ze9Um^;QjZOXP{{u`YHqt#GKohdZTw)XMc86|` zYkC6&3}c601v3shfeEyUyjO${_NCR-jjtz9D^~7dc^usEvoH4BxB2#xeq&d?igcohai>h{i5e<=gs~s6u^Wcw9KUMkL!{4+AdF$iSI6N%_p3-v z@?O_Yna3h;IV+w`JmKZsyuYC^RE@P+6WFd31JnD_dIfo+DJWY(c6{ zsG68?{OLPmkJEV{dp~bWW6>^@j-t}&6U(wjc*L9pAqRq;D3q-wx;@GK7WE{C0W45j z5-y=&ccyd@>=kV2y?&vlY&(<)Zh(ti9c@x@veL7Xm*Sfj#*hF+8;ub6+Z)U_Is2 zUbwoKU63Y(uv_?byiRIEo)RdGjH3TnA7)E99oO%yA$eXxYsI2nSj=kqmlRgWa5t;X zp^*xqNOOUT6J~Ml9j3Ft1>dhDeBhc3pgDRsU5dqP!j*)-E1R>LTRjE1T^6T{+u~kp z#$Xa2*^4dsEb{0dGXixstIw$jIUB^+&ha~js+bKMPc78VxF{Vy?AT6P8ponO94`Lv#i*=3#;0Kn65@kM=7|G;{(02mko z+8URW!;cjT!HsREvqP`&DX2wtP*I#Bl-I-JFc$u0pzb6Z`aGJ&@J7Q^) zz)HAKG75@s;MF7X=bbM#r_R3;y1rL$-b99yGtG?;723s{$+4uLyl=Dd)kQ_T>sM~1 z;IOj#_dQySsQ(rUZF+ccFw>q!Yzc0rcuqxzS_H4`A{hGHcAp*NlcV4Yse0r?b7rg3 z5hgSxmW>scECl8^t;}b!1g|hgJ6ENDg@B&|{usR6+{%zQ>^?FwLPP(A^L<}hI4qIs zi@3)$;R>w|J;z$82u`eW<2hJ`wCgCIUb1^AmyCD$jFGw6Dq1!kuNh4d-*2UggG}004J&4bKIf zu|?k)HluQO_F;Twrv|m>qtAxGg1!GLEln8N;U}Jxl>EL{UO*t+GwY)OD{j~Pn#R7Z zIXOW{gp;c#xMt(L)B-5jWvQVB#I3cn$E}wPY3O#Je92S$D*!O|k5(1Bo))(yZ3bj| zb(_2-_EGeRid~zLDq%oa!flk7l(bNQ^Ai&TjNpP+66`w)94?}}VebicvaCT~t z?lmLHKWIu<0jYiyZn6gD4B-u8_pG zt738JXW&2aWB8s6=vuaf?HZJOUR;q*!?9B}Roo)}JU%cmz=63lL30tsw9HJGD0oMN zVdj}er8g@`==sfjMUQr>IfqU5%>dWKYN=bvE|!2CeY}hX%!$D!pFU$jNR|X-eXF|X z;x#&|;1wVPriP!IlG*ycihKp>5Fl$PU7ee5`%jF==M4cNj@02j2eE0s>GWiz=K4i2 zstIp#HAE%k$+gI`SyzlUFmcSS*<}g~-jMb@Z+mQoh=Hp?Lg9=0JHgU5nfNOGh3MSe zyq%1!Oj1Th3@EWIAs-p3b|)z)z{LpCFuNcUwi(Oimh*9py2^wm7C?CvZT>BWn9@X% zAA*{R8|k$c-J3zzFULazO}mZ#eWnbJ;(Mm1Q-=f%?gF0cW0Cmqr*;0|O1{NtD~G(l zoB*=*e!sGQI6V{7_61qfb2H%katz&eWw4_Hm>G^l0795A^66n5O8)FiOW{Cs@?RON zrW4Rfr_NA6{qLJ>nnT4XV+7@TJ!Qn8RlS27d6`i{ zLLwp}ljm~<6mABhjO+?1>OVWEoIEa7SBX#51$s)sENc}8BAV*q-n^{1E9mIx9r6oy z8w!LU2s3m0P?v#73F_oU62H3?c<+QVYhfRzDGmImvLKQa6^T5tw&9&jkImMMRZd!J zwu>nwvXZp4d@7dv;TtFl?qiji_-|ak9D3(~Sy>({n&S@`4gMei4Ku!aHkJtpDaZmj z#=b=62rP?bK?dFt$8~1qZEMXdEJ>HAJ3xm+J|Rxjgf)K&qo%-d5fzk>Xe1>l?0CQ| z8*nZ#4#zp?1CkiKp@QqF*B!%bdeX8Vm)qE}V(GQhuB$;m7+O0GjjNzf>FiMqf&t`~ zkzuM9(3w$RBVBmcsp0Q`f&CO@eS9jkah!?2| z&HrI1g|RQUxgZ(VY$wGFqrwxz#s_U;NYYg1+j;DM^3$uRjL8ioTeE=7L{LOTT_uPR zDknjgO+B;c~<3glH;_AksSY(IX-YZ`reYos0?uhg$ROxg7$>TPQv3&Kv#WlI1) zf^&h4>?PQ=u@&f4tyI@P+_`frl+#NRfS*H8(~flYx;N`9s$ zCZbn_``$lrrF{M7&FSg;H%V`@z|0I(QG#N^nqY_Z{f994Qihe4ZJ$xcwGnjhZtZ3G zZ_G4<6H4cMtnx5(Vi$cgcO$W(bu2YTH2hNU<-GByX>ft)?4V*j=l~ElZxRIl!WdoP z;rx_D==@NB_(pO@hKVRL%$W5e>Z0V^yFtu^|d+|^h_lP116sKqy%s8_e4^{IJ~N=$}bMwxh(4w6-nL7tF=EC25O)t;Wluw>!!zVyI>@t@h{2#GF zI4^MiIU+`VpIQ~Q%ug7AecE$Cf%sHfXeHI}Q4DO%tf?u}K8X#|%%MLQc#=P}Q%DBC z{62*d)tMx`h?1dUVj8A(o0JllCJ20w;{>PRE(D{jwSrCM__js|^>9|unvGovo$A$? zXS3#1MxTBKW9~#OW0k$`!<+W0o?oFYNCHu(0cUTuXd>u6C}+IW?u9XmaD%8Sm)JEJ z<+{jc{*)JChE)uqW{@yQ={A)be|kq{J+W4i6~_qWubs~K4kj#r2 zh_DDN2Txe_EANYgMv@}&ca6}@iz|Wu;g6AA=4$@vX_23b!xg)h=TvHhlWJd`r>BO8 zhyO_vD-d%(LQ(PLn69v=Xa!G{W0eIGx}LDMaw}0}Cc`Z6WH2A;s^0l9;_N7JKyK!+1fBCoryth(OuI9B5!?RF6?U(X5>4yUSNJIegE2gFO4}fWeFoD?SktoT126o zcLA1p)6dY*FayUuCuf&QhfV2v^7ng{yCAv48$2kK$a9!N_0u&A?rBn+rhR864@xGHw=mPuChz;bxx5zo~8G9!7*<;?U^) z4NrLDCVVMJQcUa@k+~xChzFvP7$Wvn%wrD(rK@>1zg4z~mXaYJc+v|o7G=e?K7-gv zba?9?t!*6%b1kFtwLosHiF%49aRb_YB_xESp@Cq0e|2162pL7K4--wH{quUGrdGOu z3n^*z4^nm!0_6yt^qiXx;*oemu}#5oFV{BLG)A+i|>#2CQ_ z!{p*kvL=`FGnxpSMdNF}@)=7clGohS!)Y)NVK>)TcDfY7cI2@Y zvPv8F!lO#U#4hv{nsOa_2x+akM_lhySN#6PCPl>ZsXN0&z|cZmNpYV_m8d4NN}!q1 zZnju3zZn=V8Rp``Ou(GA&afFpun^2c#ePW9xk&Lm{_zc4kvNGYGgDLlYv3Y(8zsoI z7D9~V8RPR<8Ikx>T-+nkKu@&Sl0}KybV_mPBWs+jx@9>`hAYB=CoM(RpPF+1pJ9r1N#~fyi&w#=Koc z>PZWWn0O`tfoK<+*J5TromRLr1+>)%@lE E16UACApigX literal 0 HcmV?d00001 From 93877b7025f2273f913b5f0bff4f403a29ac449d Mon Sep 17 00:00:00 2001 From: Andy Bottom Date: Fri, 12 Oct 2018 14:35:59 -0500 Subject: [PATCH 2/5] Fixed spaces vs tabs. --- app/Item.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Item.php b/app/Item.php index 7fd0a551..8cda939d 100644 --- a/app/Item.php +++ b/app/Item.php @@ -51,7 +51,7 @@ class Item extends Model 'Lidarr' => \App\SupportedApps\Lidarr::class, 'Mcmyadmin' => \App\SupportedApps\Mcmyadmin::class, 'Medusa' => \App\SupportedApps\Medusa::class, - 'Monica' => \App\SupportedApps\Monica::class, + 'Monica' => \App\SupportedApps\Monica::class, 'MusicBrainz' => \App\SupportedApps\MusicBrainz::class, 'Mylar' => \App\SupportedApps\Mylar::class, 'NZBGet' => \App\SupportedApps\Nzbget::class, From f5937879df17f8376c98fe4af6c37b575fa9a496 Mon Sep 17 00:00:00 2001 From: Andy Bottom Date: Fri, 12 Oct 2018 14:59:19 -0500 Subject: [PATCH 3/5] Added Bitwarden to foundation apps. --- app/Item.php | 1 + app/SupportedApps/Bitwarden.php | 12 ++++++++++++ readme.md | 1 + storage/app/public/supportedapps/bitwarden.png | Bin 0 -> 4399 bytes 4 files changed, 14 insertions(+) create mode 100644 app/SupportedApps/Bitwarden.php create mode 100644 storage/app/public/supportedapps/bitwarden.png diff --git a/app/Item.php b/app/Item.php index 04e1a5e7..56cef34e 100644 --- a/app/Item.php +++ b/app/Item.php @@ -30,6 +30,7 @@ class Item extends Model 'Cardigann' => \App\SupportedApps\Cardigann::class, 'CouchPotato' => \App\SupportedApps\CouchPotato::class, 'Bazarr' => \App\SupportedApps\Bazarr::class, + 'Bitwarden' => \App\SupportedApps\Bitwarden::class, 'Booksonic' => \App\SupportedApps\Booksonic::class, 'BookStack' => \App\SupportedApps\BookStack::class, 'Deluge' => \App\SupportedApps\Deluge::class, diff --git a/app/SupportedApps/Bitwarden.php b/app/SupportedApps/Bitwarden.php new file mode 100644 index 00000000..2f42e4b6 --- /dev/null +++ b/app/SupportedApps/Bitwarden.php @@ -0,0 +1,12 @@ +zOL(g-QVYV?jP>kZY~b8JC$~V zKp%?< zKp?25aEK&SSj7S0!5F*CF&>d2G4X-Xa8Oj>^@tc~1UyFF0ICPo3p!Ei3CbHSCLWNw2i5Osi1~*T3U`AyanxlxQTcu^-e^1kr7= z^01<#HEuE3Pu}rko%lFV^?F~$iKXB!=OF_&(PSe1gwnKo zs)(bj zMLb%xTFIrLtKv|qvp<2LAx6I1AolY=iBGC*@n#?Fg$5*Fhcw5P&Rv7|FhRg!5jN&v z2&Zhu@p9it6D5jPvbn8tT>fXeP+~=}g=jF;QI_jYZ|-UESDK9#j!h{A)6#u=Q!kT- z>S-0lLE$#_*3&6dcG;8I&vfFG=jC#^O=)5oyvNGVA=S6JX2mHIS7=M&X`ixO-)tp? zd2tG+VfLAr5$}+cZvx~>m&72mfuZXC;3wj`Q4|SZbt)#j`U^ASKAoJk_qM6mCHxa> zyjF{mMoT%BKZC6%4>Y%<&fZW^8#+1_cW+H~^YE8NAaR9LjvQidwE5fL2bPB30-Tkz z1!H5)fUH1og!`u)FNn9mto9x{JQar_;^6L!w!CHL;0y;r(srcq)KM1XO!5Ywg?loL zX5hRrn05j+rX!at<9c$#y&Xm};3g7drHSVK=LVV{@O^m8N`p)Oj4tmxnD%n&igqZH z?Aknna3p7M9o2}_oLV@(0_*o?CiPmJSKDM24QFH83#iNILXilV*|M)v{M$BFjre0l z>>|}#yr9lk$B6~?W&kpElyXjdsA-N5|3PIUwwAjmIv!(+n^7TU%H6z2f+?@C}{9qiYAL(WQGz!KaMEAnk2>CXqS&(#H^L^JW{4NF4g>rYRyd(jYn>ne%O>4v!{$6KV{CkNGo29`jIcw!?&Wk zQbyHR%vkN2$}DWKiR!T;yjq4=UoCANKCcQ{!^u!shf#Z@8!)E1f~e4rRMw9z$E+!j z8=UFv2}%8Oq#bIgQg$c}KZk(3(Wa-5Or@!xGUIZ`$)twDK+}>EEJlz=nReS=UGNxhM-R+ent^>Y*>dQ+ao zC7@*nkKLo%QtYO6ZM)Z=3m1 zb#v5Kf}4ML#m8uBP@vu5kG?a1gxoBJOmoiiUB}HHc=0C70^Y5lK?^5hoCi*cGb_V# zEa2}#1w)6nBC9aYBmnaNSB|WT{522^a-}}{nqp(C02$n8Z2o{mvdQH1P1`}nYXE}nu?N7cFFV_ zou^b_(Tw{~r!1L!a(AFCER{d))4*DWB%hhWr}&feb9cm8xF~vyU5B8vfap8q{9SaI;9Noq8xQ}fGZmp#$L1H+3Xi?4ZEic_br zAT9F9*}mVAg^ZlSk3~}%NnD1Wve8siBx^aQurN`?xEvYK(2JEc3#PzHJ?z;NTFd3G zT2+L;zxT(WV_Px(mbopVbxo&_Ok8r4EbcWqM}hkTw6kg*CnhfG?TS%}T30zV)ua|g zPp#k_w*a>kD@R%L56a0A=gDC?ZlVzvO_wt3$H_L(bpF{Ku&WqzZdr79OsA@R^jfml z72kwI6Rmw<>vyZyWr-W9Eb}CBc|w`H?!FmYr1>yG)Zk(YbcMHgI} ziSC_Mz(Nof)4!cG#)IQ84EX!ZsR(gmZAaR8Yj3doB>a+FyfCbv;ewtwWqZM}fA?eS-&nS?w8a zSTrvaM!g=UeXjLpYLW8?ae!Z3?fWXNzhc$~NO0bpB_FqX@e@*daWLjNknm~!MXTEh zzHRLWevN=~7O~OTu>8FdS+&5s3BNor5l{wga zBmwqUUeZ!X5%VpAh`AEL@P7Rs`OxI9h?Mj?K|~nA$oNE|(j(+I9n$xXlJ!7fH*;#S zuir@L?3|+md8%@i9xcx_uIM(j5drFIS<;zL(#EUPfYC>-YR&nZB}wr@P1a}4`5p`7 z$)^h!N+5+vwz(H+{Q91}#upDCE?f~J4!QJCU%Ni};0Tb(8TZ}I&O+5LL)8ZJV%tlIDml-$>96)rb@3v7M&t@@|Pd==n61LS1qa;DxUAoJgEKxYX6 literal 0 HcmV?d00001 From 4369f1aeda0e7cdfe38d5554d23707cf19d72a0b Mon Sep 17 00:00:00 2001 From: dgw Date: Sun, 14 Oct 2018 17:38:05 -0500 Subject: [PATCH 4/5] readme: formatting, typo fixes, spit & polish Includes making inter-sentence spaces consistent, `pre-formatting` values where it seemed appropriate, correcting typos, and other miscellaneous niceties to help the readme make a good first impression. --- readme.md | 72 +++++++++++++++++++++++++++---------------------------- 1 file changed, 35 insertions(+), 37 deletions(-) diff --git a/readme.md b/readme.md index 590b75bb..87fb3b28 100644 --- a/readme.md +++ b/readme.md @@ -4,7 +4,7 @@ [![Discord](https://img.shields.io/discord/354974912613449730.svg)](https://discord.gg/CCjHKn4) [![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/heimdall.svg)](https://hub.docker.com/r/linuxserver/heimdall/) -[![firsttimersonly](http://img.shields.io/badge/first--timers--only-friendly-blue.svg)](https://www.firsttimersonly.com/) +[![firsttimersonly](https://img.shields.io/badge/first--timers--only-friendly-blue.svg)](https://www.firsttimersonly.com/) [![Paypal](https://heimdall.site/img/paypaldonate.svg)](https://paypal.me/pools/c/81ZR4dfBGo) ___ @@ -17,15 +17,15 @@ As the name suggests Heimdall Application Dashboard is a dashboard for all your Heimdall is an elegant solution to organise all your web applications. It’s dedicated to this purpose so you won’t lose your links in a sea of bookmarks. -Why not use it as your browser start page? It even has the ability to include a search bar using either Google, Bing or DuckDuckGo. +Why not use it as your browser start page? It even has the ability to include a search bar using either Google, Bing or DuckDuckGo. -![alt text](https://i.imgur.com/MrC4QpN.gif) +![Heimdall demo animation](https://i.imgur.com/MrC4QpN.gif) ## Video If you want to see a quick video of it in use, go to https://youtu.be/GXnnMAxPzMc ## Supported applications -You can use the app to link to any site or application, but Foundation apps will auto fill in the icon for the app and supply a default color for the tile. In addition Enhanced apps allow you provide details to an apps API, allowing you to view live stats directly on the dashboad. For example, the NZBGet and Sabnzbd Enhanced apps will display the queue size and download speed while something is downloading. +You can use the app to link to any site or application, but Foundation apps will auto fill in the icon for the app and supply a default color for the tile. In addition Enhanced apps allow you provide details to an apps API, allowing you to view live stats directly on the dashboad. For example, the NZBGet and Sabnzbd Enhanced apps will display the queue size and download speed while something is downloading. Supported applications are recognized by the title of the application as entered in the title field when adding an application. For example, to add a link to pfSense, begin by typing "p" in the title field and then select "pfSense" from the list of supported applications. @@ -92,17 +92,15 @@ Supported applications are recognized by the title of the application as entered ## Installing Apart from the Laravel dependencies, namely PHP >= 7.0.0, OpenSSL PHP Extension, PDO PHP Extension, Mbstring PHP Extension, Tokenizer PHP Extension and XML PHP Extension, the only other thing Heimdall needs is sqlite support. -If you find you can't change the background make sure php_fileinfo is enabled in your php.ini. I believe it should be by default, but one user came across the issue on a windows system. +If you find you can't change the background make sure `php_fileinfo` is enabled in your php.ini. I believe it should be by default, but one user came across the issue on a windows system. -Installation is as simple as cloning the repository somewhere, or downloading and extracting the zip/tar and pointing your httpd document root to the `/public` folder. For simple testing you could just go to the folder and type `php artisan serve` +Installation is as simple as cloning the repository somewhere, or downloading and extracting the zip/tar and pointing your httpd document root to the `/public` folder. For simple testing you could just go to the folder and type `php artisan serve` -There are also dockers and instructions on how to use them at +There are also Dockers and instructions on how to use them at -for x86-64: https://hub.docker.com/r/linuxserver/heimdall/ - -for armhf: https://hub.docker.com/r/lsioarmhf/heimdall/ - -and for arm64: https://hub.docker.com/r/lsioarmhf/heimdall-aarch64/ +- for x86-64: https://hub.docker.com/r/linuxserver/heimdall/ +- for armhf: https://hub.docker.com/r/lsioarmhf/heimdall/ +- and for arm64: https://hub.docker.com/r/lsioarmhf/heimdall-aarch64/ ## New background image not being set If you are using the docker image or a default php install you may find images over 2MB wont get set as the background image, you just need to change the `upload_max_filesize` in the php.ini. @@ -115,11 +113,11 @@ If you are running the docker and the EnhancedApps you are using are also in doc You can do this by using `http(s)://docker_name:port` in the config section. Instead of the name you can use the internal docker ip, this usually starts with `172.` ## Languages -The app has been translated into several languages, however the quality of the translations could do with work, if you would like to improve them or help with other translations they are stored in /resources/lang/ +The app has been translated into several languages; however, the quality of the translations could do with work. If you would like to improve them, or help with other translations, they are stored in `/resources/lang/`. -To create a new one, create a new folder with the ISO 3166-1 alpha-2 code as the name, copy app.php from /resources/lang/en/app.php into your new folder and replace the english strings. +To create a new language translation, make a new folder with the ISO 3166-1 alpha-2 code as the name, copy `app.php` from `/resources/lang/en/app.php` into your new folder and replace the English strings. -When you are finished create a pull request. +When you are finished, create a pull request. Currently added languages are @@ -134,19 +132,19 @@ Currently added languages are ## Web Server Configuration ### Apache -A .htaccess file ships with the app, however, a lot of apache installations disallow .htaccess files by default. -You will notice this due to some links not working like ``/settings``. +A `.htaccess` file ships with the app, however, a lot of apache installations disallow `.htaccess` files by default. +You will notice this due to some links not working like `/settings`. #### Fixes & work around options ##### - Apache global allow .htaccess -Find the ``AllowOverride None`` line in your apache configuration and change this to ``AllowOverride All`` +Find the `AllowOverride None` line in your apache configuration and change this to `AllowOverride All` ##### - Apache vhost configuration allow .htaccess -In the apache vhost configuration in the ```` block add ``AllowOverride All`` +In the apache vhost configuration in the `` block add `AllowOverride All` ##### - Add .htaccess content in apache configuration -You can add the full .htaccess into your apache configuration, this way you do not need to allow .htaccess files. -You can even shorten the content of the .htaccess when inserting it into the apache configuration to : +You can add the full `.htaccess` into your apache configuration, this way you do not need to allow `.htaccess` files. +You can even shorten the content of the `.htaccess` when inserting it into the apache configuration to: ``` Options +FollowSymLinks RewriteEngine On @@ -156,32 +154,32 @@ RewriteCond %{REQUEST_FILENAME} !-f RewriteRule ^ index.php [L] ``` #### More info -More info about AllowOverride can be found here : +More info about `AllowOverride` can be found here: https://httpd.apache.org/docs/2.4/mod/core.html#allowoverride ### Nginx -If you are using Nginx, the following directive in your site configuration will direct all requests to the index.php front controller: +If you are using Nginx, the following directive in your site configuration will direct all requests to the `index.php` front controller: ``` location / { try_files $uri $uri/ /index.php?$query_string; } ``` -Someone was using the same nginx setup to both run this and reverse proxy Plex, Plex is served from /web so their location was interferring with the /webfonts. +Someone was using the same nginx setup to both run this and reverse proxy Plex, Plex is served from `/web` so their location was interfering with the `/webfonts`. -Therefore, if your fonts aren't showing because you have a location for /web add the following +Therefore, if your fonts aren't showing because you have a location for `/web`, add the following ``` location /webfonts { - try_files $uri $uri/; + try_files $uri $uri/; } ``` -If there are any other locations which might interefere with any of the folders in the /public folder, you might have to do the same for those as well, but it's a super fringe case. +If there are any other locations which might interfere with any of the folders in the `/public` folder, you might have to do the same for those as well, but it's a super fringe case. ### Reverse proxy If you'd like to reverse proxy this app, we recommend using our letsencrypt/nginx docker image: [Letsencrypt/Nginx](https://hub.docker.com/r/linuxserver/letsencrypt/) -You can either reverse proxy from the root location, or from a subdomain (subfolder method is currently not supported). For https proxy, make sure you use the https port of Heimdall webserver, otherwise some links may break. You can add security through `.htpasswd` +You can either reverse proxy from the root location, or from a subdomain (subfolder method is currently not supported). For HTTPS proxy, make sure you use the HTTPS port of Heimdall webserver, otherwise some links may break. You can add security through `.htpasswd` ``` location / { @@ -192,14 +190,14 @@ location / { } ``` -If you are using https and things aren't working try adding `FORCE_HTTPS=true` to the end of your .env file +If you are using HTTPS and things aren't working try adding `FORCE_HTTPS=true` to the end of your `.env` file ### Self-signed certificates and local CAs -Per default Heimdall uses the standard certificate bundle file (ca-certificates.crt) to verify HTTPS sites and will ignore additional certificates placed in /etc/ssl/certs. If you wish to use enhanced apps with HTTPS sites that use a self-signed certificate or certs signed with your own local CA, you can override the default bundle: +Per default Heimdall uses the standard certificate bundle file (`ca-certificates.crt`) to verify HTTPS sites and will ignore additional certificates placed in `/etc/ssl/certs`. If you wish to use enhanced apps with HTTPS sites that use a self-signed certificate or certs signed with your own local CA, you can override the default bundle: -- Create a unified certificate .pem-file that contains all CAs and certificates that Heimdall has to verify. For example, if you use both LetsEncrypt and a local CA for your internal apps, concatenate the LetsEncrypt intermediate CA (export via browser) and your local CA cert.pem (or any number of self-signed certs) into one heimdall.pem file. -- Place the heimdall.pem into the container (if you use Docker), for example by placing it in the path that you mapped to /config. Make sure that the Heimdall user has read access (chmod a+r). -- Set the openssl.cafile setting in /config/php/php-local.ini to your cert bundle: +- Create a unified certificate `.pem` file that contains all CAs and certificates that Heimdall has to verify. For example, if you use both LetsEncrypt and a local CA for your internal apps, concatenate the LetsEncrypt intermediate CA (export via browser) and your local CA `cert.pem` (or any number of self-signed certs) into one `heimdall.pem` file. +- Place the `heimdall.pem` into the container (if you use Docker), for example by placing it in the path that you mapped to `/config`. Make sure that the Heimdall user has read access (`chmod a+r`). +- Set the `openssl.cafile` setting in `/config/php/php-local.ini` to your cert bundle: ``` # /config/php/php-local.ini @@ -209,17 +207,17 @@ openssl.cafile = /config/heimdall.pem Restart the container and the enhanced apps should now be able to access your local HTTP websites. This configuration will survive updating or recreating the Heimdall container. ## Support -https://discord.gg/CCjHKn4 or through Github issues +https://discord.gg/CCjHKn4 or through GitHub issues ## Donate If you would like to show your appreciation, feel free to use the link below. -[![Paypal](https://heimdall.site/img/paypaldonate.svg)](https://paypal.me/pools/c/81ZR4dfBGo) +[![PayPal](https://heimdall.site/img/paypaldonate.svg)](https://paypal.me/pools/c/81ZR4dfBGo) ## Credits - PHP Framework - [Laravel](https://laravel.com/) -- Icons - [FonteAwesome 5](https://fontawesome.com/) -- Javascript - [jQuery](https://jquery.com/) +- Icons - [FontAwesome 5](https://fontawesome.com/) +- JavaScript - [jQuery](https://jquery.com/) - Colour picker - [Huebee](http://huebee.buzz/) - Background image - [pexels](https://www.pexels.com) - Everyone at Linuxserver.io that has helped with the app and let's not forget IronicBadger for the following question that started it all: From 88e607533cc0202d7a7eb7b877f02a4d8ef10716 Mon Sep 17 00:00:00 2001 From: KodeStar Date: Tue, 16 Oct 2018 18:58:33 +0100 Subject: [PATCH 5/5] Change to multiarch docker --- readme.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/readme.md b/readme.md index 87fb3b28..a658c2ce 100644 --- a/readme.md +++ b/readme.md @@ -96,11 +96,9 @@ If you find you can't change the background make sure `php_fileinfo` is enabled Installation is as simple as cloning the repository somewhere, or downloading and extracting the zip/tar and pointing your httpd document root to the `/public` folder. For simple testing you could just go to the folder and type `php artisan serve` -There are also Dockers and instructions on how to use them at +There is also a multi-arch Docker which supports x86-64, armhf and arm64, instructions on how to use them at -- for x86-64: https://hub.docker.com/r/linuxserver/heimdall/ -- for armhf: https://hub.docker.com/r/lsioarmhf/heimdall/ -- and for arm64: https://hub.docker.com/r/lsioarmhf/heimdall-aarch64/ +- https://hub.docker.com/r/linuxserver/heimdall/ ## New background image not being set If you are using the docker image or a default php install you may find images over 2MB wont get set as the background image, you just need to change the `upload_max_filesize` in the php.ini.