From 17be52b37706bfe51f0ab3c7876cb0669e0ebf63 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Wed, 19 Nov 2025 18:44:21 +0000 Subject: [PATCH] Move ponthirtaekwondo.co.uk --- hosts/nixedo/modules/nginx/default.nix | 1 - .../modules/nginx/ponthirtaekwondo.co.uk.nix | 51 ---------------- .../hosts/homelab/home02/configuration.nix | 24 ++++++++ modules/hosts/homelab/home02/nginx.nix | 5 -- modules/nixos-configurations.nix | 2 +- modules/server/home02/ponthir-taekwondo.nix | 57 ++++++++++++++++++ secrets.nix | 7 +++ secrets/cloudflare.age | Bin 1382 -> 1874 bytes secrets/cloudflared-credentials.age | Bin 1100 -> 1100 bytes secrets/cloudflared-credentials2.age | Bin 0 -> 1702 bytes secrets/forgejo-runner-token.age | 30 ++++----- secrets/freshrss-password-file.age | Bin 946 -> 946 bytes secrets/peertube-env.age | 31 +++++----- secrets/tubearchivist-env.age | 35 ++++++----- secrets/vaultwarden-env.age | Bin 1112 -> 1112 bytes 15 files changed, 136 insertions(+), 107 deletions(-) delete mode 100644 hosts/nixedo/modules/nginx/ponthirtaekwondo.co.uk.nix delete mode 100644 modules/hosts/homelab/home02/nginx.nix create mode 100644 modules/server/home02/ponthir-taekwondo.nix create mode 100644 secrets/cloudflared-credentials2.age diff --git a/hosts/nixedo/modules/nginx/default.nix b/hosts/nixedo/modules/nginx/default.nix index a7ec3e22..b768ed69 100644 --- a/hosts/nixedo/modules/nginx/default.nix +++ b/hosts/nixedo/modules/nginx/default.nix @@ -53,6 +53,5 @@ in imports = [ ./oliverdavies.uk - ./ponthirtaekwondo.co.uk.nix ]; } diff --git a/hosts/nixedo/modules/nginx/ponthirtaekwondo.co.uk.nix b/hosts/nixedo/modules/nginx/ponthirtaekwondo.co.uk.nix deleted file mode 100644 index f16e61b2..00000000 --- a/hosts/nixedo/modules/nginx/ponthirtaekwondo.co.uk.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ config, ... }: - -let - name = "ponthirtaekwondo.co.uk"; - ports = config.homelab.ports; - port = ports.nginx.ponthir-taekwondo; -in -{ - security.acme.certs = { - "ponthirtaekwondo.co.uk" = { - domain = "ponthirtaekwondo.co.uk"; - dnsProvider = "cloudflare"; - email = "oliver@oliverdavies.uk"; - environmentFile = config.age.secrets.cloudflare.path; - webroot = null; - - extraDomainNames = [ - "www.ponthirtaekwondo.co.uk" - ]; - }; - }; - - services = { - nginx.virtualHosts = { - "www.${name}" = { - root = "/var/www/vhosts/${name}"; - - listen = [ - { - inherit port; - - addr = "localhost"; - } - ]; - - locations."/".tryFiles = "$uri $uri.html $uri/index.html =404"; - - extraConfig = '' - port_in_redirect off; - - # Remove trailing slashes. - rewrite ^/(.*)/$ /$1 permanent; - ''; - }; - }; - - cloudflared.tunnels."e1514105-327f-4984-974e-e2fbaca76466".ingress = { - "www.ponthirtaekwondo.co.uk" = "http://localhost:${toString port}"; - }; - }; -} diff --git a/modules/hosts/homelab/home02/configuration.nix b/modules/hosts/homelab/home02/configuration.nix index ce2b11be..5bef0a7a 100644 --- a/modules/hosts/homelab/home02/configuration.nix +++ b/modules/hosts/homelab/home02/configuration.nix @@ -1,5 +1,29 @@ +{ inputs, ... }: + { flake.modules.nixos."nixosConfigurations/home02" = { + imports = with inputs.self.modules.nixos; [ + inputs.agenix.nixosModules.default + + nginx-ponthir-taekwondo + ]; + + nix.settings = { + auto-optimise-store = true; + + experimental-features = [ + "nix-command" + "flakes" + ]; + + warn-dirty = false; + }; + + age.secrets = { + cloudflare.file = ../../../../secrets/cloudflare.age; + cloudflared.file = ../../../../secrets/cloudflared-credentials2.age; + }; + networking.hostName = "home02"; system.stateVersion = "25.05"; diff --git a/modules/hosts/homelab/home02/nginx.nix b/modules/hosts/homelab/home02/nginx.nix deleted file mode 100644 index 7099747d..00000000 --- a/modules/hosts/homelab/home02/nginx.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - flake.modules.nixos."nixosConfigurations/home02".services.nginx = { - enable = true; - }; -} diff --git a/modules/nixos-configurations.nix b/modules/nixos-configurations.nix index f84e185b..a645aa0d 100644 --- a/modules/nixos-configurations.nix +++ b/modules/nixos-configurations.nix @@ -32,7 +32,7 @@ ++ ( # TODO: remove once everything has bee moved to modules. if builtins.pathExists "${self}/hosts/${hostname}/configuration.nix" then - "${self}/hosts/${hostname}/configuration.nix" + [ "${self}/hosts/${hostname}/configuration.nix" ] else [ ] ) diff --git a/modules/server/home02/ponthir-taekwondo.nix b/modules/server/home02/ponthir-taekwondo.nix new file mode 100644 index 00000000..384af1bd --- /dev/null +++ b/modules/server/home02/ponthir-taekwondo.nix @@ -0,0 +1,57 @@ +{ + flake.modules.nixos.nginx-ponthir-taekwondo = + { config, ... }: + let + domain = "ponthirtaekwondo.co.uk"; + port = 9099; + in + { + security.acme = { + acceptTerms = true; + + certs.${domain} = { + dnsProvider = "cloudflare"; + domain = "${domain}"; + email = "oliver@oliverdavies.uk"; + environmentFile = config.age.secrets.cloudflare.path; + extraDomainNames = [ "www.${domain}" ]; + webroot = null; + }; + }; + + services.nginx = { + enable = true; + + virtualHosts."www.${domain}" = { + root = "/var/www/vhosts/${domain}"; + + listen = [ + { + inherit port; + + addr = "localhost"; + } + ]; + + locations."/".tryFiles = "$uri $uri.html $uri/index.html =404"; + + extraConfig = '' + port_in_redirect off; + + # Remove trailing slashes. + rewrite ^/(.*)/$ /$1 permanent; + ''; + }; + }; + + services.cloudflared = { + enable = true; + + tunnels."c1537889-81ac-4d41-b80d-9657f8db30c7" = { + credentialsFile = config.age.secrets.cloudflared.path; + default = "http_status:404"; + ingress."www.${domain}" = "http://localhost:${toString port}"; + }; + }; + }; +} diff --git a/secrets.nix b/secrets.nix index 465ce7ee..2dff46b1 100644 --- a/secrets.nix +++ b/secrets.nix @@ -1,5 +1,6 @@ let hosts = { + home02 = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDUdENIYMFFiWzqOylh6/IVa9GGMwCpxPldbbX3wUttaQZ71qy4yoVN069DSDjlg0zbyYPzcfrR1d+DKAlJWH4FCOHXAO/mZtweGYSP1OP3Gdk1P7l8WWBTQqop7SkOQ4IT/dYl6QI7M2Oix1cKJvKSog/d/tp0B2x28me/bcDNzqgz8UtC6Y+gClqbpUeoNZfieovUt0N8vt/Z2LLIeXfhTnWz/PHtQ/Nn8pL5uO6CFOETojSa1JOwCVwvPzmmG2j8t+SdQEGW5bU6dIHZecMrCPDoXid+saC6zhlSPeWwI9Oamy5WxRd2wa3AkKbMqQj91AAxsjdSO93qMhoKeVugoyncT/CD9+bAXbFInegsszUiJNJE6Ua0H8okGxhW/ptLPjvhQXJmAmWyF9gTeiAlENpqQ2Zo5XjaMbkopAXLAd3/dgt0t0K7IRbsMVlb09nQpLU65ADodofUJ2R7GU972IFyvLu8CBkGjVYrVIbbXRNgO4ZI4CN212W8dkB/uRkgrEfAyM4nkcho8CuwCBS5vObQS/DC0TAokHJMAR/7cCSjD4L2dUIkbwa2FOsSRJXW9mU6J/EmYTj9M3OOKlvOsCVBkiSNaH6KOtZk+NY059n9KWPNKeAdqg0bh42BZKueIj3fa2V0rWSuFcVdbG77NiUAIYb8qycfZMiFcRbV5Q=="; nixedo = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILvtcGJnc94k6wCPfvK9oBvGey0WWVCR8IYSqg5vqage"; t480 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILvtcGJnc94k6wCPfvK9oBvGey0WWVCR8IYSqg5vqage"; }; @@ -10,6 +11,7 @@ let in { "secrets/cloudflare.age".publicKeys = [ + hosts.home02 hosts.nixedo hosts.t480 ] @@ -20,6 +22,11 @@ in ] ++ [ users.opdavies ]; + "secrets/cloudflared-credentials2.age".publicKeys = [ + hosts.home02 + ] + ++ [ users.opdavies ]; + "secrets/forgejo-runner-token.age".publicKeys = [ hosts.nixedo ] diff --git a/secrets/cloudflare.age b/secrets/cloudflare.age index 4c092f317b7ac18022640316c770ec61db5e26bf..45b84bfd7aa75c506415e5e8c589d995f14a29ba 100644 GIT binary patch delta 1826 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 diff --git a/secrets/cloudflared-credentials.age b/secrets/cloudflared-credentials.age index dc5926209e5e114776817497eb00f6da33ebb582..d14cb201dc1529e04f9e5f77c0c9ed035ef08543 100644 GIT binary patch delta 1071 zcmX@ZafV}pPJLc*pnj37XNYsDafxxRQ-phvnTb z0at`uNr{JkiMLBoSyfS?k!7h#fxBB}Se~iBSw^IbPo{fzNRFGQM`>1hB$uw8LUD11 zZc%Zff_7O*cwjkKfRmd+P?~?ZzrL%Vdq|?OsaIe~SbbKwM`&njm}iu`VYsiEPiC5% zbE;=@YLZD}il=^aS%`mRaFAh+pKnoQsb#2l&_OtMMa@=QF>Wm zL1w;NM17IJYex_N$SV!lg`iJ_lierZNxYO+ZR zmyfZbhjX|~c5=DCmup&xv4KHqcuti`fkB#YUWK1`rn7-bYPq4KQ%+EEVz{GWVo_P5 zMPz1SrAtz_c8GJLAya;TR}WrV3^v5S+Feu$f2 zzMpAuk#9ywm056LZl-s+d7+a@pn+?cVSqkYRY7i4g}G&pe{n`qzGp~&X;MX$hjv7n zSAJS$g+*YFNp@zcQ-*(bm8p?qgm;8bVq|HOk$GrgU|~V1g->W0mwAbgQ&mQpo2R#< zMSZbP>xryw|kODae*UOaz>$#ONf(WYJGM^zC~E6MPX`LM7gt@K~S-Fkak$6g^N#F zvU5^#N<^52Yhjp4MM+{rVn&ulV0lGEWp<*07gw@@Ux`_^d#Q1rhl_TUaj~&>g>gz* zW~hH=PI!5id5~#gQI)q-NI_MBZ&|8esgsvaj-hFBfSa?0dzF)yrw^BDhEG&scD+fO zWu})$SwKOyp?Q>xyLq{#nYWQix|v5ra#(12h*z?gr&B1GuCA_vN3eIgc4mH#c1b`* zqO-F{m8pxLv3GJtP(f98hJIG5zgxJOg@I?3Nw5jm;fTrqGG3c4*_!)8@&)&0<4;0d z9RjkS4An{&+Rx|z%)9HE%$gr9?gcOEMYq-eU-NuH$^-@ZGpec^r7xs0?$^7$qf6)3 zzOLeF6F;t(6^#>5t=|57yY9Uu9?Lk^q*@gHzkl@Oz3fE-lUeyWs%$!^{$AQYaYxYP zMGx-!E#Ka{?w#$D827car844nH_R;i{j|77H7%k>V$+6wemU`PFK&Og_Wrc&!zFWf z$ezBZVR-Y?3ZbUL*Yekz7>fFC26Pu6kayRgCG{t1!itmeT&{sS6H9yqmTm?B%QT1S delta 1071 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 ssh-ed25519 IsVD3g VZRQKGdeV/lghsgN7xSWAuxOsThIU4cpBPEA5jRU/Ro -rlVrONsaGdSAW7jk04RbmxqBRr1nIpZi/QYJdhZNF8A +-> ssh-ed25519 IsVD3g sjknkZ8QTfjiEJyjZvB119raHM09HrSLiio4jjztHRs +erSXR3WzpvxUgY2VUJ89bl62BtW/71JbUCGD6SOfy/s -> ssh-rsa +vTWQw -igGVvcUh30WG4jDQcXL906pmEk6NCDt0Fl0XC6q3ZuAeJHK1wZ70XKPTehb1JM4U -YSb5vsVW0J6Fv9kWbpfuSGo/eDoLwm45bP5OT+L3hThG8VRYlt4GuPt+BTdxBfcA -sLiQNBo/c+NeozLwsx39uwGZlBPXEiCWy2GR0tBpl97mpQgyLIvRleRMxzTtfN7Y -vreEbsOqo4kHMsAykGoOwMDVJpGArJBLNlm5cd9I0iHOvk9ugu919tNeiZ4vHyye -QKuoeAE24wqW/QXj98sFxz9SHi9UHJpqLMsgh2tCfvG6J65DItBzhWi7OKlgTUjy -7nhNOGMHtc4XBR/kjdt4z55ryb7t5DPdy6VIurJ3YAcZRm44o4LusHLw7llcNa20 -bXTiwZaICwK6Zi3deAASK4+DgbvThuKa6Ir0vaEK7Mik39ZanrIXDoFBv80ufBiq -tsFZex7Z/ZqqDR/WPnQKF92tz+Kqs7Jkka60ajYwkDdS6WnkOFPpKPJKayfutdF1 -9r6jzBUZEZ1E9avShow8ccw/FVhSnDzl9851TXZRyDrqFJ26s7484zHV9KpHPflh -qveux0fqB65vGl2ZvcsRawGVOw8G567s2HED6tuArdU98eEGC5Z/UdXPUYGpUSCK -zB9AQNtdS5IHY9CNKb7YqJFtvyaA7wlrd9Csp0UWVSY ---- i4UTmANM0HP3f9MKXDJZKyP2lod+E2dK8sNzHcm3y/o -ZpBl@Dp('u.X TO"Rrr=|ޮ:SQCDCb~V2 \ No newline at end of file +LM8id7bb+4010W3AssFgxCB9j6Xth1LDGieMp52ywAACQPothIeyB1BwXdYMyYzp +UVVguRJUN6AjFuIhXBe5+gtK7xvS0ToIpeZmTQlgfehzQWIbwCTzs3Py/XYyRUth +x6LT6Qru0pNP/zPVWh4EOPwpi12BfNB7tDxPI3vQCR5mL1zw/Uciufu+ku91c/Rr +s2wXjinDSqHgKOjNxvP6RpzjhkpvrV7cnir7JxRC2gFpyTHeDVishjqu3D4WbAPy +Qgk10DNv86nQvPdexdWF8C44GBc69DBXnaQQSsgcUs4awG4zNz6IJFMG0FdUA2lR +ac5zcaUl76SrwvXPHyiFNs6f0wkFZQt3Cu6/QiHWWXNuuIGMv6mouBW4lQqiZQRC +2pMS1IxuyHPHx2Bun8m1CPAuFCUt+ur9vYbofpJrWoXz1zg6tIL+KnUWkN29cd07 +OppiaOrk50fVqJvodS5HhPqJnKGAzNpji0a72OWQtIHvcNYwAKv+P3Copg5jWt6z +9QKay17p1v2YuPYpxzqI6VzB76UxG2T0mm/C10+xedPDo1NyXDT2b3c/uFm3bR6K +Lc5sM/togbA23YJNDRGQpgQNtZi2ovSMdU5ZDBq1txsGB5sP3ITUSv7bbAWHTv6K +E2uckvASLlAlFgCePDPyM2StMwcK7xGuG49jtdY85Hw +--- pjoGZ9rZfhR6fBIshg2pYfELHCmYewf1LvNAvyXm9Do +V ? yV2CקX05s(A&=0]74Ja]@Ub8lJ=, \ No newline at end of file diff --git a/secrets/freshrss-password-file.age b/secrets/freshrss-password-file.age index 16e7baba65a80eacb71428f9a82e30b1f2db4d33..883fa6a57b8cdf4ea14a15e8023fa78fa2355560 100644 GIT binary patch delta 916 zcmdnQzKMN;PQ7b^d5TAXNo84fa!7V)l~-hFwwI}yw~wE(VQyeRslIuHNs>j9wy%C@ zF;||UL88A!u6by&MM<%KL716QQK3muaA<*{UtqScdy=oWwqLTgW2HxMGMBEMLUD11 zZc%Zff_7O*cwjkKWSVh7MMPksp{IXfigR(1xk+R}W_@5w?fK~Q>!mIYF<`pxs!#Dx4vnZK|yh5mRCh) zVwQ_@a#UW1o3V#kdZk%fiMOj)Rk^1}Qf@_Hak){reyFi~hR$*|UPhqizd69ueAxv`J0 zkymJCM3z}_kVi&Qs%u4wlXg*}r@nD$l1E{Rwsuu&ns1gxdbW>Cm?>A4zJ7pNdc99+ zfQzAlmup^Fa-l(9kf)(XWMFwzh>yNSqPvr0XriTmsfh`fuCA^^mTy{MKtQ>Zc}Rgz zxM{GPV@Q>+K~%brVNqseRK9C*sDG5XabjVXe`PWkgZyMk`$JoKlcYQE*6&{K{jD@r q;^>4UUvw5+zdAqKo-x-rDJCy*?Oq+;IUh@Q*X;6$$)0PvVIu$(c`^wA delta 916 zcmdnQzKMN;PJLl$a$sp;USL?En`@$Rfv>ltiLbMxdzn*8cBrXod1$g_ppUk5n0bX4r;%Z}cY$AOL1~7Un{!2wPrX-enpa|^MO0#uXO2%qNM(j= zRX}-^g}-NTfk&E`NqTmAwuzCWuUk}6Ay=_>K#^fpWQDnjYm|OiMp|h_cA1ZJNNRRQ zxM^aDWm>kjU$MJ?RC#GiN@aOSR(5*6ce;gFRibZ5L~@8%MFCf-Tclr_dyZ#ldY+|8 za8X`nalKc7ez9LwNlI2use6@4nrntrzNKZjSCW}`Vvc&4XcRI-axp@FuenPYybc1VR& zl&iL9pmv5&pjTLFly7o|S-w+MUVxcrX1a@UX?jvoSbkthm5X~CS8htVg}G;ho0EQt zOTDjeaAJt5nR$d)zMpx9t8;!-SYcSQSwWO{RJwaqL2hwyvQvSVlapg%aK2fHPeD~u zaV3|2si|W|X=b=nR8(b7qE}9YnSYU=V|jj(V^Xn!d2zB=WocT9tCxvIdZI;2SfHnY zzelE1L55dSp`}rtyLSm!rjtjwSzc9EdVN}wNm{Cqd{`Gp-Wzfdr5JY zQ%GcanX#vLwsBTjq>EXEt5;-!Q-rsdvqflOg>gZceo94Yxm!_@PZ(EFwq>YxP zcdl1rabaepn@4G+SB7g!KvG3`h)HBXx=VSoM}doRnWG7puCA^^wu_0mSxR26cA!a^ zueW8sN2p1;XO)>(a;8g(f3UfacV@O(ppjR)ONt}cjH^kK>K+^OHrkhqZP@hMVefPo qUGq~-Zc5CKJXs6=h*gBj_CJ!UHj(E|nf2(C*`vQpclxgnFa-ca^fuA} diff --git a/secrets/peertube-env.age b/secrets/peertube-env.age index 0b03f08f..c190b8ca 100644 --- a/secrets/peertube-env.age +++ b/secrets/peertube-env.age @@ -1,18 +1,17 @@ age-encryption.org/v1 --> ssh-ed25519 IsVD3g kyLYyMMYENXy2F1cnjVyptUhci5xfC8yrhvBtH8THUw -Q8sXfg7Wm4UMZ6jWGiBLgEKOqVvlCrHy8IthdpjRS/8 +-> ssh-ed25519 IsVD3g 5GyBUVIjEFXXSaKHdMJz+VQrzFQbGjI1rN9v+tEw9Ro +3TPH9ELgR7KIZT/3qUQ74dtP00Iki3VqwIv5CHV4HnY -> ssh-rsa +vTWQw -i0sLs+iG1P7pvUAHCn1StChdaMlT+ze4qkI0beSzTbWm6+qoC7X9tBoJoBJbNGmQ -vIaJpYncYUn04r4WrYcjhBaYKYoECPGR0z/i9EtPT67DG6zuNEJLTclMStdudv4P -Y5uHDku3CoEF6l1nBabQmYtA6/7RT/wqQf+yYICp8pJX9fPtgkjbUtwx/EBOTz29 -t1Y6USjHI45IW9Od3G7XcZGuNkLkeV3clBEqWiFeck7+x3/SU8f8sv63M++Bitqb -F/ZXiLd/JDrlRhcgO0XsfKX+M6eodUg3ZQ7/0GFAjfYyiQp6uA5p/srIuTq40W1f -i7zzs0dewz75GjSKIWyivcYvQQzeobxDd6/1nhgtdjHCYyL5HV3QnE7Ew/ZoQPss -kIr25ftZ/sA87wg77J0c7koZneycSV1PioB2RyuW7cXP4ptMUOEaM0KjkLABBWNF -+WxIdGVd8d8E/zBbVnNNPNuKZYHEb6+eCo61Z8x7VAZhz61ziXOdOzeaN1Obgv+2 -Banoulrje4oF1L4KgO64NckVpYi6Od0Cl9W0hOxSt1BafokHYi4yxYiB2rmv/cdO -Q2IR10fKCd1BNYKvMPFia8j3Uv+OYJnilSNUi0bs+42UfFGcURZEgsSGluSIWP3W -ag1ENk3Y0tLR1WMj2mjbybk9JpEAWJ0oxT+oBOV2g9Q ---- iraOjJc4e+c1tH/YoiRIoEyyLVPgRx2xWaM5BUO1Fes -%Uck !XEw+1긑;+ -w& &m^us_nL<^,U \ No newline at end of file +Cg5+HmQdohbndJi0gMs+LV6KnNiLWjPJB1MOD/bG+Oa3n9tdyLBHFe/m3rHtXz02 +bLDYt/YgKMieuC8AGZsOD/d+KV7dfJ5dLzVDDHZYawuxWUEX/jk3etozlqcWWqLr +/uLJ0TPp56hL0zDqTPJfmKzxvSBTKYtbhEEF00UlfYte7DOeQGa6zF/R2mbWJAzV +xNXLB+l1Cng+zR9zO/0GEbHaEZBBtvJn4uDVmMBTRtqyPV2U3H40HxOg0Jg66R3e +D2Bs3VBqXK1Pdg5MPbu5Exjrmr1HiH/SodJ8tZfQuVRSQO/2Vb+J7KanOYIwAxN1 +DlmNV5wBxoibapViiZrRGOgKOM2Nd7kCeNLnpzl4kVQSHo7jWABBl/GPIlN59zNA +qu1cluK8txoJu4xXJsbNFBqmfdUPVrvJobNG9hyH4zu81rBfoEoHZRQaH0/ZHh03 +PSWw6Vv1wmHVp9yij3PrMGkF/kEF5Z1MYBP1j4mDSqIsvww0yEeC0RRp8Ud0UMmi +v55O5ImOMUrhUiXFZbk7miv7wi+9LWZwtqCMbflOBklC6SGcHt0Xt76gQVVQCsMv +eVpPBwY8tGz+cYT8zmO77/bRmz2eGuCfiAdMN3AkNDelS5LXz2ydmGYyCmOlKabV +VfYWsHJcYtlpbDzpa2sCrl71b3PTC7LnjDDIQopIPDM +--- 4zZpdSkiIb11Fo7yHZYhFoQRt+iANwW5LURpE61JMac +-`'kB?[͛ l#4|db>X tQnoFs3hW4嬎i$ \ No newline at end of file diff --git a/secrets/tubearchivist-env.age b/secrets/tubearchivist-env.age index 8e8fd5c1..309df683 100644 --- a/secrets/tubearchivist-env.age +++ b/secrets/tubearchivist-env.age @@ -1,20 +1,19 @@ age-encryption.org/v1 --> ssh-ed25519 IsVD3g JcpSuBgBp3nnPscb55121KL2XeCkBnwRwr57rFYE+nE -o0nLbL0tQWZIwOECYb+/zQsGo9/uoEpuaPqdxoZqY/Y --> ssh-ed25519 IsVD3g fYyG89/0d3WO+aG9SaZ5+QMGrayd0y6EdnpjEx7mOTM -nbP/TlK5goWZe6ObIvqaRYTa7XPKprVoOeOZBPARON4 +-> ssh-ed25519 IsVD3g jadSxkPYEHq3Eft9cjnjSpZCOYPIv4iUL5UZ2oZBF3A +9c5RlPpzZChKsPA3CYVH/QQDQgztkaawbzj/urxog5M +-> ssh-ed25519 IsVD3g MHiWFQh6775rJh0JObOSWP3LqyIi6SvYcQ1FhIZtZRI +G5Y+jenOV7RdL05owbQYp0zzu7/6X+q/KzWCECST0Lk -> ssh-rsa +vTWQw -mrS2MJwu/XgQd0y+bE9pa4iCZk8m1l6WQrnLb7tOaPXiVBObh03k6y9uWsfVSgmh -gnXHBQIAGXtdJ6qabt5jLDQrDxMZw1jxAr5QONR8Y+zmcw3BTvKYmVQRfsRlOM0O -qC4VG7CXcq7tcOEHKi3VliyUZW3R1SzXVhr72VXsug2IbWsNp/plusiA8MmLR3Mf -0N6z8ye1ZKRFHs4Q9ShyLad5JcJtkjrNmhbhQdZlNUQfOf+jrTEFrgKII96pCWqI -2eqpUbA1ameSUXgRknaZjIYQBmJd5ejvClGV5cojlD+DdX0W85mRW/Xj1CinUsGk -QZ+RFQ9GWGLLV8Uba707nbS1yMlnc2afJyG8dWGaH9m2E/9NnsFxCIbcQTrK28Yu -yabdui1sXG8stVWGK4FqCTuxNLv/bWC37IcFQQai9wgZhziyO07QR1jQ2xiMXLBZ -cw3KT8y8yYROzhZCuKoW/FAIrlsQv3ePBv+YEpnLF++2Pa25d1jmJXryAooDpBLd -5gi/hKvBeDPwtgStS0BjPYRM37tQ0UlHkcCqq8v2xeTX7VZpqWrzUcGX4DXCgxxX -Qrj5eDdomUfFH5NE8LWWNfpAlP1SOkM3ebCoa9e1sfEdJUzubIbSuRL/VFTm0SJe -WaUbIuTPOo7Sda6ZgM7lPFylqJNC8bHI5Ch6AH7UWX0 ---- GcN2m5Td0aMEWTrH6ZOyjplhvkHsHrCJfoyyfsbJHZo -xL}va1(t1$Cn߇;ftO@]ycvd -VQ XS;.Oס?HɊJD|'!w9gvRuNSú9 \ No newline at end of file +Q84pQ3wLcYpAYpSIuAb5cGxpfVPuYN7EwY5pd825/kigYRVaPEO4uBF9OVCZ4MiG +V2ejWOCpKyC3Xmx6zBkGgpHw98YMngPZJtKfkqs8hZVLAYuKBIEbCEyWKPCBErmX +u8hdZdR9IiY2X2kjvK+/QctpPnHv5Y+VXOIagiu3a1y2VUqG7wZa5MZvC7WF6gtH +JUoDAzg2zpvL9TngNi9gapnisr1JDSoYkgQCXgiczfqcO5Xb1OtSh1ofHy+zjlfe +46ByskSWW+Zc5rdDFeZaKOPraxUMbqEXYM8XpL70vbe65vEa7foiMSRgyvtasOSn +xSzxBQgBVkh/1aHGGg1I2NYPx3NHogwDFSedZKuocYMEVYtcEICDgr00yFr29w0k +m1jac5fA1qQrt8bAIiHVCHhXXFiREFGqAUBJKPhlgCYlhYrIxIzv8M5B0cAYbtsY +HL9oXAq9+WFkx+QqCzvN+NSEXNzSgSuecPgvWnz+f/d+st2f/QaxtT/tHk3thDsS +pC7wGq8IwvzNYOD8WUfIkI+BiFxqMb8sQprBBDLeOpeVgWoKf1TYyxsNjiuCuIIM +1BGnD0A6SUPt+QDnPgb1ZP5bHLTr0Mzkh3m8jRFkqBk4bVvacW44SqBBYOfog1nf +mbbv8GxRNuZwqY83vloV3EMa27ziCXTKeX8ZephgUqg +--- mH7HBWGpojAv8p68tUk86c6ri2P2PxZi+fWxl5QC8qE +?}Ĥ`LGt:G]PIāh&xly2_w_$ooiLY;jzhic2T18fRpsA^A zK3Altc0oy4s7rcSN={OMQ*L>HiDyBOSDBG(X0cn6d7^fTe^PcprF)8{E0?aFLUD11 zZc%Zff_7O*cwjkKVsSuKUSVifzL#N$dAhGiR7Qw*a%51Bp=D*V zQHpk^v!8ZZX0}D8wttD2sh@>gc~)XZkz0OVj$@HuwpUWQkqK9^ub*#Wo`-X|b7(+$ zO1MvYczu|AT1jX@x}{;hM~bnJvulZ$V}7KiuUCO~X;x5@zMGG;NmW*+w`FjSeriZ5 zms4(9in~Elab$sehEqhLpI>TrNL6WtU$H@wOQD&GWvO;xRfd0drKy)$RepL%SXOXK zijiqVuAy6bhJLY8HkVOpSVo$+qmgr&n{RSra=mu3Yfhp?MwL%~qG_Q;s+p@tYEEfk zRB~2wKvc1lx4u)BVPHsJmP??vnMq!DVxBjbd$5m|Ky4zH4D* zz9E-uSV^8=p=*YVdqApoxSMvBp>vs&gdjLiit%;WJFd)V1NOahjT=^QEEv+WPMOxR%oz!K!K%qPFQ+kP>8>0WkiKjnQ2K> zS$29;Z*fkk$%V~Tf{W1?eHad>i=cSbpvuCA_vk#S_0QGjz&aY3q4 zqESh@rFlSrOR=GEuDNBorB|N0ahX}EUu0>abD{}X#*D-#&*zr<_;g=t4Yy$XoA%(h zW1C&cSqJWKtY@|Uo9uqU8vCMu!&3eF$A1>pbMP#bzQ-uYsxfKS(chekcMlX5)xXz2 zIVUat^QT=+PH#5;n5C@#@a1PclRMjFXV>>k__5KkBVflX=B4_lB-9FBh4?SntCe;z zwrhUjEcJfl^6YP4%DrZxmk+(CZ*ae~+qg~m{r)FUm)@NpJwM3y delta 1083 zcmcb?af4%mPJLK$a$ta$zprC)XrgCwqM>Jbfp%U+US4pOZ=`dUSGl24xKUxHdvb8N z373g+fk9=Nb3v(laJE-=fO(QrqH}gxP_A*hZ&a4ITVkevl3AWdMqz2L1(&X!LUD11 zZc%Zff_7O*cwjkKL0*BQZJ)OK73KyT5;tc0g2tS)i9?B9~WMRFXxQPq1Z(sim*4QGs8$Pf${LRAy;Z zreSEgdw5P^Vo<3^XiAE^lXpmpzE5y~o2idQvRAraS*3SGu`^d$a)yPIOJ!b0V5Lh~ zR6%NqNxe^zqf=zuxW^8R=%TgzF)3yk)Ka$R%A(qSH7Wpu0cv}XhBtEnx9E|U}jZ%c~OzOky&Y4 zU^rJ`X--alR$gRIK}2~#U}%uBOSZc~R=Tg;}0)dRnq)ihr3!eoB6JkwtD$ zajLV0cWQD`cyft;rDHmmVRB+cfR{&lWPNa|NkKqHg_*v7Qhd04J@RjF~9cdlz{Wk#uCd698eVrGS7K%`5!euX2KuCA^^wz;FWaa34@Uw&0# zX=O>ac1E~|i-D(hxJSBwiobViS$c(wpRcJ`hJGZME?e1j=QX;2`+psJZxC6(WY_5> z?em3KPF+1o_Uymn8LG`&jPjEYF|62Cui@7F+gT%J<>b)$oHkl7qmMn;R-St0Xn&BB z(F{3O^BXL#7J0?9X3x;dZZ>d@$g$6>s90Nne6#SOQ(J_3z6h`+Ni$CqIT-%5a)sv! zso?KNE}Dol?YbJrmjB@F;+r)yZ~Y5vFg|>>VQ;TtjawOGPB^1ZWy>743P14%p{+p) zmrUBu^&Q9!GwQw{^IU_=pY!<1`5V2Im+yEozj@N K_Rm}E*9ZX5nTK}(