From c5cdb7d2ae97faad1ef49a77b8ecc198615f2c93 Mon Sep 17 00:00:00 2001 From: Stephan D Date: Tue, 18 Nov 2025 17:32:23 +0100 Subject: [PATCH] +caddy proxy fix +version bump fix --- ci/scripts/common/bump_version.sh | 6 +++++- frontend/pshared/lib/.DS_Store | Bin 0 -> 8196 bytes frontend/pshared/lib/api/.DS_Store | Bin 0 -> 8196 bytes frontend/pshared/lib/models/.DS_Store | Bin 0 -> 8196 bytes frontend/pweb/caddy/Caddyfile | 5 ++--- 5 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 frontend/pshared/lib/.DS_Store create mode 100644 frontend/pshared/lib/api/.DS_Store create mode 100644 frontend/pshared/lib/models/.DS_Store diff --git a/ci/scripts/common/bump_version.sh b/ci/scripts/common/bump_version.sh index c179872..f33acc4 100755 --- a/ci/scripts/common/bump_version.sh +++ b/ci/scripts/common/bump_version.sh @@ -83,6 +83,7 @@ normalize_machine() { s#^[[:alpha:]][[:alnum:]+.-]*://##; s#^[^@]*@##; s#/.*$##; + s#:[0-9]+$##; ' } @@ -95,6 +96,8 @@ if [ -z "${NETRC_MACHINE}" ] && [ -n "${REMOTE_URL}" ]; then fi if [ -n "${NETRC_MACHINE}" ] && [ -n "${NETRC_USERNAME}" ] && [ -n "${NETRC_PASSWORD}" ]; then + MASKED_USER="$(printf '%s' "${NETRC_USERNAME}" | cut -c1-2)***" + echo "[bump-version] configuring credentials for ${NETRC_MACHINE} (user ${MASKED_USER})" NETRC_FILE="${HOME:-/root}/.netrc" { printf 'machine %s\n' "${NETRC_MACHINE}" @@ -102,7 +105,8 @@ if [ -n "${NETRC_MACHINE}" ] && [ -n "${NETRC_USERNAME}" ] && [ -n "${NETRC_PASS printf 'password %s\n' "${NETRC_PASSWORD}" } > "${NETRC_FILE}" chmod 600 "${NETRC_FILE}" - echo "[bump-version] configured credentials for ${NETRC_MACHINE}" +else + echo "[bump-version] no netrc credentials available" fi if [ -n "${REMOTE_URL}" ]; then diff --git a/frontend/pshared/lib/.DS_Store b/frontend/pshared/lib/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..bb09868d183b6d15c70b4c0cb051c0c389c75c9e GIT binary patch literal 8196 zcmeHMU2GIp6u#fIv@>*|0~9H^0~;2?j|KVz0s>*XEeN*KhHdE&g=KeVpd+(0WoLE^ zmXgNA7Z8n48vi0s{zV@|l*Ab2K}4f321)Qi6B7+Qm>5koCTcu0cNSy|4;o`c=O%N{ zJ@=k-?>%R}bMKy6#uyR>t%hM2h|=THct9sO^^Xp! z{1kwwmjd{O+LQ;Zu)f)oQ>oyMb{IMH}OCphKm3|yTdSQ$Zv z0)KVVi~8aWaZbZJ^g!r=$sX{+r;6p6%`~Q$suruo8gWl@ z*d9%~X}91c()ryU*JImerqoVnb{YC;N~vqJEjMjgdfrzsG@V3-`V336M-z6z(i~qm z$p=J9lu}Cl*x34}H4V|`rl#?R=-B$^#)jzXmb=HtC2@9a)rOs^gJ#aMk8?8+90hDz znOP^wZ8Du=8~-LzF;ueY^O8-{)Ear3Ixx6K82Mp194shzqq10lUOea?bKOII|n-PpRdqbqr_R+%w# zmONV?ByU=-vER`118FC#Tbf}V=p8jQcet-;I7Y_Qd#rR$mu4U-U97F2JMYejs&awr z3MJA0LdG~$Fx(?bOceb!qUu6;>Oyt5H`12Zsn!C8W$ImW zk3+_bN}3C|S-dI_M0i^Lp1PAyHH=@cvHf_ungxcxqcT z!?p9?p2;QM3srT%o3K^Wd_(5d&#hH^)jm=AR7@#~VHFL+KfPNX24bxAeq!8mz@StVaS}=*CVYF@#|lcmNI#;|RuZ6c6J#PT(XS#S?fI&*6ET!pnFar*Q^v z;$2+8hxizu;1a&ZH@JeU_#VIFH-QNdrV0^373K>|geIX`Xc0CFn}p3mTu2H%!X9D2 zU<xQ$0;x70WD4f1|+(ou+zptb7_KCa8)BQ-Rn|;Te=;Gz8 zRW?0QlG_L+(XCB<1-FN-=mnDtVOlQsn4|MGyW;bs!yE zBvRxkQv!DBGGaTFD$Yh$tQ09q6~SlaNOOxsv8Yr8?25I-f-~}ljS@wrQW>!ER>?ak z6z21h$d;`%(>X=_y8wTgeZ{V@@7ON{`01F1dMrUB!90O&*x>^`iC*kQ3j2_Oh8!%| zI7E;?ig6sn1Rf&5KSGdy43Fa}JdI}v_AlT?yo6WqDuMnjoWpF^o#2#usQlv} V0_bPkU;o`5-v8nK|KGU(e+NtSd!PUS literal 0 HcmV?d00001 diff --git a/frontend/pshared/lib/api/.DS_Store b/frontend/pshared/lib/api/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..0b1593613d25a21200693e8464965637089cfd6b GIT binary patch literal 8196 zcmeHMU2GIp6u#fIz|54|TWF!|2w7x}dyl7czB*_KO8}yx z1PB{FQymc6BqN%R=%}QjDXl512SlcbN(@MIk|%{a(R4&dC6(q3(wrgM8Bv9TaCfpx zhUyGyN#ik&KpcUo5fJI4vLaRPCs^su`aSP>d6IpeA9id%Xl=a;rK)CtrEa<@ejxNR~Hrd2W!iU8@)x*rr7)hx%>T^hP?pl56^* zZAJ=IP1Ulz>GbLKZR=9W)$JS3q>`sMtZq#u*RE+lb4F7en;+Y_FMHe>a=o+C6-2KC zRy)bHbJO|d_~kC?S5>0o*R_gYnqFh{4;;|5d`_7Tzk4{aJ=foF6@8*vUgwjO+Y6q% zr)UXzf5CG~L$06Y^@W^MC^@;n+Uz(P`#H-W2&|KVcpCJ*V$c;T4%lQX=CYiZd~2UY z26ox%CNsZb(&3?9oZYx^@sgI-wvJ8R+js39uYIVF*XwijL5h?c*hg%ucp&E&EZ4N% zqkSW`864{`+rFK5tX?-aWNG!tXydi><~J=!7=~21ZBS7iDCO-FB|A99n^iU3W08^6 z51DkPU7jg+F;)I4twXyv8%g7!kaQI-8qLUHsqv`Z>yuk5&q>9UzEbZ!PFJjPU(T%3 z*BE_HE^j#+H|0L<`g)_kEMu$jopN%c{)915@P>xSMV~xK$?3GwX*?r#ek$h&yN4}T zoN7$UdW@~cpnoh^w04gW%2a+u&hMc4@Xkmg%z8{a@QUKh6q2WthH*eFxY;yAN1Eo% zuQf78pUS^e>3VFpY!kNW+9kx*=JaxTLt$*2)2))zD03FDmGp($#tu>L46{@0JbRm6 zU>~v1*ckhUeao)1AJ~uV2K$Nq%6?~mqZ+lS14lg)Sc+v>juxy%8k^CHo!EoD$ePE40Mi7i{V-5;5A zeRh~DbLKWQE^1!3Vs-n*^es$D5LR$^Cz?YDPXK-h;qbmEVQ)N4D*fSwl`OiQS2EA~ z2>aGaRREaJinJeDtP=M5jEG&bl-QkoreqT>DV6e!DC2`>|DU&HHo18?F2 z-XQ?L9|8Cid^rh_J0=1Wm!<<`Ia72U&pk@A3Xmt7#oRq3P$e~*ME&1$_uv2TxlXJQ zM<9;C|2G1t?#^^~()sW9CKa`IlKQjMMH70Xl7=QU2o*6Omg7Wk{lk!+laVYP(NRfB YLhV2QA;5{h|I_`+8h`&oI6g4LKc_`5`Tzg` literal 0 HcmV?d00001 diff --git a/frontend/pshared/lib/models/.DS_Store b/frontend/pshared/lib/models/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..f9c58c74ecb848849d72d478deb76bdf7bdec629 GIT binary patch literal 8196 zcmeHMU2GIp6u#fIz|54&6j~@dLPnYZ(gl~lT8hfjAAUuCwxy+j>+H?|6Q(m|XLbt` zV%7Kp{w2ovB>qGnB{4>0j2QYx^hr|*yl8@nFZy7N`ecIV&YcDNLx?X1!`x)FGj4^bUt<{V*Gsa}PxYX*Xo2GF)zos-P9;qb>if7DZ1?DolFcJ(;@lFO3 z1QG-i1QG-i1QG=91qA4u&6|9O@4m1meS$!OzahZ+fsF2aCgSzMlK$0H; zqDJ?04v1omSY~56Dr6K&&lINz#G#0f7!cuPH@G{=Y%E8G6yXdaoFSeW@d*Xd>=b82 z?hIKWlRiNpL0~EZynJL9u#owzbo=?e;Q9r!eO?%LogmC)u0X1(oiTHkJWH;V59f~g zBe~EF%R#4EI>@zN-**eud$X|Lu}AV+W0&uRrsLVAD8R97ayiuRc$PoX>6bk#h+=cX zAS<$x*P2hCZf|c(8*A2O&ZLdg8`fmf#=5m_XU-^cQ_CY8_vMefL!N(Dq=NW$!0IQZ zc5b@7+@R7W@~TNy^SWBiOHu3e{(%E(UYlE?#qS;t9p4M~+ogbHUYiq8lG}^Ex2I%t zdwOIb5DT3xI6 zxn{w370nX!w5jcSe??%cXgkH=M)h%hpy&?`QHlX&kQT#Py;Fah&-|nrgu91rkFRP> z*n0G>`e1O(EZMt9h-I>NS&Z+X@o3M;!ozwjC-h5v%>>C)hOQsr58P~7Q6kOr7u4%H zy-(J@lWBV#ui_B5Y1;+G<(BLUu|pBIE!m9F6snwsY!!W>wy{IZX2a|hdzrn>&a;o$ zXKajp!@gzL*bnSScAfpier3P2zfp^N%z=gmq_7Oju>!4Fhb%Uu6Fad7dyzvg4x@k~ zY#f1)GAcNUQ+NSqaSpHGRlJ3F@g6?Fhq!=?_zIUWhOhBGuHY)J;X3}npZE(mBt=rC zI;l}=k`_qKQmd4f)=M2ymsq@1t(=1s$tQJ_KIM%-l`||VM>;WG<)pT3-F9zO&b8T5 zt<0U**tEE1`N}nI8?!e#B}iE1-R*3SC_I7q5rw1up2WTJsHoHj7gek1R$YlY>m%;l zCuL4xZC334&=Q%rug!?nrOQa&sm&B>sx>WBooP~}s;SIsg{n!biPhHiq(Ug_h7N`5 zN~?|4CpIa()HN3AsZ>`tJ!wpn|2<_tW?!&N>@piC%KprLVZX5(kcp@%7+4xnwG}JT zhDXtk4m^e)Y{6D+C(`z!5Bo8IL87chq&*4;B?JhGxX)n}&*MeBM6`Vkuj388iSu}e z2>gCb;7{=7Btq_(NJw0qj*yjH$#Z@0DA}q+o*0&BcSWE^cr^3#f6twN|G(>V5{CqV z1cCoA0;uiIb$8PG@AM|+XKjP7XXxUM`;7`2g;2*`_;_?2CwcQ9hIDVlwrng%g(M5L X|NMslH~Icg_a|%e{g3E)-*o=~BIYh8 literal 0 HcmV?d00001 diff --git a/frontend/pweb/caddy/Caddyfile b/frontend/pweb/caddy/Caddyfile index 7d7e91a..84a79f7 100644 --- a/frontend/pweb/caddy/Caddyfile +++ b/frontend/pweb/caddy/Caddyfile @@ -11,8 +11,6 @@ ######################################## (sendico_site) { vars static_root /usr/share/pweb - # Allow overriding upstream via API_UPSTREAM, default to the BFF container. - vars api_upstream {$API_UPSTREAM:sendico-bff:8081} encode zstd gzip @@ -25,7 +23,8 @@ # Backend API ######################################## handle /api/v1/* { - reverse_proxy {vars.api_upstream} { + # Allow overriding upstream via API_UPSTREAM, default to the BFF container. + reverse_proxy {$API_UPSTREAM:sendico-bff:8081} { health_uri /api/v1/health health_interval 15s health_timeout 4s