From 88f64d48e2e727fd3b87cf0eeaf8dc928ba74176 Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Wed, 7 Feb 2024 07:43:10 +0000 Subject: [PATCH] Cleanup backup settings --- hosts/linode/default.nix | 15 ++++++++++++--- hosts/linode/postgres.nix | 8 -------- modules/linux/backup.nix | 2 +- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/hosts/linode/default.nix b/hosts/linode/default.nix index c3eeb02..3a5464f 100644 --- a/hosts/linode/default.nix +++ b/hosts/linode/default.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ pkgs, lib, ... }: { imports = [ @@ -10,11 +10,21 @@ ./postgres.nix ./synapse.nix ]; + greg = { home = false; linode.enable = true; tailscale.enable = true; }; + + programs.ssh.extraConfig = lib.strings.concatStringsSep "\n" [ + "Host chronicles.shire-zebra.ts.net" + " User backup" + " IdentityFile /etc/ssh/backup_ed25519" + " StrictHostKeyChecking no" + " UserKnownHostsFile /dev/null" + ]; + networking = { hostName = "linode"; domain = "thehellings.com"; @@ -22,10 +32,9 @@ "100.88.91.27" ]; }; + environment.systemPackages = with pkgs; [ bind - forgejo - gitea-actions-runner graphviz nix-du ]; diff --git a/hosts/linode/postgres.nix b/hosts/linode/postgres.nix index cea2481..2e3054f 100644 --- a/hosts/linode/postgres.nix +++ b/hosts/linode/postgres.nix @@ -18,15 +18,9 @@ ensureUsers = [ { name = "nextcloud"; ensureDBOwnership = true; - } { - name = "forgejo"; - ensureDBOwnership = true; } { name = "dendrite"; ensureDBOwnership = true; - } { - name = "monica"; - ensureDBOwnership = true; } ]; settings = { log_connections = true; @@ -43,8 +37,6 @@ root root postgres enable = true; databases = [ "dendrite" - "forgejo" - "monica" "nextcloud" ]; }; diff --git a/modules/linux/backup.nix b/modules/linux/backup.nix index 951b908..58bd1fe 100644 --- a/modules/linux/backup.nix +++ b/modules/linux/backup.nix @@ -12,7 +12,7 @@ let serviceConfig = { User = job.user; ExecPre = lib.optionalString (job.pre != "") job.pre; - ExecStart = "${pkgs.rsync}/bin/rsync -avz --delete -e '${pkgs.openssh}/bin/ssh -oStrictHostKeyChecking=no -oUserKnownHostsFile=/dev/null' ${job.src}/ backup@nas:/volume1/NetBackup/${job.dest}"; + ExecStart = "${pkgs.rsync}/bin/rsync -avz --delete -e '${pkgs.openssh}/bin/ssh -oStrictHostKeyChecking=no -oUserKnownHostsFile=/dev/null' ${job.src}/ backup@chronicles.shire-zebra.ts.net:/volume1/NetBackup/${job.dest}"; ExecPost = lib.optionalString (job.post != "") job.post; }; };