From 5867a7b5b5f5ed15dfa098e37e90635c18d174c0 Mon Sep 17 00:00:00 2001
From: pabloFuente <pablofuenteperez@gmail.com>
Date: Fri, 4 May 2018 11:48:36 +0200
Subject: [PATCH] openvidu-server: CDR activation fix for JAR artifact

---
 .../src/angular/frontend/src/favicon.ico      | Bin 5430 -> 5430 bytes
 .../src/main/resources/logback.xml            |   8 --------
 .../src/main/resources/static/favicon.ico     | Bin 5430 -> 5430 bytes
 3 files changed, 8 deletions(-)

diff --git a/openvidu-server/src/angular/frontend/src/favicon.ico b/openvidu-server/src/angular/frontend/src/favicon.ico
index 8081c7ceaf2be08bf59010158c586170d9d2d517..0e2249ada68ec5cab2034721dc193285c27175b5 100644
GIT binary patch
literal 5430
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
TedKQfJ#jzGxv-xC9?I}vocwV}

literal 5430
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

diff --git a/openvidu-server/src/main/resources/logback.xml b/openvidu-server/src/main/resources/logback.xml
index 37a136a8..e7dc4733 100644
--- a/openvidu-server/src/main/resources/logback.xml
+++ b/openvidu-server/src/main/resources/logback.xml
@@ -11,14 +11,6 @@
 		<level value="INFO" />
 		<appender-ref ref="STDOUT" />
 	</root>
-	<if condition='property("spring.profiles.active").contains("ngrok")'>
-		<then>
-			<property scope="context" resource="application-ngrok.properties" />
-		</then>
-		<else>
-			<property scope="context" resource="application.properties" />
-		</else>
-	</if>
 	<if condition='property("openvidu.cdr").contains("true")'>
 		<then>
 			<appender name="CDR"
diff --git a/openvidu-server/src/main/resources/static/favicon.ico b/openvidu-server/src/main/resources/static/favicon.ico
index 8081c7ceaf2be08bf59010158c586170d9d2d517..0e2249ada68ec5cab2034721dc193285c27175b5 100644
GIT binary patch
literal 5430
zcmc&&eN2^Q6o2ox;0z74F{f9TU#+!9X2#sY&6#cG+%jk7$GvdHRGeG+hii#qr9`BK
zC}qeHvGgi7)2x{@AZJeQ2i$vM6vot;IU_|SM7+HB^gGY{zHsji5d!CRKhN_%yyy9y
z=RD^*=iDnvI!P}LA1>iDPFi7<q)9v)r#v6P{5H%@!6U!I(>n3LB+bNp^oNLalA8=H
z`-6iYNhVd-0{wN8JM<JF=6YMl2|ege1B!s5%niMrkj=nGj1zm(hn@lNTY+4l1#ki;
zMW0@VUJzp$vO3n?w4k6MVNBVFlC^BJf`i$T4XDRDGV~a00k(YvU;|pAOJ;Wq&GyZ2
zUt3|h@Y!Ddg}f34`NjH<g55gWw^bsnLD0PdY?5452;B}yV*PkeH7)hWQ)<9WX?_#H
zQX8A-ok}Bpoh#O08>*q}0bsYHpWyM3&HpH+LU-f&>6Fv>650J0N)zjuDZSc6C3#&o
z_*8vxN9x<4|6}uZ>X2_!&8_cgL&Ni8P1fJjXZ?H%g+e5UI_YNcD%N;b@b^{!L~|as
zb>5(}El$d8m<E2u{=Vq*yUh3g?=Spk|GnuC_tev3f1>Iy_@DizA(Ef{Umop0o%=3L
z^zNk@HLHP)NK~()6z}r(9R;IG5d)tho~Gi=Phk!9{FF1`IJgHmKAUu|POBE<&`n0{
z`~Z38{s^(X>5?n*o?(vf0mpJ*5OLQf2{sP^oM*-XGXX8nWQp8_iLj5h--j)QuU!4l
zcm1^+@nJ!H#Q|OZ7U$!lB*+;+9Dv+6c(yQ?ig?KRuwfJA2(}$O93#xR6=(vGv*`&y
z<lz49FZz9zHx8Vf+jAhBAx{7!ResL%7R34@aCTta26+-#0$73j){baS?HL>~xQi3P
znSt>+$PP%p-|K*(fL5#6->6em58#f9dwT`8?80~sWW3~-#d&2N8zSU^9Ld0NMuE9`
zU0^h@05}9(1DKb=<5>W|Bh~^3^C#l|mcS33GlBq1_=8XjLYX?ZoD}Q18pHgh+Z66-
ze$}R7*k=mX&IQf`8gEb?pMo3@gvTHA^LejSIn_MHHi(?nVsPI+KE`|0k$G@(@{ufk
za@hw`GHPh@;V|Gi<<J)CZTP$rXal$=$^h3zwu2?tXWqX!|Lz!|7;wYabP3=yP;798
z2;A~`Z<+j}Z|;RPr{l`E7wgNv%9Seje=L=&;4$M2a0QUz3&9I}NVS8x8JB=l&TJ_M
zay0hGd!GSphVPw_+;6D-GNeo+JuZ61HwU#lR(ANz@|s_a@`mFEIqTRxL7R>mXv<+e
z?JUxZx*lZ%pG7N>0j{Tk)4)w2h#25=kKmu+-A8Zu9~bq?9x%)HTC<GaL3XI%u>zBv
z<}(v)1WdH7#zYzCO!UcqJ;5j8e$dXO7+miGTFj}u8oyGnCVO|&BL7&yuk<fU?X>%i
zsKG{Z1cr3|jsG4FTb-HKRv4)`Ul+lTz4KX=g1b=NZ`i&g`KPG-4s~s=+cv*}R@5fY
z^4bx!s75b1H9NxVI(!8m80m{I2Zui`V8NdClu`E>xo&(z{#z#~@8WCVA4-dTdicT8
z<qz)fn15B3kv=a3KlU7T7fNy7{n|h8aj{Q_zUdkCP%RV;b%-9!ee(!qH_k?nX{IGU
zgE)_9e&!xHe~ijMmD)R7MGwe*U}xwq?D&g*zP6Xvqo-SnxZqxu_rFrz|6uZS56Ju>
z^&i{7;OFL!i&WH<-o?MF$|U?hxcu7wWwjTU;e#OEk^iAfw|%th58DIf&uq~6m3`ll
z+vv~sU(ws|L~J~V80GI655oUS{H<?DqSoLwvER$>_4L!<U!o^Z!Mz;vK;uuje+F7z
zH;PVQFQLlo#k2)+kKBy7RN~%&J1BC1djAF<e}y9dh36kT=byR+N)J3Dcsb|YEB|Qs
zKRW*Ke4qQT)SpS-J@lr3yvQx7xc{kQf1HPKzSyH95F_SzJ{)QIerT_?;QmF$f40Q+
zhx1WU@A*gJPxMsKtG?;9OzhDFKF;|@JoC8wS)147GUR}?S|ept8MOSzbw}w(vZZ$L
zztuaxQh&_u>-1#x4w~zmNelgx=yl(OK4W2E0;N`2gZaB-FQW#Z2Y(}YtARXVOz-?$
zhq`ST<vB}Zz25;x`vj}^Tk+mRm-Djiussv}^T0n3y~k|G(ctIagMZ`Ty4yqji>!m(
zi)i-rQ~rkcXLa|*I`Mr#?Y$f-H}m%b?o0kRPC_@yT2a&0b85DL6Me7fyL#Eb=7)Yt
z<+qnctna`%57RiqCFc1ItiTf3xEV5c5b-Y7nuT@a!Z~{y<30WkGz^lziwzJVMc>6e
TedKQfJ#jzGxv-xC9?I}vocwV}

literal 5430
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