diff --git a/hosts/glyph/secrets/filebrowser-env.age b/hosts/glyph/secrets/filebrowser-env.age index 6db6fa1e..bdc6f020 100644 Binary files a/hosts/glyph/secrets/filebrowser-env.age and b/hosts/glyph/secrets/filebrowser-env.age differ diff --git a/hosts/glyph/secrets/pushover-app-token.age b/hosts/glyph/secrets/pushover-app-token.age index 8ae5ef80..cd56f42f 100644 Binary files a/hosts/glyph/secrets/pushover-app-token.age and b/hosts/glyph/secrets/pushover-app-token.age differ diff --git a/hosts/glyph/secrets/pushover-user-token.age b/hosts/glyph/secrets/pushover-user-token.age index a3e6fe04..b89c3cef 100644 Binary files a/hosts/glyph/secrets/pushover-user-token.age and b/hosts/glyph/secrets/pushover-user-token.age differ diff --git a/hosts/spore/key.pub b/hosts/spore/key.pub index af1274fd..d7f854e6 100644 --- a/hosts/spore/key.pub +++ b/hosts/spore/key.pub @@ -1 +1 @@ -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKU+fHHOOFq5VD8g6Qb9m2kdLw0/fxu+xFddYuiARSqX +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKdsUDRtA+nCJhs5o9tSIoKBlUhbYL7akaOMXwbQYGci diff --git a/hosts/spore/secrets/cloudflare-dns.age b/hosts/spore/secrets/cloudflare-dns.age index 97b1d865..e552c664 100644 Binary files a/hosts/spore/secrets/cloudflare-dns.age and b/hosts/spore/secrets/cloudflare-dns.age differ diff --git a/hosts/spore/secrets/grafana-client-secret.age b/hosts/spore/secrets/grafana-client-secret.age index 79f32dd0..2c2bf8aa 100644 --- a/hosts/spore/secrets/grafana-client-secret.age +++ b/hosts/spore/secrets/grafana-client-secret.age @@ -1,7 +1,7 @@ age-encryption.org/v1 --> ssh-ed25519 stFZUQ jMfMmYl3zrbazHrD9U5L3DpBq+x4vHZO2ZTvZAAqixw -osAodKFbWfDGOXlKHXxpQziXBjt0Hi117NbA+Z1efW0 --> ssh-ed25519 3EWhnQ npinN8MoG+k3v8XbYdi4d6PxQ1h5h2Pu+FBjjFPOWSc -Up1sWn/WW3iYAz4yvwgqUtabLWyQekDsHcOPUSR14fo ---- U67RS4vN+LdilUjwNffm9r6dwPaVDUNKrpc+bQ/qIcc - i͙`Ek~C|:t'_ys!qby?Gstc*~ \ No newline at end of file +-> ssh-ed25519 2AxgaQ FvmXUn7ZZmUNprbPtINbTZva2V7HxLAyNERhoe2JdG8 +IBP3pb/LRasUdypUSElaZnb7YvMNHmLVYutUCjCFY/o +-> ssh-ed25519 3EWhnQ Wn1zYem7wXAO2wFysZY5UbyuGkAK4HHSXY6HQTtY7zU +HV7Wv6XwoYfUiTHKyvVXcltmy16vIG5uUP+Vd1YSVVw +--- QykxwMzAAj0E/0ydBqMlDgEEVL+2SKfRedhlnKS8i8I + a܄ﴲk3SW.4I.znBa<,~㰉@#F A] \ No newline at end of file diff --git a/hosts/spore/secrets/homepage-env.age b/hosts/spore/secrets/homepage-env.age index 2f09085d..6d2ca61a 100644 Binary files a/hosts/spore/secrets/homepage-env.age and b/hosts/spore/secrets/homepage-env.age differ diff --git a/hosts/spore/secrets/mastodon-s3-env.age b/hosts/spore/secrets/mastodon-s3-env.age index 4d28770d..5d99671e 100644 Binary files a/hosts/spore/secrets/mastodon-s3-env.age and b/hosts/spore/secrets/mastodon-s3-env.age differ diff --git a/hosts/spore/secrets/mastodon-secret-key-base.age b/hosts/spore/secrets/mastodon-secret-key-base.age index 91a656ed..9575d0ce 100644 --- a/hosts/spore/secrets/mastodon-secret-key-base.age +++ b/hosts/spore/secrets/mastodon-secret-key-base.age @@ -1,13 +1,8 @@ age-encryption.org/v1 --> ssh-ed25519 rSr+rA jQhnsxGQntNCt0sF+pNdp9n5wKadygY9sgl5PUWsvXE -tR1IStCTlowf9SX15Lhrr3xL89MXJPtT+2gv5GSMGzI --> ssh-ed25519 KYfd6A 1cgJqwmuwtHkd+TJOQ26dVP6YA5PDeWGt7TtbJLpi2Y -Lse2T75lcGx9hfyljX8cujfot68Eq1tzkW+dDqIcmbw --> ssh-ed25519 3EWhnQ JpB3+36gEDAb+fDMYJNGcrmoZSxoN0HeXvzoZtq2sXw -TyJrtrwV9GhYyMUcF3Eh2YmL+ylZlzQb9x9T1MvE/LY --> ssh-ed25519 stFZUQ mqmU+qbh1dwigFoyVwGZddj0Hon6S1eK+07Nn/hRPiA -rgy+eAaYGYq0HDVgICJ6AeU6So8M69MGfxTZgbzP9SE --> ssh-ed25519 CiBwDg xlUYYm0NwoaHmUSsFksLYZyXXs4jpN4KvLPq42R+Rk0 -OkQCP5Ah8I0F9Ep3A8TPr5Vj0k3jl1aq2+X/wyWU0hc ---- VZ7tB/DeYCFLNAiLXA+IOmx7X5/FZWyjCdQy9g7CrAY -H@*Uu7>ĤLvA϶e5큷2brh+t0 ~J8~A|L .G}-\(pIzCoOؗ2a| Ef Ujh zϺ(oSKad ./ހxd \ No newline at end of file +-> ssh-ed25519 2AxgaQ abZey6P4N66RgmgME4IrehviZO0fGRG0u5WDBv2FO0A +aqICHbpvxDD5NONDbIQlEYI61GTcohTW7I6dKrxAilc +-> ssh-ed25519 3EWhnQ 4uwTgppm8eeYsR4nd0yUda2td9cLQx9/n7nkc1qGKCI +TqEMaG1KGMekbGAUefkUHQMPoqg2zHFQJ6mtain659I +--- 4clDvCwar1ZSpG9g8bWab0PEgz1Ezs7yxcCMFBz8fT4 +QwdbzD^+)FNx +fZ+8 8ɓܭ8\˜b Z²_ŜҟQO,7QopI `S[ );g3M!uv NõX:evwcda,Ŋ= \ No newline at end of file diff --git a/hosts/spore/secrets/mastodon-vapid-private-key.age b/hosts/spore/secrets/mastodon-vapid-private-key.age index 9eb2506f..2632fd7e 100644 --- a/hosts/spore/secrets/mastodon-vapid-private-key.age +++ b/hosts/spore/secrets/mastodon-vapid-private-key.age @@ -1,13 +1,7 @@ age-encryption.org/v1 --> ssh-ed25519 rSr+rA IWgcDz5owBAm0/6+YU68Y+xP1Yv7fV1gNVY5NUKBgmk -YJ9OHky8SNVe23apVqowJrr5KLqRMGcIOkauIvhnAjI --> ssh-ed25519 KYfd6A tudAzyli3AWR197pR3dVzhm0xKktYDsR3fxjbbJyfjw -QEEH+xIunZvy27lZCGHckb2bnf7oQCJfpashfMlpnsw --> ssh-ed25519 3EWhnQ oV2khIEaNyzKSDq3dOHZyZakvo1MNFZOGrhRjI8r1kc -n1tEaArV6TxBcr63tdj5LQwgYbITNi/l8duyoq2GWMI --> ssh-ed25519 stFZUQ U6gE+tZqDU6h3uG3dTY6AiwL0E7IzCUFDCkW0pKLYz0 -Gk7ut00FQ256RqEZHimfAN4+URFP9o4RmA56xWx643U --> ssh-ed25519 CiBwDg PaVFWxZJtOYwagtKXijuI3cH8IDIm/Z5s4hdQVzqHmg -H6ccQqwWFD8qZG+wgKsTMHqpz3b5ypX/Q7V2+/cN5jg ---- 9e670YOr+o01a1qBS+cuyzBCbDirEkd/W1WpS3KjsO4 --5̋#]룎1 6ɱ:+ R(wKs([uN \ No newline at end of file +-> ssh-ed25519 2AxgaQ bmv1ea3+dF1bKTrS+jvG1rEZjaC6bw1V6uEpng3BIUo +ASB/4HDvjhY6IN61laRrDvbmnvVeS/L/OE+/vYq0O7s +-> ssh-ed25519 3EWhnQ P/AhbtdOmlvQxa7OIHbYMzbSlTmZSN+uRHxVjIZ48zU +x0qA8smiNAAePSmnPiNA+Dx+00hGR3AAxDYRR3oRjTE +--- jGPAorzxDtxtv3fC/rudlr7OYENKc/25Fn2hL+qYfvM +2rkVН[þ$u*h}Je"z>} \ No newline at end of file diff --git a/hosts/spore/secrets/mastodon-vapid-public-key.age b/hosts/spore/secrets/mastodon-vapid-public-key.age index 99b3fbdf..8fd7ffdd 100644 --- a/hosts/spore/secrets/mastodon-vapid-public-key.age +++ b/hosts/spore/secrets/mastodon-vapid-public-key.age @@ -1,13 +1,7 @@ age-encryption.org/v1 --> ssh-ed25519 rSr+rA aS/Ev4/CFUigwjVPC/AEv/7p2XTzebSOGQCN++3ptis -ubUblq2AcskHfjCLDcMl0QBG/wNYjakAxwzZg9PwTlk --> ssh-ed25519 KYfd6A FTDPEN/GWQtKSUXS4vHaaMmwJAUhkteAPqcjDSmR4VI -NEkToUXua5OJ2FVhuGbvAnLsBdIbri3TJ0a3NupxJUk --> ssh-ed25519 3EWhnQ YxcvHSaNUB1WaTpEi1teAydtUkgui8scnZdesGYNLxc -ieP7mby51jKVH5dMUDjX6sZrYQG0KJhNpfliAcyFGjE --> ssh-ed25519 stFZUQ JiAWBOhTsrjXW9wnPVqEQaDnT19KZiSF4rdeSR6pbE4 -+HD+Eqs5WNGOUhDOLB6JXGpmeexJHUKTv36rn0E9qKY --> ssh-ed25519 CiBwDg Hk8mHAZZo4Plr/BWUwyKMKc6yL6jHd+F0AednT/jxHI -zkE+yc2on7dZCkhF+S1JjNK6Ze4DvEtxPD2qADLA4w4 ---- xBBJVYT3LJGJQr/PbNOSVqeH2/kX6n8gaky2aTcxfFM -)l&Vd?; ~UڝnRYB%̨,^nsqxt[Cm[dd/GčIH=g=y@N9bp=`=߬܅ \ No newline at end of file +-> ssh-ed25519 2AxgaQ se8+oTNct+WTG5eNx30diUR1/xRHna5QNdFimntKlUo +Dl6wpXjnaxMZ9K+sfnRRxtJkJL7kQPB4BXXmu3ccPzA +-> ssh-ed25519 3EWhnQ QvMkg2/nMUgcRFe2op5yb51U7vSXFGeaL/eND3bt1is +fxRbVSwOPRGXN7f5mPqXFENRrNEFSI7F9EJOlx6TSnE +--- JUcvP+wU5PLkMqt3XqbzX0khNC08RB4JVR5edg1OWjg +58f;|g,nb/g># b^X1Sn` .c50}ste/-O0zK?K`\Mlz?4{v0C \ No newline at end of file diff --git a/hosts/spore/secrets/notifier-smtp-password.age b/hosts/spore/secrets/notifier-smtp-password.age index 40cd00cc..212671e0 100644 --- a/hosts/spore/secrets/notifier-smtp-password.age +++ b/hosts/spore/secrets/notifier-smtp-password.age @@ -1,10 +1,8 @@ age-encryption.org/v1 --> ssh-ed25519 stFZUQ ISHS/7VN7oQBIQ9Wee9Gdw2Ng98RM6NKDgABgCmOz0c -l/7NBAJ5rXMfgpPcq7XwYgHPYzO1fC0TOAn6Fh4mFVg --> ssh-ed25519 KYfd6A Mkpgw9k33lr7UCxRdJDjBz9NtZUHyNOv1nMS7t0Kwmg -C1BF528J4axF2f1ohLvDd+27IUx6W5cKnVyQZRj3RWY --> ssh-ed25519 3EWhnQ QhimLTzlIZsoqL5xoMKVX4+FG4iKyOR7sO7iNp00ozU -1HggY3GjfSneBi3hpJppxeoHjyC7sWyj0Jul4rIeQrU ---- KKtFLlRRN6N84GvdzNWfU1MA+dFXzZP95on8IB8oLUI -8 - #SǞPeyœ'%>p̆aڏj֎UHF][\ &Fa5 Beģs[ \ No newline at end of file +-> ssh-ed25519 2AxgaQ Vnzy0UJmvuAp5/zkXT9VMeAwLOj85QcsIINMopEoEVI +Iz22dw1EB/zWOVO2HryAMbtaHRtdv73deErnLTAImJU +-> ssh-ed25519 3EWhnQ RKXenb08YkBm2Gp9iY8N1wofszeZ/9YjzSKnjAk+FSI +fI9Wxexm6Um3kdOXn6AxjaULZ8NFgBh/cvk02GW5H9Q +--- gwCTdBS5gIrXQKF2Yd5anEsnfjHqCmvl2Yz2Ffkhc20 +j=o/ {Xx +\>'4dz2αK@J =H2#OGtݸ,{VZ70 ߉ \ No newline at end of file diff --git a/hosts/spore/secrets/oauth2-proxy-env.age b/hosts/spore/secrets/oauth2-proxy-env.age index 54e7dbbe..3627ff08 100644 Binary files a/hosts/spore/secrets/oauth2-proxy-env.age and b/hosts/spore/secrets/oauth2-proxy-env.age differ diff --git a/hosts/spore/secrets/pocket-id-encryption-key.age b/hosts/spore/secrets/pocket-id-encryption-key.age index 471b8cd7..85a51846 100644 Binary files a/hosts/spore/secrets/pocket-id-encryption-key.age and b/hosts/spore/secrets/pocket-id-encryption-key.age differ diff --git a/hosts/spore/secrets/restic-env.age b/hosts/spore/secrets/restic-env.age index e7ef0c25..5075587d 100644 Binary files a/hosts/spore/secrets/restic-env.age and b/hosts/spore/secrets/restic-env.age differ diff --git a/hosts/spore/secrets/restic-password.age b/hosts/spore/secrets/restic-password.age index 3d0a790c..69b76026 100644 --- a/hosts/spore/secrets/restic-password.age +++ b/hosts/spore/secrets/restic-password.age @@ -1,13 +1,8 @@ age-encryption.org/v1 --> ssh-ed25519 rSr+rA pKIdhgY9cPMQhMGw5yxZTxQF4VzCmPUp/vdIKCurcUk -0osm9Eo9K2o4wQhuaIZ+b/wAWyLw00GsyD+0QarAd3s --> ssh-ed25519 KYfd6A sYFdqo4ECw1+XI5IT1i/Ju2dYjZCP6GmsHJWg3L9/VI -+5N1K7LzmhPFpjsXs1oK+mrbCDJ7IFydROWGiX0070o --> ssh-ed25519 3EWhnQ 4UKx0re1J+kUs0Lkuy2GqjB3Cxp3R8MZ+qPIesql+m0 -9giz6yRO/QROAfH+NPFMfncW0Y6l/SKKwDEK3NuAGRw --> ssh-ed25519 stFZUQ VKH4qG3xAmz5fnZ4EKCMsQX4uY1PHAgWtGbABrgNtmg -XopDBm1CXFFelXz1yonjpXFmXNkY6GiHiQOxS6hRJQA --> ssh-ed25519 CiBwDg /hKmkizLONMi83rvu+XV/NA+7pelow0KnugzNZv+1DM -fVFhovf82l/V5Qnb9J3maUrejm8Ta2KeCR2RE/YDkPU ---- i5aTwh2N3pgGEbhgPRySJ8jY18UcWl6S6iFDpm3ftg8 -/2dw͓}\f49aHNpp9wm16] Ty \ No newline at end of file +-> ssh-ed25519 2AxgaQ Fn3wMjiq3SNG6+zQ3UIcWvkCXR7/3dV4DFl3MiPi2XQ +pNnalVQSPAdghbNSLqFcKGNCpKTKpIivRInycB3NSeU +-> ssh-ed25519 3EWhnQ 0VH0W2g6bmcT1vS8mmxGl2iLsBH8zOcEHmEx8TFX1S0 +92DM1pAuSRRJkARK7/Yv07QRqQD5KgN3yl1fYrnEaa4 +--- 5YlEepY3T7K68HHfCbtI9QdYwZRecpfOGrI26hWgEMc +4 +0dM7h1/BKJ՗oHgR+Y5TlU_?u \ No newline at end of file diff --git a/hosts/spore/secrets/tailscale-auth-key.age b/hosts/spore/secrets/tailscale-auth-key.age index 5e1b72f1..06874a1b 100644 --- a/hosts/spore/secrets/tailscale-auth-key.age +++ b/hosts/spore/secrets/tailscale-auth-key.age @@ -1,8 +1,7 @@ age-encryption.org/v1 --> ssh-ed25519 stFZUQ TrXPlsIxJpPS5UvOJb1jD9ewSJvd9ZQ/onaZpoEGoHI -tMRnEWsdDcvJEI5V2rKb5BKvh7pd46wwQK7dFIpJGuA --> ssh-ed25519 3EWhnQ pECK9tRfvLZR7jTYAa6eF8YNgHBAJvnNSczcLLTBuAE -rhO+csPA5tiJXqM74kMAzUGr+mAmldm3aP1rzUXHCew ---- Bece8t54aaBaeY0sjz45SNMo/FRGROqXQzG31efSZtI -u먎ٕ_YmG $O^z.z] r6 -[`Ȳ^f ־VXyľD" \ No newline at end of file +-> ssh-ed25519 2AxgaQ Bml5zq38B3BTWMtQ8jDplWdAb/KRYeHInY+ON6Vr80I +P+uTPP3Xul0eMo5tMu4A6nwhFAhBmoVwoN0k/QnoUxw +-> ssh-ed25519 3EWhnQ qKFgwRZ0Aj8UBm4Ti2qtQqdZku6y4gd29Lqfg9aoLnM +wQ/rJ5aTJBbM+DMHR8eWiLrLXxYRMxMnQVs+yk4UvTI +--- VMe18Za/KOH7wECyAiwcYfvpsyjAE/oo1nCsW7umrvw +gC,ISøc6 Pϻ( Fu*m+TLW.rYP \ No newline at end of file diff --git a/hosts/zeta/secrets/dd-agent.age b/hosts/zeta/secrets/dd-agent.age index 9189758c..78904bf9 100644 Binary files a/hosts/zeta/secrets/dd-agent.age and b/hosts/zeta/secrets/dd-agent.age differ diff --git a/hosts/zeta/secrets/wireless.age b/hosts/zeta/secrets/wireless.age index 0e108788..e96833fd 100644 --- a/hosts/zeta/secrets/wireless.age +++ b/hosts/zeta/secrets/wireless.age @@ -1,13 +1,8 @@ age-encryption.org/v1 --> ssh-ed25519 rSr+rA nbMR/EHgkkm5/9KjrKqTuGUo8okDbubf0qi1jmc1dyQ -pMfx1WHamc7ihZdT5k5DQwOld91kUH+QkxhQf7o6qto --> ssh-ed25519 KYfd6A f4zptoynh+K2tCn4xcPgjR90ez++HjUdWBmYtOTJKUE -ED3xl0xQx8bZvGAZ+TaPt/iHLSIl+B5FTS6iRP/TmHY --> ssh-ed25519 3EWhnQ ewYE2q+AJVDrCycijIlmkl4nFKyH4jhy5HJndyBy8lQ -GIXPynIvUu8a9kuaEVqM1EDtqsuiwgKBLUtkNnGJT20 --> ssh-ed25519 stFZUQ h8FW98zqSTc3GjT8GMJ/uqmdne4HQJXRtf86RDlqLDM -j8mzrMltFZFXAm4QAWpmAzN+wEnjTHCZjl5xBw/4Kp8 --> ssh-ed25519 CiBwDg Bp/rKZZNvoF9Cuc7M5HY+bmuVdNBTSX0Lmhnigww8gk -czUPFjIs+GXJK7h3yhizKlV9HnzbBJEiNLLM9FG4f10 ---- SkXGIiUTxlNZfKxsTeMhYRNeiAgII7DTgot8bjkl1+8 -=ET$%=lxU_1=^ 5.BKLp)|h \ No newline at end of file +-> ssh-ed25519 CiBwDg KhRLKjHy3Ay372V1ccxKluc7KscRtyTtg3cVO+teHzw +u+UVOiB8+btHBm9gbMrJonPqLwAC2LLMjAU5hrJjrM4 +-> ssh-ed25519 3EWhnQ qy1Xe38tP8+JGtmSRqXVlV1cq9kpMuFbidT2whiu0AI +8kRKCa52z1aiw7iUWLMPCyi5L0Laqx8wPdC8W4Q+KN0 +--- TqjoArxX5QKGOz3/NexPExTcXbDYqyu/arIqZjwl/84 +=%igasrHaȁ:TmVfsbhh`*Mqv+x +#% \ No newline at end of file diff --git a/hosts/zeta/secrets/znc-conf.age b/hosts/zeta/secrets/znc-conf.age index 71c45025..93a58a2e 100644 Binary files a/hosts/zeta/secrets/znc-conf.age and b/hosts/zeta/secrets/znc-conf.age differ diff --git a/modules/nixos/web/auth.nix b/modules/nixos/web/auth.nix index c238c771..90fe92eb 100644 --- a/modules/nixos/web/auth.nix +++ b/modules/nixos/web/auth.nix @@ -123,9 +123,7 @@ in { settings = { APP_URL = "https://${cfg.issuer.host}"; TRUST_PROXY = true; - DB_PROVIDER = "postgres"; - DB_CONNECTION_STRING = "host=/run/postgresql user=pocketid dbname=pocketid"; - KEYS_STORAGE = "database"; + DB_CONNECTION_STRING = "postgres://pocketid@/pocketid?host=/run/postgresql"; ENCRYPTION_KEY_FILE = cfg.issuer.encryptionKeyFile; }; };