Compare commits

..

No commits in common. "f3d6e88997f73e39166636641d3f9c45c268236d" and "ac28c9679e927809d5fd213b2731751560bba7d0" have entirely different histories.

9 changed files with 123 additions and 25 deletions

View file

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

View file

@ -20,8 +20,6 @@ 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 = { };
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

View file

@ -138,9 +138,29 @@ in
mountPoint = "/var/lib/mysql"; mountPoint = "/var/lib/mysql";
isReadOnly = false; isReadOnly = false;
}; };
media = { samples = {
mountPoint = toString config.services.syncthing.folders.media.path; mountPoint = toString config.services.syncthing.folders.samples.path;
hostPath = toString config.services.syncthing.folders.media.path; hostPath = toString config.services.syncthing.folders.samples.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;
}; };
}; };

View file

@ -19,6 +19,7 @@
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 = {
@ -40,11 +41,17 @@
path = "/media/syncthing/lost-fotos.ct"; path = "/media/syncthing/lost-fotos.ct";
rescanInterval = 40 * 24 * 3600; rescanInterval = 40 * 24 * 3600;
}; };
media = { movies = {
enable = true; enable = true;
watch = true; watch = true;
path = "/media/syncthing/media"; path = "/media/syncthing/movies";
rescanInterval = 3 * 24 * 3600; rescanInterval = 16 * 3600;
};
music-library = {
enable = true;
watch = true;
path = "/media/syncthing/music";
rescanInterval = 2 * 24 * 3600;
}; };
music-projects = { music-projects = {
enable = true; enable = true;
@ -57,6 +64,19 @@
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;
};
}; };
}; };

View file

@ -8,8 +8,6 @@
}; };
# 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 = { };
diskio = { };
processes = { }; processes = { };
systemd_units = { }; systemd_units = { };
nginx.urls = [ "http://localhost/nginx_status" ]; nginx.urls = [ "http://localhost/nginx_status" ];

View file

@ -35,9 +35,9 @@ let
completionScript = completionScript =
let let
copy_map = { copy_map = {
"/media/torrent/downloads/series" = "/media/syncthing/media/incoming/series"; "/media/torrent/downloads/series" = "/media/syncthing/series/incoming";
"/media/torrent/downloads/music" = "/media/syncthing/media/incoming/music"; "/media/torrent/downloads/music" = "/media/syncthing/music/incoming";
"/media/torrent/downloads/movies" = "/media/syncthing/media/incoming/movies"; "/media/torrent/downloads/movies" = "/media/syncthing/movies/incoming";
"/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

View file

@ -31,9 +31,9 @@ let
completionScript = completionScript =
let let
copy_map = { copy_map = {
"/media/torrent/downloads/series" = "/media/syncthing/media/incoming/series"; "/media/torrent/downloads/series" = "/media/syncthing/series/incoming";
"/media/torrent/downloads/music" = "/media/syncthing/media/incoming/music"; "/media/torrent/downloads/music" = "/media/syncthing/music/incoming";
"/media/torrent/downloads/movies" = "/media/syncthing/media/incoming/movies"; "/media/torrent/downloads/movies" = "/media/syncthing/movies/incoming";
"/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

View file

@ -89,7 +89,11 @@
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";
}; };
}; };

View file

@ -98,6 +98,16 @@ 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;
@ -107,10 +117,25 @@ with lib; {
params.keep = "10"; params.keep = "10";
}; };
}; };
media = { movies = {
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;
@ -131,7 +156,25 @@ 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";
};
};
}; };
}; };
} }