Armael/infra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

modularize the secrets-permissions module

Browse source
This commit is contained in:
root 2024-06-28 21:06:04 +02:00
parent 73fe36e68d
commit b2c7f7be27
2 changed files with 28 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
common/secrets-permissions.nix
View file

@ -1,8 +1,22 @@
# This module enforces permissions on secrets stored on the machines. # This module enforces permissions on secrets stored on the machines.
{ config, ... }: { config, lib, ... }:
with lib;
let
cfg = config.custom.secrets;
in
{ {
options.custom.secrets = {
extraCommands = mkOption {
default = "";
type = types.lines;
description = lib.mdDoc "extra commands to populate /etc/secrets";
};
};
config = {
system.activationScripts."secrets-permissions" = '' system.activationScripts."secrets-permissions" = ''
# Default to restrictive permissions on secrets. # Default to restrictive permissions on secrets.
# Root can alway read/write/traverse directories no matter the permissions # Root can alway read/write/traverse directories no matter the permissions
@ -18,7 +32,6 @@
# The top directory must be readable and traversable by thoses who need to # The top directory must be readable and traversable by thoses who need to
# access secrets. # access secrets.
chmod 755 /etc/secrets chmod 755 /etc/secrets
'' + cfg.extraCommands;
# ... add chowns & chmods to specific users/groups when needed };
'';
} }

18
pastila/smtp.nix
View file

@ -922,24 +922,8 @@ dovecot_plain:
group = config.services.exim.group; group = config.services.exim.group;
}; };
# FIXME
environment.systemPackages = [ pkgs.acl ]; environment.systemPackages = [ pkgs.acl ];
system.activationScripts."secrets-permissions" = lib.mkForce '' custom.secrets.extraCommands = ''
# Default to restrictive permissions on secrets.
# Root can alway read/write/traverse directories no matter the permissions
# set.
mkdir -p /etc/secrets
chown --recursive root:root /etc/secrets
chmod --recursive 600 /etc/secrets
# Relax permissions on some secrets.
# The top directory must be readable and traversable by thoses who need to
# access secrets.
chmod 755 /etc/secrets
mkdir -p /etc/secrets/exim/virtual mkdir -p /etc/secrets/exim/virtual
mkdir -p /etc/secrets/exim/domains mkdir -p /etc/secrets/exim/domains
chmod 700 /etc/secrets/exim chmod 700 /etc/secrets/exim