sops ace + docker fix

This commit is contained in:
Lennart J. Kurzweg (Nx2)
2024-06-03 23:52:44 +02:00
parent aff6992949
commit 4f01013081
7 changed files with 53 additions and 32 deletions

View File

@@ -19,7 +19,6 @@ let
dirs = {
default = { name = "sync"; path = "/home/${user}/sync"; };
};
cd = "/home/${user}/.config/syncthing";
in
lib.mkIf (user != "tv")
{
@@ -33,11 +32,12 @@ lib.mkIf (user != "tv")
enable = true;
user = "${user}";
dataDir = "/home/${user}/.local/share/syncthing"; # useless ?
configDir = cd;
configDir = "/home/${user}/.config/syncthing";
key = config.sops.secrets."syncthing/${host}/key.pem".path;
cert = config.sops.secrets."syncthing/${host}/cert.pem".path;
overrideDevices = true;
overrideFolders = true;
# guiAddress = "127.0.0.1:8384";
guiAddress = if ( host == "NxACE" ) then "0.0.0.0:8384" else "127.0.0.1:8384";
settings = {
devices = with (builtins.mapAttrs conv devices); if (host == "NxXPS") then (
@@ -45,19 +45,18 @@ lib.mkIf (user != "tv")
) else if (host == "NxNORTH") then (
xps // ace // s21u
) else (
north // xps // s21u // diane // daniel // tessa // georg
# north // xps // s21u // diane // daniel // tessa // georg
north // xps // s21u
);
folders = with dirs; if (host == "NxXPS") then {
"${default.name}" = {
path = default.path;
devices = with devices; (justname [ north s21u ]);
# devices = with devices; (justname [ north ace s21u ]);
devices = with devices; (justname [ north ace s21u ]);
};
} else if (host == "NxNORTH") then {
"${default.name}" = {
path = default.path;
devices = with devices; (justname [ s21u xps ]);
# devices = with devices; (justname [ xps ace s21u ]);
devices = with devices; (justname [ xps ace s21u ]);
};
} else {
"${default.name}" = {