From 43987268622a9de9879e8393a3616d2f3b89441d Mon Sep 17 00:00:00 2001 From: Ingolf Wagner Date: Tue, 16 Apr 2024 08:36:02 +0200 Subject: [PATCH] migrate vault and jellyfin --- nixos/machines/chungus/rbackup.nix | 5 ++--- nixos/machines/orbi/configuration.nix | 10 ++++++++-- nixos/machines/orbi/media-jellyfin.nix | 2 +- .../orbi/{vaultwarden.nix => service-vaultwarden.nix} | 2 -- nixos/machines/robi/configuration.nix | 2 +- 5 files changed, 12 insertions(+), 9 deletions(-) rename nixos/machines/orbi/{vaultwarden.nix => service-vaultwarden.nix} (93%) diff --git a/nixos/machines/chungus/rbackup.nix b/nixos/machines/chungus/rbackup.nix index 32cda0f..2684aab 100644 --- a/nixos/machines/chungus/rbackup.nix +++ b/nixos/machines/chungus/rbackup.nix @@ -19,11 +19,10 @@ src = "root@robi:/var/lib/taskserver/"; dst = "/mirror/taskwarrior"; }; - # todo bitwarden = { sshKeyPath = config.sops.secrets.rsync_private_key.path; - src = "root@robi:/var/lib/bitwarden_rs/"; - dst = "/mirror/bitwarden_rs"; + src = "root@orbi:/var/lib/bitwarden_rs/"; + dst = "/mirror/vaultwarden"; }; matrix-terranix = { sshKeyPath = config.sops.secrets.rsync_private_key.path; diff --git a/nixos/machines/orbi/configuration.nix b/nixos/machines/orbi/configuration.nix index f972f39..d6e2e0f 100644 --- a/nixos/machines/orbi/configuration.nix +++ b/nixos/machines/orbi/configuration.nix @@ -11,9 +11,12 @@ ./service-hedgedoc.nix ./service-forgejo.nix + + # todo + ./service-vaultwarden.nix + #./borg.nix #./taskserver.nix - #./vaultwarden.nix ./nginx-ingolf-wagner-de.nix ./nginx-wkd.nix @@ -22,7 +25,10 @@ ./network-wireguard.nix ./media-share.nix - #./media-jellyfin.nix + + # todo + ./media-jellyfin.nix + #./media-syncthing.nix #./media-transmission.nix ./media-transmission2.nix diff --git a/nixos/machines/orbi/media-jellyfin.nix b/nixos/machines/orbi/media-jellyfin.nix index 39f0af4..c2e40bb 100644 --- a/nixos/machines/orbi/media-jellyfin.nix +++ b/nixos/machines/orbi/media-jellyfin.nix @@ -36,6 +36,6 @@ { enable = true; virtualHosts. "flix.ingolf-wagner.de" = flixConfig; - virtualHosts. "video.ingolf-wagner.de" = flixConfig; + #virtualHosts. "video.ingolf-wagner.de" = flixConfig; }; } diff --git a/nixos/machines/orbi/vaultwarden.nix b/nixos/machines/orbi/service-vaultwarden.nix similarity index 93% rename from nixos/machines/orbi/vaultwarden.nix rename to nixos/machines/orbi/service-vaultwarden.nix index 076242c..529a407 100644 --- a/nixos/machines/orbi/vaultwarden.nix +++ b/nixos/machines/orbi/service-vaultwarden.nix @@ -10,8 +10,6 @@ }; }; - backup.dirs = [ "/var/lib/bitwarden_rs" ]; - services.nginx = { enable = true; recommendedProxySettings = true; diff --git a/nixos/machines/robi/configuration.nix b/nixos/machines/robi/configuration.nix index aa07a8e..a33fb34 100644 --- a/nixos/machines/robi/configuration.nix +++ b/nixos/machines/robi/configuration.nix @@ -15,7 +15,7 @@ #./nextcloud.nix ./packages.nix ./taskserver.nix - ./vaultwarden.nix + #./vaultwarden.nix #./nginx.nix #./nginx-wkd.nix