From 716cb791e94fd3ea34da7dd29c565b8df8e4d0ba Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.dev>
Date: Tue, 21 Jan 2025 00:46:13 +0000
Subject: [PATCH] Move homelab services to oliverdavies.uk domain
---
nix/hosts/nixedo/modules/acme.nix | 8 ++++----
nix/hosts/nixedo/secrets.nix | 2 +-
.../nixos/features/homelab/audiobookshelf.nix | 4 ++--
.../features/homelab/containers/beaverhabits.nix | 4 ++--
.../features/homelab/containers/freshrss.nix | 4 ++--
.../homelab/containers/tubearchivist.nix | 4 ++--
nix/modules/nixos/features/homelab/forgejo.nix | 4 ++--
nix/modules/nixos/features/homelab/gitea.nix | 4 ++--
nix/modules/nixos/features/homelab/immich.nix | 4 ++--
nix/modules/nixos/features/homelab/jellyfin.nix | 4 ++--
nix/modules/nixos/features/homelab/paperless.nix | 9 ++++++---
.../nixos/features/homelab/vaultwarden.nix | 6 +++---
nix/secrets.nix | 5 +----
nix/secrets/cloudflare-opdavies-uk.age | Bin 1100 -> 0 bytes
14 files changed, 31 insertions(+), 31 deletions(-)
delete mode 100644 nix/secrets/cloudflare-opdavies-uk.age
diff --git a/nix/hosts/nixedo/modules/acme.nix b/nix/hosts/nixedo/modules/acme.nix
index 352b7538..c8b4a74b 100644
--- a/nix/hosts/nixedo/modules/acme.nix
+++ b/nix/hosts/nixedo/modules/acme.nix
@@ -5,14 +5,14 @@
acceptTerms = true;
certs = {
- "opdavies.uk" = {
- domain = "opdavies.uk";
+ "oliverdavies.uk" = {
+ domain = "oliverdavies.uk";
dnsProvider = "cloudflare";
email = "oliver@oliverdavies.uk";
- environmentFile = config.age.secrets.cloudflare-opdavies-uk.path;
+ environmentFile = config.age.secrets.cloudflare.path;
webroot = null;
- extraDomainNames = [ "*.opdavies.uk" ];
+ extraDomainNames = [ "*.oliverdavies.uk" ];
};
};
};
diff --git a/nix/hosts/nixedo/secrets.nix b/nix/hosts/nixedo/secrets.nix
index b4448de5..da8e7ae1 100644
--- a/nix/hosts/nixedo/secrets.nix
+++ b/nix/hosts/nixedo/secrets.nix
@@ -1,6 +1,6 @@
{
age.secrets = {
- cloudflare-opdavies-uk.file = ../../secrets/cloudflare-opdavies-uk.age;
+ cloudflare.file = ../../secrets/cloudflare.age;
tubearchivist.file = ../../secrets/tubearchivist.age;
};
}
diff --git a/nix/modules/nixos/features/homelab/audiobookshelf.nix b/nix/modules/nixos/features/homelab/audiobookshelf.nix
index a0012a30..a357270d 100644
--- a/nix/modules/nixos/features/homelab/audiobookshelf.nix
+++ b/nix/modules/nixos/features/homelab/audiobookshelf.nix
@@ -16,8 +16,8 @@ in
port = 4001;
};
- caddy.virtualHosts."audiobookshelf.opdavies.uk" = {
- useACMEHost = "opdavies.uk";
+ caddy.virtualHosts."audiobookshelf.oliverdavies.uk" = {
+ useACMEHost = "oliverdavies.uk";
extraConfig = "reverse_proxy localhost:${toString config.services.audiobookshelf.port}";
};
diff --git a/nix/modules/nixos/features/homelab/containers/beaverhabits.nix b/nix/modules/nixos/features/homelab/containers/beaverhabits.nix
index 98f362cd..434f748e 100644
--- a/nix/modules/nixos/features/homelab/containers/beaverhabits.nix
+++ b/nix/modules/nixos/features/homelab/containers/beaverhabits.nix
@@ -93,8 +93,8 @@ in
};
};
- services.caddy.virtualHosts."beaverhabits.opdavies.uk" = {
- useACMEHost = "opdavies.uk";
+ services.caddy.virtualHosts."beaverhabits.oliverdavies.uk" = {
+ useACMEHost = "oliverdavies.uk";
extraConfig = "reverse_proxy localhost:${toString port}";
};
diff --git a/nix/modules/nixos/features/homelab/containers/freshrss.nix b/nix/modules/nixos/features/homelab/containers/freshrss.nix
index 0dce90ff..b383f718 100644
--- a/nix/modules/nixos/features/homelab/containers/freshrss.nix
+++ b/nix/modules/nixos/features/homelab/containers/freshrss.nix
@@ -100,8 +100,8 @@ in
wantedBy = [ "multi-user.target" ];
};
- services.caddy.virtualHosts."freshrss.opdavies.uk" = {
- useACMEHost = "opdavies.uk";
+ services.caddy.virtualHosts."freshrss.oliverdavies.uk" = {
+ useACMEHost = "oliverdavies.uk";
extraConfig = "reverse_proxy localhost:${toString port}";
};
diff --git a/nix/modules/nixos/features/homelab/containers/tubearchivist.nix b/nix/modules/nixos/features/homelab/containers/tubearchivist.nix
index d78afaf0..ed10053c 100644
--- a/nix/modules/nixos/features/homelab/containers/tubearchivist.nix
+++ b/nix/modules/nixos/features/homelab/containers/tubearchivist.nix
@@ -286,8 +286,8 @@ in
wantedBy = [ "multi-user.target" ];
};
- services.caddy.virtualHosts."tubearchivist.opdavies.uk" = {
- useACMEHost = "opdavies.uk";
+ services.caddy.virtualHosts."tubearchivist.oliverdavies.uk" = {
+ useACMEHost = "oliverdavies.uk";
extraConfig = "reverse_proxy localhost:${toString port}";
};
diff --git a/nix/modules/nixos/features/homelab/forgejo.nix b/nix/modules/nixos/features/homelab/forgejo.nix
index 509c34c9..d23ba475 100644
--- a/nix/modules/nixos/features/homelab/forgejo.nix
+++ b/nix/modules/nixos/features/homelab/forgejo.nix
@@ -14,7 +14,7 @@ with lib;
settings = {
server = {
- DOMAIN = "forgejo.opdavies.uk";
+ DOMAIN = "forgejo.oliverdavies.uk";
HTTP_PORT = 2223;
};
@@ -25,7 +25,7 @@ with lib;
};
caddy.virtualHosts."${config.services.forgejo.settings.server.DOMAIN}" = {
- useACMEHost = "opdavies.uk";
+ useACMEHost = "oliverdavies.uk";
extraConfig = "reverse_proxy localhost:${toString config.services.forgejo.settings.server.HTTP_PORT}";
};
diff --git a/nix/modules/nixos/features/homelab/gitea.nix b/nix/modules/nixos/features/homelab/gitea.nix
index dadf2270..d75221dc 100644
--- a/nix/modules/nixos/features/homelab/gitea.nix
+++ b/nix/modules/nixos/features/homelab/gitea.nix
@@ -26,8 +26,8 @@ in
};
};
- caddy.virtualHosts."gitea.opdavies.uk" = {
- useACMEHost = "opdavies.uk";
+ caddy.virtualHosts."gitea.oliverdavies.uk" = {
+ useACMEHost = "oliverdavies.uk";
extraConfig = "reverse_proxy localhost:${toString port}";
};
diff --git a/nix/modules/nixos/features/homelab/immich.nix b/nix/modules/nixos/features/homelab/immich.nix
index 82b89dd2..627a8586 100644
--- a/nix/modules/nixos/features/homelab/immich.nix
+++ b/nix/modules/nixos/features/homelab/immich.nix
@@ -19,8 +19,8 @@ with lib;
environment.systemPackages = [ pkgs.immich-cli ];
- services.caddy.virtualHosts."immich.opdavies.uk" = {
- useACMEHost = "opdavies.uk";
+ services.caddy.virtualHosts."immich.oliverdavies.uk" = {
+ useACMEHost = "oliverdavies.uk";
extraConfig = "reverse_proxy localhost:${toString config.services.immich.port}";
};
diff --git a/nix/modules/nixos/features/homelab/jellyfin.nix b/nix/modules/nixos/features/homelab/jellyfin.nix
index 4804a78e..89bc38bf 100644
--- a/nix/modules/nixos/features/homelab/jellyfin.nix
+++ b/nix/modules/nixos/features/homelab/jellyfin.nix
@@ -13,8 +13,8 @@ with lib;
configDir = "/mnt/media/jellyfin";
};
- services.caddy.virtualHosts."jellyfin.opdavies.uk" = {
- useACMEHost = "opdavies.uk";
+ services.caddy.virtualHosts."jellyfin.oliverdavies.uk" = {
+ useACMEHost = "oliverdavies.uk";
extraConfig = "reverse_proxy localhost:8096";
};
diff --git a/nix/modules/nixos/features/homelab/paperless.nix b/nix/modules/nixos/features/homelab/paperless.nix
index 38b1c375..4184ea92 100644
--- a/nix/modules/nixos/features/homelab/paperless.nix
+++ b/nix/modules/nixos/features/homelab/paperless.nix
@@ -2,6 +2,9 @@
with lib;
+let
+ url = "paperless.oliverdavies.uk";
+in
{
options.features.homelab.paperless.enable = mkEnableOption "Enable paperless";
@@ -13,12 +16,12 @@ with lib;
dataDir = "/mnt/media/paperless";
settings = {
- PAPERLESS_URL = "https://paperless.opdavies.uk";
+ PAPERLESS_URL = "https://${url}";
};
};
- caddy.virtualHosts."paperless.opdavies.uk" = {
- useACMEHost = "opdavies.uk";
+ caddy.virtualHosts."${url}" = {
+ useACMEHost = "oliverdavies.uk";
extraConfig = "reverse_proxy localhost:28981";
};
diff --git a/nix/modules/nixos/features/homelab/vaultwarden.nix b/nix/modules/nixos/features/homelab/vaultwarden.nix
index 25767b6a..2871d473 100644
--- a/nix/modules/nixos/features/homelab/vaultwarden.nix
+++ b/nix/modules/nixos/features/homelab/vaultwarden.nix
@@ -11,7 +11,7 @@ with lib;
enable = true;
config = {
- DOMAIN = "https://vaultwarden.opdavies.uk";
+ DOMAIN = "https://vaultwarden.oliverdavies.uk";
# TODO: check registrations are disabled.
SIGNUPS_ALLOWED = false;
@@ -21,8 +21,8 @@ with lib;
};
};
- caddy.virtualHosts."vaultwarden.opdavies.uk" = {
- useACMEHost = "opdavies.uk";
+ caddy.virtualHosts."vaultwarden.oliverdavies.uk" = {
+ useACMEHost = "oliverdavies.uk";
extraConfig = "reverse_proxy localhost:${toString config.services.vaultwarden.config.ROCKET_PORT}";
};
diff --git a/nix/secrets.nix b/nix/secrets.nix
index 800d970b..c2553741 100644
--- a/nix/secrets.nix
+++ b/nix/secrets.nix
@@ -13,14 +13,11 @@ in
{
"secrets/cloudflare.age".publicKeys = [
hosts.hetznix
+ hosts.nixedo
hosts.t490
users.opdavies
] ++ users;
- "secrets/cloudflare-opdavies-uk.age".publicKeys = [
- hosts.nixedo
- ] ++ users;
-
"secrets/tubearchivist.age".publicKeys = [
hosts.lemp11
hosts.nixedo
diff --git a/nix/secrets/cloudflare-opdavies-uk.age b/nix/secrets/cloudflare-opdavies-uk.age
deleted file mode 100644
index ee5e9dc35fb7f21c3ccf06e5840d63d25965f445..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1100
zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCUlEDm!qPFF}tGx4lU
z^LO>}PImI}G|VVV^EYwx_4D`gtSm0_(~i=Qun2L<j7pEJOy&yka4!qX3eR!#D0KET
z%qj7AH4kwuuF7x@jZDw?NeOmOs?ZPibICWzFo4-sRGg@wT^14^Sk6^m?rrHG;^gR<
z=H=t!Z|-kV5s>Ow78T@_R_tP)pJb9!r0*D2q3xMwp>3L_@1GOs=V+1_5t?3{7?B*B
zXyL|HnNnp^QXG<A=$ToX9bldwl&)>6A8Fz4U7i|R?ilG4WKf(E;*#T==bl`Zp>G(P
z<Lp|J7-eV@krYypTU@5k<!^2t;AWDW>+E4rk`$Kf7ZDnkm+h(Vl9%M_7VP0v6lodY
zW8z#|Y#dNrX{_yGo}5(V<Wv^uXy8}ro$4GC#uerg;uMr=Vv<@^nQN9}nCN2Qm*Q98
zTH)kbTw&xGVQg5C<{KVlkY(Xn8d&I77*?8D6dqOXW|`|*;uD^fZq8+D5|HL&Ru&#&
zky7ZBY@Ae7S{jn;WSJP{6j+{^Rv6@$Ug=g)SZ-_-;^`adpW~C3>0a(*X<-;t=w09%
z7*fTRQ4&!cRvc0sk(ZcJl$C3dXdddCVHy?a8=jMD<ds$u>5`rA;Z{-}oMquso~d0D
z>YWytV-W5U=2qpAl<ObH6&m7L=H+ARpA=Z?<L79Sl51&hXkl!bm=Ta(k!6<XR2A;x
z7+7H7>l=}l9pvp_YFSq0?`0Y4lkFN}6j|mI&Q(y9>g1kX<W^V}9$czjlvEfHl3eKO
zn4OYuV&avOTVm>wUl5s+mQtGMQem0s>!hDoR#oa(<zrA}>6GQ}<H!~2RcvBz92}9Z
z?Vc7|l9puV8c|?W?h}w`n(Y@5<Q-LJ5NTxMU1FT(RZ@}aTM}I59BH9%?v|dOQx;NO
zWtziP;1gKptzYcxpB!nHm{yhHmSa*BVjgT{>}wokoLb;i7FA;5<fxyXpYLc`5t{3j
zWKm|47+K|HnQNvUR_W%*Wgg}j<QeASQJPbf6;_;5m=$Rh<l!IX6BbzEmgVJB;%kr@
zRu<;t6qe}=OUJNWQ&^ZBS?Q>dl9FGpU6dY~QtTIEP+@MNUs4|7YOEa*Se9nt;;pUi
zSQz1LQCOB=;Tp+h5fWwKZBSqmU>;OuY!Vugl@sM!T$1RcU0Pxg5@})*7?K<5oNMY-
z7MahbtE;PEp5o^fo>7o$Vr-CYW*(Rr;!%~9U6pBJ8kKHdoExa`?;n|Ek?$4Z8C1^I
z&1C5?qmpI+-u>q*wVs*ZFJDm^zHr%Bj_`}m9_xfX{2AII^{v6AJTOM{Wsu;HY*DM_
z5)(Ka?s1q|$z<)l^f5i?*Pjha3<(n>mf5eB*HduVuJO~h_v6n$PJ9g-4^MB*2w(sJ
D)YWzC