chaos/nixfiles
1
0
Fork 0
Code Issues 2 Releases Activity

fix rclone sync on b2, add extraArgs, fixed misskey media sync

Browse source
This commit is contained in:
Chaos 2023-03-25 09:33:20 +00:00
parent d9c1000b18
commit 7f7754272e
No known key found for this signature in database
8 changed files with 722 additions and 691 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
hosts/hetzner-vm/containers/storage/profiles/rclone-serve.nix
View file

@ -6,6 +6,7 @@ in {
"d /caches - storage storage"
"d /caches/main_webdav_serve - storage storage"
"d /caches/media_webdav_serve - storage storage"
"d /caches/backups_misskey_webdav_serve - storage storage"
];
services.rclone-serve = let
@ -37,6 +38,10 @@ in {
"--addr=0.0.0.0:${toString ports.rclone_serve_webdav_misskey}"
"--htpasswd=${secrets.webdav_misskey_htpasswd.path}"
"--baseurl=/Misskey/"
"--cache-dir=/caches/backups_misskey_webdav_serve"
"--vfs-cache-max-age=30m"
"--vfs-cache-max-size=3g"
"--vfs-cache-mode=full"
];
inherit serviceConfig;
}

3
hosts/hetzner-vm/containers/storage/profiles/rclone-sync.nix
View file

@ -6,6 +6,9 @@
OnStartupSec = "60";
OnCalendar = "4h";
};
extraArgs = [
"--fast-list"
];
};
in {
enable = true;

2
hosts/hetzner-vm/containers/storage/storage.nix
View file

@ -48,6 +48,8 @@ in {
profiles.users
]);
environment.systemPackages = with pkgs; [rclone];
home-manager.users.root = {
imports = with tree; [home.base home.dev.small];
home.packages = with pkgs; [vault];

38
hosts/hetzner-vm/profiles/misskey.nix
View file

@ -134,19 +134,29 @@ in {
"L /home/misskey/.config/rclone/rclone.conf - - - - ${secrets.misskey_storage_rclone_config.path}"
];
services.rclone-sync = {
enable = true;
user = "misskey";
sync_jobs = [
{
source = "/home/misskey/misskey-files";
dest = "Storage-Media-Crypt:";
id = "misskey_media";
timerConfig = {
OnStartupSec = "60";
OnCalendar = "4h";
};
}
];
systemd.services."misskey-files-sync" = {
serviceConfig.Type = "oneshot";
script = let
bsdtar = "${pkgs.libarchive}/bin/bsdtar";
rclone = "${pkgs.rclone}/bin/rclone";
in ''
pushd /home/misskey
pushd /home/misskey/misskey-files
${bsdtar} cvf ../Media.tar .
popd
${rclone} copy Media.tar Storage-Media-Crypt:Media.tar
rm Media.tar
popd
'';
serviceConfig.User = "misskey";
};
systemd.timers."misskey-files-sync" = {
wantedBy = ["timers.target"];
partOf = ["misskey-files-sync.service"];
timerConfig = {
OnStartupSec = "60";
OnCalendar = "4h";
};
};
}

11
modules/nixos/rclone-sync.nix
View file

@ -17,7 +17,7 @@ with lib; let
then "${cfg.user}"
else "root";
ExecStart = "${pkgs.rclone}/bin/rclone sync ${sync_config.source} ${sync_config.dest} -P";
ExecStart = "${pkgs.rclone}/bin/rclone sync ${sync_config.source} ${sync_config.dest} ${lib.concatStringsSep " " sync_config.extraArgs} -P";
}
(lib.mkIf sync_config.autoRestart {
TimeoutSec = 60;
@ -47,6 +47,11 @@ in {
dest = mkOption {type = types.str;};
id = mkOption {type = types.str;};
extraArgs = mkOption {
type = types.listOf types.str;
default = [];
};
autoRestart = mkOption {
type = types.bool;
default = true;
@ -76,7 +81,7 @@ in {
[
(pkgs.writeShellScriptBin "rclone-sync-all" (lib.concatStringsSep "\n" (map (
job: ''
${pkgs.rclone}/bin/rclone sync ${job.source} ${job.dest} -P
${pkgs.rclone}/bin/rclone sync ${job.source} ${job.dest} ${lib.concatStringsSep " " job.extraArgs} -P $@
''
)
cfg.sync_jobs)))
@ -85,7 +90,7 @@ in {
map (
job:
pkgs.writeShellScriptBin "rclone-manual-sync-${job.id}" ''
exec ${pkgs.rclone}/bin/rclone sync ${job.source} ${job.dest} -P
exec ${pkgs.rclone}/bin/rclone sync ${job.source} ${job.dest} ${lib.concatStringsSep " " job.extraArgs} -P $@
''
)
cfg.sync_jobs

1350
overlay/piped/frontend/yarn.nix
View file

File diff suppressed because it is too large Load diff

2
presets/nixos/server-encrypted-drive.nix
View file

@ -4,7 +4,7 @@
tree,
...
}: {
imports = with tree; [ profiles.sshd ];
imports = with tree; [profiles.sshd];
config.boot = {
loader.systemd-boot.enable = false;