palo/nixos-config
palo/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixing syncthing iowait on rescan

Browse source
This commit is contained in:
Ingolf Wagner 2023-03-12 17:50:01 +01:00
parent fa3f787348
commit f3d6e88997
No known key found for this signature in database
GPG key ID: 76BF5F1928B9618B
9 changed files with 25 additions and 127 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
nixos/machines/pepe/syncthing.nix
View file

@ -5,11 +5,7 @@
custom.samba-share = { custom.samba-share = {
enable = true; enable = true;
folders = { folders = {
movies = config.services.syncthing.folders.movies.path; media = config.services.syncthing.folders.media.path;
music = config.services.syncthing.folders.music-library.path;
samples = config.services.syncthing.folders.samples.path;
series = config.services.syncthing.folders.series.path;
books = config.services.syncthing.folders.books.path;
}; };
private.upload = { private.upload = {
folder = "/media/upload"; folder = "/media/upload";
@ -75,15 +71,14 @@
path = "/media/syncthing/lost-fotos.ct"; path = "/media/syncthing/lost-fotos.ct";
rescanInterval = 5 * 31 * 24 * 3600; rescanInterval = 5 * 31 * 24 * 3600;
}; };
movies = { media = {
enable = true; enable = true;
path = "/media/syncthing/movies"; path = "/media/syncthing/media";
rescanInterval = 8 * 3600; rescanInterval = 120 * 3600;
versioning = {
type = "simple";
params.keep = "3";
}; };
music-library = {
enable = true;
path = "/media/syncthing/music-library";
rescanInterval = 8 * 3600;
}; };
music-projects = { music-projects = {
enable = true; enable = true;
@ -95,16 +90,6 @@
path = "/media/syncthing/nextcloud_backup"; path = "/media/syncthing/nextcloud_backup";
rescanInterval = 8 * 3600; rescanInterval = 8 * 3600;
}; };
samples = {
enable = true;
path = "/media/syncthing/samples";
rescanInterval = 8 * 3600;
};
series = {
enable = true;
path = "/media/syncthing/series";
rescanInterval = 8 * 3600;
};
}; };
}; };

4
nixos/machines/pepe/telegraf.nix
View file

@ -20,8 +20,8 @@ in
}; };
# https://github.com/influxdata/telegraf/tree/master/plugins/inputs < all them plugins # https://github.com/influxdata/telegraf/tree/master/plugins/inputs < all them plugins
inputs = { inputs = {
cpu = {}; cpu = { };
diskio = {}; diskio = { };
x509_cert = [{ x509_cert = [{
sources = (map (url: "${url.url}:443") urls); sources = (map (url: "${url.url}:443") urls);
interval = "30m"; # agent.interval = "10s" is default interval = "30m"; # agent.interval = "10s" is default

26
nixos/machines/robi/nextcloud.nix
View file

@ -138,29 +138,9 @@ in
mountPoint = "/var/lib/mysql"; mountPoint = "/var/lib/mysql";
isReadOnly = false; isReadOnly = false;
}; };
samples = { media = {
mountPoint = toString config.services.syncthing.folders.samples.path; mountPoint = toString config.services.syncthing.folders.media.path;
hostPath = toString config.services.syncthing.folders.samples.path; hostPath = toString config.services.syncthing.folders.media.path;
isReadOnly = true;
};
movies = {
mountPoint = toString config.services.syncthing.folders.movies.path;
hostPath = toString config.services.syncthing.folders.movies.path;
isReadOnly = true;
};
music = {
mountPoint = toString config.services.syncthing.folders.music-library.path;
hostPath = toString config.services.syncthing.folders.music-library.path;
isReadOnly = true;
};
series = {
mountPoint = toString config.services.syncthing.folders.series.path;
hostPath = toString config.services.syncthing.folders.series.path;
isReadOnly = true;
};
books = {
mountPoint = toString config.services.syncthing.folders.books.path;
hostPath = toString config.services.syncthing.folders.books.path;
isReadOnly = true; isReadOnly = true;
}; };
}; };

26
nixos/machines/robi/syncthing.nix
View file

@ -19,7 +19,6 @@
key = toString config.sops.secrets.syncthing_key.path; key = toString config.sops.secrets.syncthing_key.path;
folders = { folders = {
# on media hard drive (not encrypted) # on media hard drive (not encrypted)
# ----------------------------------- # -----------------------------------
#borg-mirror = { #borg-mirror = {
@ -41,17 +40,11 @@
path = "/media/syncthing/lost-fotos.ct"; path = "/media/syncthing/lost-fotos.ct";
rescanInterval = 40 * 24 * 3600; rescanInterval = 40 * 24 * 3600;
}; };
movies = { media = {
enable = true; enable = true;
watch = true; watch = true;
path = "/media/syncthing/movies"; path = "/media/syncthing/media";
rescanInterval = 16 * 3600; rescanInterval = 3 * 24 * 3600;
};
music-library = {
enable = true;
watch = true;
path = "/media/syncthing/music";
rescanInterval = 2 * 24 * 3600;
}; };
music-projects = { music-projects = {
enable = true; enable = true;
@ -64,19 +57,6 @@
path = "/media/syncthing/nextcloud_backup"; path = "/media/syncthing/nextcloud_backup";
rescanInterval = 23 * 3600; rescanInterval = 23 * 3600;
}; };
samples = {
enable = true;
watch = true;
path = "/media/syncthing/samples";
rescanInterval = 41 * 24 * 3600;
};
series = {
enable = true;
watch = true;
path = "/media/syncthing/series";
rescanInterval = 15 * 3600;
};
}; };
}; };

4
nixos/machines/robi/telegraf.nix
View file

@ -8,8 +8,8 @@
}; };
# https://github.com/influxdata/telegraf/tree/master/plugins/inputs < all them plugins # https://github.com/influxdata/telegraf/tree/master/plugins/inputs < all them plugins
inputs = { inputs = {
cpu = {}; cpu = { };
diskio = {}; diskio = { };
processes = { }; processes = { };
systemd_units = { }; systemd_units = { };
nginx.urls = [ "http://localhost/nginx_status" ]; nginx.urls = [ "http://localhost/nginx_status" ];

6
nixos/machines/robi/transmission.nix
View file

@ -35,9 +35,9 @@ let
completionScript = completionScript =
let let
copy_map = { copy_map = {
"/media/torrent/downloads/series" = "/media/syncthing/series/incoming"; "/media/torrent/downloads/series" = "/media/syncthing/media/incoming/series";
"/media/torrent/downloads/music" = "/media/syncthing/music/incoming"; "/media/torrent/downloads/music" = "/media/syncthing/media/incoming/music";
"/media/torrent/downloads/movies" = "/media/syncthing/movies/incoming"; "/media/torrent/downloads/movies" = "/media/syncthing/media/incoming/movies";
"/media/torrent/downloads" = "/media/torrent/incoming"; "/media/torrent/downloads" = "/media/torrent/incoming";
}; };
copy_script = lib.concatStringsSep "\n" (lib.mapAttrsToList copy_script = lib.concatStringsSep "\n" (lib.mapAttrsToList

6
nixos/machines/robi/transmission2.nix
View file

@ -31,9 +31,9 @@ let
completionScript = completionScript =
let let
copy_map = { copy_map = {
"/media/torrent/downloads/series" = "/media/syncthing/series/incoming"; "/media/torrent/downloads/series" = "/media/syncthing/media/incoming/series";
"/media/torrent/downloads/music" = "/media/syncthing/music/incoming"; "/media/torrent/downloads/music" = "/media/syncthing/media/incoming/music";
"/media/torrent/downloads/movies" = "/media/syncthing/movies/incoming"; "/media/torrent/downloads/movies" = "/media/syncthing/media/incoming/movies";
"/media/torrent/downloads" = "/media/torrent/incoming"; "/media/torrent/downloads" = "/media/torrent/incoming";
}; };
copy_script = lib.concatStringsSep "\n" (lib.mapAttrsToList copy_script = lib.concatStringsSep "\n" (lib.mapAttrsToList

4
nixos/machines/sternchen/configuration.nix
View file

@ -89,11 +89,7 @@
custom.samba-share = { custom.samba-share = {
enable = false; enable = false;
folders = { folders = {
#public = "/home/palo/movies";
share = "/home/share"; share = "/home/share";
#syncthing = "/mnt/syncthing";
#movies = "/mnt/syncthing/movies";
#series = "/mnt/syncthing/series";
}; };
}; };

45
nixos/system/all/syncthing.nix
View file

@ -98,16 +98,6 @@ with lib; {
# no need to be stored on encrypted drives # no need to be stored on encrypted drives
# ---------------------------------------- # ----------------------------------------
books = {
enable = lib.mkDefault false;
id = "wwbvs-5lfbh";
watch = lib.mkDefault false;
devices = [ "pepe" "cream" "sterni" "robi" ];
versioning = {
type = "simple";
params.keep = "10";
};
};
lost-fotos = { lost-fotos = {
enable = lib.mkDefault false; enable = lib.mkDefault false;
watch = lib.mkDefault false; watch = lib.mkDefault false;
@ -117,25 +107,10 @@ with lib; {
params.keep = "10"; params.keep = "10";
}; };
}; };
movies = { media = {
enable = lib.mkDefault false; enable = lib.mkDefault false;
id = "vatmy-c2qf4";
watch = lib.mkDefault false; watch = lib.mkDefault false;
devices = [ "pepe" "robi" ]; devices = [ "pepe" "robi" ];
versioning = {
type = "simple";
params.keep = "3";
};
};
music-library = {
enable = lib.mkDefault false;
id = "gytmq-r2zrx";
watch = lib.mkDefault false;
devices = [ "pepe" "cream" "sterni" "robi" ];
versioning = {
type = "simple";
params.keep = "10";
};
}; };
music-projects = { music-projects = {
enable = lib.mkDefault false; enable = lib.mkDefault false;
@ -156,25 +131,7 @@ with lib; {
params.keep = "2"; params.keep = "2";
}; };
}; };
samples = {
enable = lib.mkDefault false;
id = "pcgkj-tjucd";
watch = lib.mkDefault false;
devices = [ "pepe" "robi" ];
}; };
series = {
enable = lib.mkDefault false;
id = "all-series";
watch = lib.mkDefault false;
devices = [ "pepe" "robi" ];
versioning = {
type = "simple";
params.keep = "10";
};
};
};
}; };
} }