From 600844c56d248bfaae796000bc75e1b9ccf90bcd Mon Sep 17 00:00:00 2001 From: Paul-Henri Froidmont Date: Fri, 16 Jul 2021 03:09:29 +0200 Subject: [PATCH] Reformat nix files --- modules/custom-backup-job.nix | 55 ++++++++++++++++++----------------- modules/postgresql.nix | 2 +- 2 files changed, 29 insertions(+), 28 deletions(-) diff --git a/modules/custom-backup-job.nix b/modules/custom-backup-job.nix index fccd615..30fbf42 100644 --- a/modules/custom-backup-job.nix +++ b/modules/custom-backup-job.nix @@ -2,11 +2,12 @@ with lib; let cfg = config.services.custom-backup-job; -in { +in +{ options.services.custom-backup-job = { additionalReadWritePaths = mkOption { type = with types; listOf path; - default = []; + default = [ ]; }; additionalPreHook = mkOption { @@ -21,30 +22,30 @@ in { }; config = { - services.borgbackup.jobs.data = { - paths = [ "/nix/var/data" ]; - doInit = false; - repo = "backup@212.129.12.205:./"; - encryption = { - mode = "repokey-blake2"; - passCommand = "cat /var/keys/borgbackup-passphrase"; - }; - readWritePaths = [ - "/var/keys/borgbackup-ssh-key" - ] ++ cfg.additionalReadWritePaths; - preHook = '' - #There is no way to specify the permissions on keys so we fix them here - chmod 0600 /var/keys/borgbackup-ssh-key - '' + cfg.additionalPreHook; - environment = { BORG_RSH = "ssh -i /var/keys/borgbackup-ssh-key"; }; - compression = "lz4"; - startAt = cfg.startAt; - prune.keep = { - within = "2d"; - daily = 14; - weekly = 8; - monthly = 12; - }; - }; + services.borgbackup.jobs.data = { + paths = [ "/nix/var/data" ]; + doInit = false; + repo = "backup@212.129.12.205:./"; + encryption = { + mode = "repokey-blake2"; + passCommand = "cat /var/keys/borgbackup-passphrase"; + }; + readWritePaths = [ + "/var/keys/borgbackup-ssh-key" + ] ++ cfg.additionalReadWritePaths; + preHook = '' + #There is no way to specify the permissions on keys so we fix them here + chmod 0600 /var/keys/borgbackup-ssh-key + '' + cfg.additionalPreHook; + environment = { BORG_RSH = "ssh -i /var/keys/borgbackup-ssh-key"; }; + compression = "lz4"; + startAt = cfg.startAt; + prune.keep = { + within = "2d"; + daily = 14; + weekly = 8; + monthly = 12; + }; + }; }; } diff --git a/modules/postgresql.nix b/modules/postgresql.nix index cd4effd..03daa9e 100644 --- a/modules/postgresql.nix +++ b/modules/postgresql.nix @@ -6,7 +6,7 @@ initialScript = "/var/keys/postgres-init.sql"; enableTCPIP = true; identMap = '' - root_as_others root synapse + root_as_others root synapse ''; authentication = '' local all postgres peer