treewide: update secrets / requiresmountfor
This commit is contained in:
parent
3620764f77
commit
755fd388ad
|
@ -23,7 +23,7 @@ in {
|
|||
sops.secrets."tw-pass.ini" = {};
|
||||
state = [ base-dir ];
|
||||
# hotfix for broken wiki after reboot
|
||||
systemd.services."phpfpm-euer-wiki".serviceConfig.RequiresMountFor = [ "/media/cloud" ];
|
||||
systemd.services."phpfpm-euer-wiki".unitConfig.RequiresMountsFor = [ "/media/cloud" ];
|
||||
services.phpfpm = {
|
||||
pools.euer-wiki = {
|
||||
inherit user group;
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
{
|
||||
sops.secrets."wbob-passwd-kiosk".neededForUsers = true;
|
||||
|
||||
users.users.kiosk.passwordFile = config.sops.secrets."wbob-passwd-kiosk".path;
|
||||
users.users.kiosk.hashedPasswordFile = config.sops.secrets."wbob-passwd-kiosk".path;
|
||||
# override the password for root@wbob to the kiosk password
|
||||
users.users.root.passwordFile = lib.mkForce config.sops.secrets."wbob-passwd-kiosk".path;
|
||||
users.users.root.hashedPasswordFile = lib.mkForce config.sops.secrets."wbob-passwd-kiosk".path;
|
||||
}
|
||||
|
|
|
@ -7,7 +7,7 @@ let
|
|||
"x-systemd.device-timeout=5s"
|
||||
"x-systemd.mount-timeout=5s"
|
||||
];
|
||||
host = "omo.lan";
|
||||
host = "192.168.111.11";
|
||||
path = "/media/omo/photos";
|
||||
in {
|
||||
systemd.tmpfiles.rules = [
|
||||
|
|
|
@ -9,7 +9,7 @@ let
|
|||
in {
|
||||
|
||||
# samba share /media/crypt1/share
|
||||
systemd.services.samba-smbd.serviceConfig.RequiresMountFor = [ "/media/cryptX" ];
|
||||
systemd.services.samba-smbd.unitConfig.RequiresMountsFor = lib.mkForce [ "/var/lib/samba" "/media/cryptX" ];
|
||||
users.users.smbguest = {
|
||||
name = "smbguest";
|
||||
uid = config.ids.uids.smbguest;
|
||||
|
@ -27,6 +27,12 @@ in {
|
|||
browseable = "yes";
|
||||
"guest ok" = "yes";
|
||||
};
|
||||
music = {
|
||||
path = "/media/cryptX/music";
|
||||
"read only" = "yes";
|
||||
browseable = "yes";
|
||||
"guest ok" = "yes";
|
||||
};
|
||||
emu = {
|
||||
path = "/media/crypt1/emu";
|
||||
"read only" = "yes";
|
||||
|
|
|
@ -2,8 +2,9 @@
|
|||
mk_peers = mapAttrs (n: v: { id = v.syncthing.id; });
|
||||
|
||||
all_peers = filterAttrs (n: v: v.syncthing.id != null) config.krebs.hosts;
|
||||
used_peer_names = unique (flatten (mapAttrsToList (n: v: v.devices) config.services.syncthing.folders));
|
||||
used_peer_names = unique (flatten (mapAttrsToList (n: v: v.devices) config.services.syncthing.settings.folders));
|
||||
used_peers = filterAttrs (n: v: elem n used_peer_names) all_peers;
|
||||
|
||||
in {
|
||||
services.syncthing = {
|
||||
enable = true;
|
||||
|
|
|
@ -18,6 +18,7 @@
|
|||
sops
|
||||
kpaste
|
||||
cyberlocker-tools
|
||||
inputs.clan-core.packages.x86_64-linux.clan-cli
|
||||
# esphome # broken
|
||||
|
||||
# nix related
|
||||
|
|
Loading…
Reference in a new issue