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

permown: simplify and fixed issues

Browse source
This commit is contained in:
Ingolf Wagner 2020-09-08 21:45:42 +02:00
parent 9117901c5e
commit e78edef007
No known key found for this signature in database
GPG key ID: 76BF5F1928B9618B
6 changed files with 72 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
configs/pepe/syncthing.nix
View file

@ -81,16 +81,14 @@
};
};
# todo not working properly
#systemd.services."permown._media_syncthing" = {
# bindsTo = [ "media.mount" ];
# after = [ "media.mount" ];
#};
#system.permown."/media/syncthing" = {
# owner = "syncthing";
# group = "syncthing";
# umask = "0003";
#};
system.permown."/media/syncthing" = {
owner = "syncthing";
group = "syncthing";
};
systemd.services."permown._media_syncthing" = {
bindsTo = [ "media.mount" ];
after = [ "media.mount" ];
};
systemd.services."syncthing" = {
bindsTo = [ "media.mount" ];
after = [ "media.mount" ];

9
configs/porani/syncthing.nix
View file

@ -42,14 +42,13 @@
};
};
systemd.services."permown._media" = {
bindsTo = [ "media.mount" ];
after = [ "media.mount" ];
};
system.permown."/media" = {
owner = "syncthing";
group = "syncthing";
umask = "0007";
};
systemd.services."permown._media" = {
bindsTo = [ "media.mount" ];
after = [ "media.mount" ];
};
systemd.services."syncthing" = {
bindsTo = [ "media.mount" ];

5
configs/sterni/syncthing.nix
View file

@ -65,4 +65,9 @@
};
};
};
system.permown."/home/palo/music-library" = {
owner = "palo";
group = "users";
};
}

1
configs/workhorse/borg.nix
View file

@ -5,7 +5,6 @@
quota = "100G";
allowSubRepos = true;
authorizedKeys = [
# todo rename
(lib.fileContents <common_secrets/backup/ssh_rsa.pub>)
(lib.fileContents <assets/ssh/card_rsa.pub>)
];

19
configs/workhorse/syncthing.nix
View file

@ -100,17 +100,14 @@
};
};
# todo now working properly
# -------------------------
#systemd.services."permown._media_syncthing" = {
# bindsTo = [ "media.mount" ];
# after = [ "media.mount" ];
#};
#system.permown."/media/syncthing" = {
# owner = "syncthing";
# group = "syncthing";
# umask = "0002";
#};
system.permown."/media/syncthing" = {
owner = "syncthing";
group = "syncthing";
};
systemd.services."permown._media_syncthing" = {
bindsTo = [ "media.mount" ];
after = [ "media.mount" ];
};
systemd.services."syncthing" = {
bindsTo = [ "media.mount" ];
after = [ "media.mount" ];

100
modules/system/permown.nix
View file

@ -1,6 +1,11 @@
{ config, pkgs, lib, ... }:
with lib;
let cfg = config.system.permown;
let
cfg = config.system.permown;
nameGenerator = path: "permown.${replaceStrings [ "/" ] [ "_" ] path}";
in {
options.system.permown = mkOption {
@ -10,11 +15,11 @@ in {
options = {
directory-mode = mkOption {
default = "=rwx";
type = types.str; # TODO
type = types.str;
};
file-mode = mkOption {
default = "=rw";
type = types.str; # TODO
type = types.str;
};
group = mkOption {
apply = x: if x == null then "" else x;
@ -30,69 +35,58 @@ in {
default = "0027";
type = types.str;
};
timer = mkOption {
default = "hourly";
type = types.str;
description =
"OnCalendar string on how frequent should this command run";
};
};
}));
};
config = let plans = lib.attrValues cfg;
in mkIf (plans != [ ]) {
system.activationScripts.permown = let
mkdir = plan: # sh
''
${pkgs.coreutils}/bin/mkdir -p ${plan.path}
'';
mkdir = { path, ... }: ''
${pkgs.coreutils}/bin/mkdir -p ${path}
'';
in concatMapStrings mkdir plans;
# genAttrs' = names: f: listToAttrs (map f names);
systemd.services = listToAttrs (flip map plans
({ path, directory-mode, file-mode, owner, group, umask, ... }: {
name = nameGenerator path;
value = {
environment = {
DIR_MODE = directory-mode;
FILE_MODE = file-mode;
OWNER_GROUP = "${owner}:${group}";
ROOT_PATH = path;
};
path = [ pkgs.coreutils pkgs.findutils pkgs.inotifyTools ];
serviceConfig = {
ExecStart = pkgs.writers.writeDash "permown" ''
set -efu
find "$ROOT_PATH" -exec chown -h "$OWNER_GROUP" {} +
find "$ROOT_PATH" -type d -exec chmod "$DIR_MODE" {} +
find "$ROOT_PATH" -type f -exec chmod "$FILE_MODE" {} +
'';
PrivateTmp = true;
Restart = "always";
RestartSec = 10;
UMask = umask;
};
wantedBy = [ "multi-user.target" ];
};
}));
systemd.services = listToAttrs (flip map plans (plan: {
name = "permown.${replaceStrings [ "/" ] [ "_" ] plan.path}";
systemd.timers = listToAttrs (flip map plans ({ path, timer, ... }: {
name = nameGenerator path;
value = {
environment = {
DIR_MODE = plan.directory-mode;
FILE_MODE = plan.file-mode;
OWNER_GROUP = "${plan.owner}:${plan.group}";
ROOT_PATH = plan.path;
};
path = [ pkgs.coreutils pkgs.findutils pkgs.inotifyTools ];
serviceConfig = {
ExecStart = pkgs.writers.writeDash "permown" ''
set -efu
find "$ROOT_PATH" -exec chown -h "$OWNER_GROUP" {} +
find "$ROOT_PATH" -type d -exec chmod "$DIR_MODE" {} +
find "$ROOT_PATH" -type f -exec chmod "$FILE_MODE" {} +
paths=/tmp/paths
rm -f "$paths"
mkfifo "$paths"
inotifywait -mrq -e CREATE --format %w%f "$ROOT_PATH" > "$paths" &
inotifywaitpid=$!
trap cleanup EXIT
cleanup() {
kill "$inotifywaitpid"
}
while read -r path; do
if test -d "$path"; then
cleanup
exec "$0" "$@"
fi
chown -h "$OWNER_GROUP" "$path"
if test -f "$path"; then
chmod "$FILE_MODE" "$path"
fi
done < "$paths"
'';
PrivateTmp = true;
Restart = "always";
RestartSec = 10;
UMask = plan.umask;
};
wantedBy = [ "multi-user.target" ];
timerConfig.OnCalendar = timer;
};
}));