diff --git a/backup.nix b/backup.nix index 90cf87b..17788a7 100644 --- a/backup.nix +++ b/backup.nix @@ -12,8 +12,6 @@ let backupConfigFile = "/etc/misskey-backup/conf"; s3Cfg = "/etc/misskey-backup/s3cfg"; - - tarRedisStdoutCmd = "tar -cz -C /var/lib/redis-misskey ."; in { users.users."${user}" = { isSystemUser = true; @@ -44,8 +42,6 @@ in { ]; script = '' - set -o pipefail - ageRecipient="age17ckyc69njpryytc63ynn545jswyucg28k5xg3043g3j6q38dxqwq0wzhm2" bucket="$(grep 'bucket=' < "${backupConfigFile}" | sed 's/bucket \?= \?//g')" prefix="$(grep 'prefix=' < "${backupConfigFile}" | sed 's/prefix \?= \?//g')" @@ -66,7 +62,7 @@ in { pg_dump misskey | gzip | upload "pg_dump.sql.gz" echo "Uploading redis database..." - sudo ${tarRedisStdoutCmd} | upload "redis.tar.gz" + tar -cz -C /var/lib/redis-misskey . | upload "redis.tar.gz" echo "Backup complete to '$s3Dir'" ''; @@ -77,12 +73,4 @@ in { }; systemd.timers.misskey-backup = { timerConfig.Persistent = true; }; - - security.sudo.extraRules = [{ - groups = [ group ]; - commands = [{ - command = tarRedisStdoutCmd; - options = [ "NOPASSWD" ]; - }]; - }]; } diff --git a/postfix.nix b/postfix.nix index c9654b1..600a5d3 100644 --- a/postfix.nix +++ b/postfix.nix @@ -18,6 +18,6 @@ enable = true; selector = "default"; socket = "inet:8891@127.0.0.1"; - domains = "csl:${config.networking.fqdn},admin.${config.networking.fqdn}"; + domains = "csl:${config.networking.fqdn}"; }; }