From dea87afdbc5c523dc6bd6165c7b7e063429d749c Mon Sep 17 00:00:00 2001 From: oddlama Date: Thu, 22 Jun 2023 00:57:30 +0200 Subject: [PATCH] fix: invalid space in htpasswd file --- hosts/common/core/system.nix | 2 +- .../loki/secrets/loki-basic-auth-hashes.age | Bin 1148 -> 1116 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/common/core/system.nix b/hosts/common/core/system.nix index 2ce9d5d..dc3e18f 100644 --- a/hosts/common/core/system.nix +++ b/hosts/common/core/system.nix @@ -377,7 +377,7 @@ }: '' echo " -> Aggregating "${lib.escapeShellArg host}":"${lib.escapeShellArg name}"" >&2 ${decrypt} ${lib.escapeShellArg file} \ - | ${pkgs.apacheHttpd}/bin/htpasswd -niBC 12 ${lib.escapeShellArg host}"+"${lib.escapeShellArg name}" " \ + | ${pkgs.apacheHttpd}/bin/htpasswd -niBC 12 ${lib.escapeShellArg host}"+"${lib.escapeShellArg name} \ || die "Failure while aggregating caddy basic auth hashes" ''); diff --git a/hosts/ward/microvms/loki/secrets/loki-basic-auth-hashes.age b/hosts/ward/microvms/loki/secrets/loki-basic-auth-hashes.age index d45e6635a876e1392704699eadc5a671e46ccfde..56c4719b40825e89b1eb1e9f66d7b6320fdf8118 100644 GIT binary patch delta 1099 zcmV-R1ho772;2yeAb&V8ZAC9~X-Y&(FM_)cW*~Fb3$`XVnan}YA;k`Lqm5mV{BGqS88H$X9_Jo zAaH4REpRe5HXwL$Q)M_&AVGO|M{jXibWKHXN^MU=MOt-vRev=|S!F?NSz~Zgbz*LC zGBI&#IWkpdMlcFfYe+>eT1ZG%MRrFuQbSrbT4PH{MR90Sa&Kj4Y&BUlRd#M+bX7+; zK|u;FJ|Jc>Su;gTEoX9NVRL05F-0RqP+lNFOF1B9D{M_9TU8))bwqtZL~aUHQcQ4i zK?*G`Eg(}wT7N4@R!dEBL03d&R903uX>3Sqaa3?^PDw#XM_NdFRY_u4bWnOxW@`#S zChujRV=u?GvHW!W$*a4UlLW`DlsZty(AmF`xieM_WU)u_e4q!Rwv6!j@~gHdqo z5+m1M|7Ing__tM;0fCi4F&eH$=RHfm`nxCw$rE7Zaev6*q+gEp=RbINLX^*8rQ>WT zZcadW{W7OP7=BEqXk9}v`|t;Ql6}EXQ^T#Vkc1n}R-L@l9K-=xdUDPB%bd1FDf(tN zFe&yV@NFa;)(6o%`YWXcu$hgaPoDN&C%a2#gMqa#z@1b;;ErW-z_Y;pWqn>LfZsyc zQzU9yFn>PFU$m}Yn2B-rBD`U)^NMz|;AEns8A zk89!Adj!*J>^`JC?6{W#gjy-6*C5(EyF_j`1AmzL%Sjqg;kD9Bm%B@rHpmBitLYh# z{^QP0q9q2UW--F^Gooi&0t9E+WZa|3*dGB;p(j8_Bw|+MEr-`gyGys{4SevfTm8a?|G)0`pOTYECqEu!hG;_K$N#{nMWugS1T}WAdefXJO8zZJRmjVR45$N;c+`)&Z Rf8B7^HO}wliM7nz8d$(o{PO?+ delta 1131 zcmV-x1eE*S2>b|;Ab(J3b69mtRd07VY)x-ybW=4#cTz=jY;-b3Ff?m6NKPB3UVMt^{Lvw9JT5d0MM^`yUW2oddU0-2QAuQTN`G-=MM79cQ#5WiP)Kb< zO;2oLPj5MTWO@o(Ze%u0V@gs+Qc81IFm`EIPD689S9mjWLvM6tG-+mZadb&XRyAQr zcXtXcJ|ICVQ!FiKa%Ew2Wgs>=V^u0!DLWuVHC|OEZwfd`a4&jwLvt%mb75IWN@8L| zMK&~NXIFYvRDX48dUQoiPj56fY)X1HNGmuBEiEk|NmOolMr~SiRW>+LS6Os!Wo%GX zLN|CvNJeopG-6h4N_tpDZ+A*;Zc8)@@xj3|FK=mOrfWk4ckFB&LihaCk#jt>R_F_i zTvr3ggWk2H>jN3cNddJb%A}lBP#FF0W$_mpq}e=GnG+ zhxK!+pcuI0xU!bzWvotZk!f{=cO5b`K)^9By!GSj(|HbJ_ zy94l|gOCWr3{9{%?Z&VZIv|jd+2+9VaM_~IXl8=5&gKAZI`ou=XJ(J%De=`KGW{LV zv+ZTilz)2(JZd@Al678Ce70J8fcIkx`fuVCq1cJ=+>{fu;aaMGWpB}v`%8#G1$$_-Wxtdef1GXYQFl zph-$|CYb31FC&?|Bspt+S>Kru$j_0qRq!d&*79Q>(u2`!Mdt2 zfQyxHS$XDZ9)Dgxbr7I#wJZAk-0fyxrhhA*)>?xJ4uX%=m4YJAg7m7=Z0#Jft7B?|yYX`c|I+s@a}TD_KQv;Pm};SKtHpeuaG_Xe&W~sX~^Jj84E< zRhN-ILh8pib(pE_`0>F0t;&LSkEAwkympm9p@+!VyD;7)&$m`52yg6lhWM?@Eo4Kj z%9|X(vxQxgvsO8FEvfZrQe0Z4-M~as37E)}GzP29rQg%n7`F_nxoq@FH0FlPBqn5x x0`Kyhz-@FgA1`>^8x3H{-(d8of