Cleanup backup settings

This commit is contained in:
Greg Hellings
2024-02-07 07:43:10 +00:00
parent 9713346b83
commit 88f64d48e2
3 changed files with 13 additions and 12 deletions
+12 -3
View File
@@ -1,4 +1,4 @@
{ pkgs, ... }: { pkgs, lib, ... }:
{ {
imports = [ imports = [
@@ -10,11 +10,21 @@
./postgres.nix ./postgres.nix
./synapse.nix ./synapse.nix
]; ];
greg = { greg = {
home = false; home = false;
linode.enable = true; linode.enable = true;
tailscale.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 = { networking = {
hostName = "linode"; hostName = "linode";
domain = "thehellings.com"; domain = "thehellings.com";
@@ -22,10 +32,9 @@
"100.88.91.27" "100.88.91.27"
]; ];
}; };
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
bind bind
forgejo
gitea-actions-runner
graphviz graphviz
nix-du nix-du
]; ];
-8
View File
@@ -18,15 +18,9 @@
ensureUsers = [ { ensureUsers = [ {
name = "nextcloud"; name = "nextcloud";
ensureDBOwnership = true; ensureDBOwnership = true;
} {
name = "forgejo";
ensureDBOwnership = true;
} { } {
name = "dendrite"; name = "dendrite";
ensureDBOwnership = true; ensureDBOwnership = true;
} {
name = "monica";
ensureDBOwnership = true;
} ]; } ];
settings = { settings = {
log_connections = true; log_connections = true;
@@ -43,8 +37,6 @@ root root postgres
enable = true; enable = true;
databases = [ databases = [
"dendrite" "dendrite"
"forgejo"
"monica"
"nextcloud" "nextcloud"
]; ];
}; };
+1 -1
View File
@@ -12,7 +12,7 @@ let
serviceConfig = { serviceConfig = {
User = job.user; User = job.user;
ExecPre = lib.optionalString (job.pre != "") job.pre; 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; ExecPost = lib.optionalString (job.post != "") job.post;
}; };
}; };