From 4d02caa6df54d0254735c6fab287fa61e573ea2b Mon Sep 17 00:00:00 2001 From: Ingolf Wagner Date: Fri, 25 Oct 2019 03:03:25 +0200 Subject: [PATCH] reconfigured syncthing --- configs/pepe/syncthing.nix | 10 ++++++-- configs/porani/syncthing.nix | 8 ++++++ configs/sterni/syncthing.nix | 11 ++++++--- configs/workhorse/syncthing.nix | 6 ++--- configs/workout/syncthing.nix | 12 +++++++-- system/all/syncthing.nix | 44 +++++++++++++++++++++------------ 6 files changed, 65 insertions(+), 26 deletions(-) diff --git a/configs/pepe/syncthing.nix b/configs/pepe/syncthing.nix index 65ece41..c16a968 100644 --- a/configs/pepe/syncthing.nix +++ b/configs/pepe/syncthing.nix @@ -14,9 +14,15 @@ overrideFolders = true; folders = { + # on encrypted drive + # ------------------ + desktop.path = "/home/palo/desktop"; + finance.path = "/home/palo/finance"; + lost-fotos.path = "/home/palo/.lost-fotos.ct"; + + # no need to be encrypted + # ----------------------- book.path = "/home/palo/books"; - desktop-encrypted.path = "/home/palo/.desktop.ct"; - finance-encrypted.path = "/home/palo/.finance.ct"; fotos-encrypted.path = "/home/palo/private/.fotos.ct"; kruck-pepe.path = "/home/palo/pepe-kruck"; music-library.path = "/home/palo/music-library"; diff --git a/configs/porani/syncthing.nix b/configs/porani/syncthing.nix index fa47ac4..86a9026 100644 --- a/configs/porani/syncthing.nix +++ b/configs/porani/syncthing.nix @@ -9,6 +9,14 @@ key = toString ; overrideFolders = true; folders = { + # on encrypted device + # ------------------- + desktop.path = "/var/lib/syncthing/desktop"; + finance.path = "/var/lib/syncthing/finance"; + lost-fotos.path = "/var/lib/syncthing/lost-fotos.ct"; + + # on media hard drive (not encrypted) + # ----------------------------------- movies.path = "/media/movies"; music-library.path = "/media/music-library"; podcasts.path = "/media/podcasts"; diff --git a/configs/sterni/syncthing.nix b/configs/sterni/syncthing.nix index 72be451..49da7bf 100644 --- a/configs/sterni/syncthing.nix +++ b/configs/sterni/syncthing.nix @@ -10,13 +10,18 @@ declarative = { cert = toString ; key = toString ; - overrideFolders = true; folders = { + # on encrypted drive + # ------------------ + desktop.path = "/home/palo/desktop"; + finance.path = "/home/palo/finance"; + lost-fotos.path = "/home/palo/.lost-fotos.ct"; + + # no need to be encrypted + # ----------------------- book.path = "/home/palo/books"; - desktop-encrypted.path = "/home/palo/.desktop.ct"; - finance-encrypted.path = "/home/palo/.finance.ct"; fotos-encrypted.path = "/home/palo/private/.fotos.ct"; music-library.path = "/home/palo/music-library"; music-projects.path = "/home/palo/music-projects"; diff --git a/configs/workhorse/syncthing.nix b/configs/workhorse/syncthing.nix index 8dfd4e2..c545af3 100644 --- a/configs/workhorse/syncthing.nix +++ b/configs/workhorse/syncthing.nix @@ -17,9 +17,9 @@ # on encrypted hard drive # ----------------------- - desktop-encrypted.path = "/home/syncthing/.desktop.ct"; - finance-encrypted.path = "/home/syncthing/.finance.ct"; - fotos-encrypted.path = "/home/syncthing/private/.fotos.ct"; + desktop.path = "/home/syncthing/desktop"; + finance.path = "/home/syncthing/finance"; + lost-fotos.path = "/home/syncthing/lost-fotos.ct"; music-projects.path = "/home/syncthing/music-projects"; video-material.path = "/home/syncthing/video-material"; diff --git a/configs/workout/syncthing.nix b/configs/workout/syncthing.nix index e7905d0..3eb7e42 100644 --- a/configs/workout/syncthing.nix +++ b/configs/workout/syncthing.nix @@ -14,9 +14,17 @@ overrideFolders = true; folders = { + # on encrypted drive + # ------------------ + desktop.path = "/home/palo/desktop"; + finance.path = "/home/palo/finance"; + lost-fotos.path = "/home/palo/.lost-fotos.ct"; + + # no need to be encrypted + # ----------------------- book.path = "/home/palo/books"; - desktop-encrypted.path = "/home/palo/.desktop.ct"; - finance-encrypted.path = "/home/palo/.finance.ct"; + #desktop-encrypted.path = "/home/palo/.desktop.ct"; + #finance-encrypted.path = "/home/palo/.finance.ct"; fotos-encrypted.path = "/home/palo/private/.fotos.ct"; kruck-workout.path = "/home/palo/workout-kruck"; music-library-free.path = "/home/palo/music-library-free"; diff --git a/system/all/syncthing.nix b/system/all/syncthing.nix index a76e811..9c7dd01 100644 --- a/system/all/syncthing.nix +++ b/system/all/syncthing.nix @@ -18,11 +18,9 @@ with lib; in (device "workhorse" "AFSAKB6-JLH4QAS-DSRMPI3-6PVCIHF-IIAVLPC-STPNO3Y-YRDU5NW-QD445QI") // (device "pepe" "SZLXFW3-VTAC7UB-V2Z7CHE-3VZAYPL-6D72AK6-OCDMPZP-G4FPY5P-FL6ZVAG") - // (device "kruck" "7NXJTB6-XPQD5AO-Z6LY4GZ-UGCLPJI-3EQSZ4B-YT4OV2F-NWAI2BN-OE3IEQW") - // (device "schasch" "FLY7DHI-TJLEQBJ-JZNC4YV-NBX53Z2-ZBRWADL-BKSFXYZ-L4FMDVH-MOSEVAQ") // (device "workout" "DZOOAKG-GI2SVOS-QEVMFL7-TRHVTPQ-ADIJEVH-RH5WV3J-6M7MJHC-C53EOAC") // (device "porani" "6YOIA4E-X52ZD5Z-FPNWPRS-77QIMMU-VDIXVZB-6BPQN7A-FFJDU4W-EXEGFAI") - // (device "sterni" "NFQP2DG-IK5SEL3-JTOV3HW-HF2EPAO-JQK3VSW-NKVMPFH-LZE6SEQ-INZ25QC") + // (device "sterni" "ZFNNKPD-ZSOAYJQ-VROXXDB-5MD3UTJ-GDCNTSQ-G5POVV3-UZG5HFT-CCAU3AD") // { smartphone = { name = "smartphone"; @@ -46,26 +44,40 @@ with lib; }; folders = { + + # needs to be on encrypted drives + # ------------------------------- + desktop = { + watch = false; + devices = [ "workout" "workhorse" "pepe" "sterni" "porani" ]; + }; + finance = { + watch = false; + devices = [ "workout" "workhorse" "pepe" "sterni" "porani" ]; + }; + + # no need to be stored on encrypted drives + # ---------------------------------------- book = { id = "wwbvs-5lfbh"; watch = false; devices = [ "workout" "pepe" "sterni" ]; }; - desktop-encrypted = { - id = "ebnth-pfven"; + lost-fotos = { watch = false; - devices = [ "workout" "workhorse" "pepe" "sterni" ]; - }; - fotos-encrypted = { - id = "ddkrc-mevxd"; - watch = false; - devices = [ "workout" "workhorse" "pepe" "sterni" ]; - }; - finance-encrypted = { - id = "gl7rx-sdsnx"; - watch = false; - devices = [ "workout" "workhorse" "pepe" "sterni" ]; + devices = [ "workout" "workhorse" "pepe" "sterni" "porani" ]; }; + #desktop-encrypted = { + # id = "ebnth-pfven"; + # watch = false; + # devices = [ "workout" "workhorse" "pepe" "sterni" ]; + #}; + #finance-encrypted = { + # id = "gl7rx-sdsnx"; + # watch = false; + # devices = [ "workout" "workhorse" "pepe" "sterni" ]; + #}; + movies = { id = "vatmy-c2qf4"; watch = false;