From 584adf59d08282ee88cddec387006f9c01c1f442 Mon Sep 17 00:00:00 2001
From: Scrublord MacBad <Scrublord@Mac.Bad>
Date: Wed, 22 Apr 2026 12:45:31 +0200
Subject: [PATCH] fix: reorder kustomization resources to ensure mas-values
 overrides mas-secrets

---
 .DS_Store                          | Bin 6148 -> 8196 bytes
 apps/.DS_Store                     | Bin 0 -> 6148 bytes
 apps/base/.DS_Store                | Bin 0 -> 6148 bytes
 apps/production/kustomization.yaml |   2 +-
 4 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 apps/.DS_Store
 create mode 100644 apps/base/.DS_Store

diff --git a/.DS_Store b/.DS_Store
index 3c8156587090bdbc50e35c685d3dc61fffff82f3..4fa5716f19ffa27c576c2e50425eadcc7fb2fdca 100644
GIT binary patch
delta 319
zcmZoMXmOBWU|?W$DortDU;r^WfEYvza8E20o2aKK$_bJO@)<mH@{^Nt@{>T4n*}+<
zST-wg^fE7I=ir#wz+wzi#=?-uPymF*$V!3Yn}AsFKNtX6aCMXYSdOzp^=wvQy~ijD
zH=r!IC@&{JFCD0uaWfB#7_%-XLlA>2gCm0rgD;TQW5{JlLA8ZZ38)xq%f`Z^jDpM{
vtAL*21`@6y4*?zhoq009i05Q~9u5wmpFn<Pm>kbDbu$;61S6?d9AX3jpoT~k

delta 123
zcmZp1XfcprU|?W$DortDU=RQ@Ie-{Mvv5r;6q~50D9Qqo2aA<3q%ssS6np06CvPlV
z&dkWN`M;1D^Td*;i`h9i1et;AfIxs7NVtOZZ!G-IJegm{6J#0#6U1bYWel6+dFC(!
E0QUeCVE_OC

diff --git a/apps/.DS_Store b/apps/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..d5031f9d8a67e5ebabbaa3afe3b549cd258af698
GIT binary patch
literal 6148
zcmeHKPfrs;6n|4HY(Zp!7BOnl(2EH~tBIoV;Id#0@c>~7mH?LBcBm`MOx@j5k&yJL
zpTMh$AHc+eXZ-+r^y<Mc;Keh(`BVNBy%J*fB{RP_^WK}8_uHMF9RMJ9qk0p-1ONkz
zz;rKGe-U99<%FbkPd6eFW6TD;;sxBpwiqyxgn@*Cv(13myJ_&ig$QWJ{<YC|eP4=9
z;=s>qMs>Z<KY8`QkK$tSJ4tn=&vo}0Jw~6g<~-v~CwAjTWV_*tXf1Lccx~PFmVDYQ
zo7rj3V%KLhlmUK~qRZ+NpH+F&<_%VjWUQkMM#jjL&5_;R$y>#Vd~t6gue7^&?(OYm
zj9lTy{e|*ou*LXmMLNN+l9YapZFqyqK{kG6TW3SQwzK(Rn(cfty?y8VFASK2L&JmF
z!CWpka&h$1(B&&-bJ%k$o3&7^bD9S{w1WmMn*$MMJ6qvwKBU{2WhtgFW5<7mrlF32
z1zLT2*tNJ*N1yCrhaB`#NGV&Xg?@EzV<Vz*>4?58W~+oe2<Ca@$3ADvt8(_3Zq2d{
zjx&lC%+-Y{TB2cucp|2>?1rJsYSi9Y3tW!|bIj&(%(qHDW+7HCr*!IW#b>p`gI|ip
zOu@RQG!qJKVvTHD(?|-RgLhJ2WSmh9npc*B^;o+YFb-4Tz$(0e7QBV`@BzNSH~0y^
zVW0Gq5i&-`$ppDgCW%F+$O2g*>%=9`ReY-bkgw|TG>{0DgNMBBge>5!hJC`n7wQlK
zhblCn0x|fgvyRvQBl;bE{d;hW#JEvv=*^&Z+?$Mbcw_Udizd$KJL?Ng)|W7lFmUP&
zi0?xli$F_bOQHO9V3oqAu%`tIL0$g(Bj$D6(%4dn78IgF5mhMBR}7+W4n&2c-O~Oo
zg(@6~oEgW_GZTG7A^PG$^3olMr7)=z1`-C2Gti})ra1o};vW9T{r`AS(n=Ue82GOk
zAn6%r#>SNN*?J;5an|OstYZ-({8|cS2v+(ymWnuvN3lpjTV5!Lmd2Js>_JI>1SAbf
Kl`wFs4EzCkhV7&P

literal 0
HcmV?d00001

diff --git a/apps/base/.DS_Store b/apps/base/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..52acac02595fbbc24a8e29ea9b2b134d40a75748
GIT binary patch
literal 6148
zcmeHKPfrs;6n_H+wji=Vix@T8*oz57tBIoV;8HM#c!013O90DmJFP3*nYz2>kA$R0
z{RCc3`~W5%JnIM0qgM}p0WY5M&7X#1^=6DA`;s@mw{PB?nfL4NOa}l+p;@^OU;==F
zDlj#O&2L2X3+<8~?dd}#atwDN;AJo1URP}5NEk>M`2QFX-)<lHz@Q2tbbh~LODLdT
zJ(41q-Vy2TMh*R?zxNt}AI16n7t+(4>gyjc28<zN(|N*oo!E_=QNaz@#nTGsf!DTO
zZ`G%}B{MU}S?v0ZhBCpgPz>34<g*IjE$}9*L^9V=9Y)$nm&}QSgP9xoX)Av?Z7J*a
ztviQ@X(OAvc6Yh79n=|rAy*6pcP1&r8r$#^jgET!@{X>Dd}`P8)im1`r3Z)344)k_
zN5{rTGo#sTcH-RR`LPQZOXj%embYu6Sm_)OcvuLUv}BG%Snooav!#&kV4cO7?!}J(
z9J|JTNm!<p$H%Uf{RYNljvaE)2O*_wy%zeF#cDO8ak0Z*6SI{=9t2A~@?)Q~wGBCY
zOzR7*%5g@qg2jgDidJbDA$H{y*W564S&bI<Hv`wB!6Ga0IOg@Dk5!13%PF0PTlQHk
zckjF6F`cuoD9eOgn_45&wltF5hv2oeR~Tm$la^FZ&VHyv448sha9{(TK?`2N8+Z#J
z;WK=LA8<s5$ppDfrpPq8NoI&mX2~*HCtJiNPgQ<T`)9tS$J0O}G&+9f9VcV~XEpSS
zjDDzt3o*X>KJ0ZIUgG6{huZn_<KyWPO_?!ty2?tbNf<~N_zMh({lP*NXlraKlv@Wj
z@(O^MLbnvO#oj4$ERD9tmO|`7Au1J7r4oI`ASxaGmX5PEwiK##AaZ6LN6$?34TZ?r
z(QnCcAhyD!O&CZRILSb-dNjrPfB(<-|C33{Q^G*Pz^P(@q~@J@an;vnYgcjNthG?L
tP=$!NmO`0=jXsX0A&%lnR4LeJ2?NpA*iwidl;n?qq#<b%2L34nKLKsO;h+Ej

literal 0
HcmV?d00001

diff --git a/apps/production/kustomization.yaml b/apps/production/kustomization.yaml
index 694eda5..43f3e2a 100644
--- a/apps/production/kustomization.yaml
+++ b/apps/production/kustomization.yaml
@@ -6,7 +6,7 @@ resources:
   # Neue Dateien:
   - custom-configs/synapse-values.yaml
   - custom-configs/element-values.yaml
-  - custom-configs/mas-values.yaml
   - custom-configs/mas-secrets.sops.yaml
+  - custom-configs/mas-values.yaml
   # HelmRelease (muss ganz unten stehen, damit die ConfigMaps vorher da sind!)
   - element-server-suite.yaml
\ No newline at end of file