diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2021-09-12 20:09:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-12 20:09:49 +0200 |
| commit | 364b5555ee04bf61ee0075a3adab4c9351a8d38c (patch) | |
| tree | ecc8896df2f069b7702fffe40eb3d9839c54016f | |
| parent | ed77db85ff6a590f3072f32d3d7f7a6d71d46017 (diff) | |
| parent | 69e75754d57b4c9785058d663daa3817745930aa (diff) | |
| download | nixlib-364b5555ee04bf61ee0075a3adab4c9351a8d38c.tar nixlib-364b5555ee04bf61ee0075a3adab4c9351a8d38c.tar.gz nixlib-364b5555ee04bf61ee0075a3adab4c9351a8d38c.tar.bz2 nixlib-364b5555ee04bf61ee0075a3adab4c9351a8d38c.tar.lz nixlib-364b5555ee04bf61ee0075a3adab4c9351a8d38c.tar.xz nixlib-364b5555ee04bf61ee0075a3adab4c9351a8d38c.tar.zst nixlib-364b5555ee04bf61ee0075a3adab4c9351a8d38c.zip | |
Merge pull request #137132 from Ma27/pi-sudo
nixos/privacyidea: use `sudo(8)` that's configured via the module
| -rw-r--r-- | nixos/modules/services/security/privacyidea.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/services/security/privacyidea.nix b/nixos/modules/services/security/privacyidea.nix index 63271848e943..5f894d0fa691 100644 --- a/nixos/modules/services/security/privacyidea.nix +++ b/nixos/modules/services/security/privacyidea.nix @@ -228,7 +228,7 @@ in path = with pkgs; [ openssl ]; environment.PRIVACYIDEA_CONFIGFILE = "${cfg.stateDir}/privacyidea.cfg"; preStart = let - pi-manage = "${pkgs.sudo}/bin/sudo -u privacyidea -HE ${penv}/bin/pi-manage"; + pi-manage = "${config.security.sudo.package}/bin/sudo -u privacyidea -HE ${penv}/bin/pi-manage"; pgsu = config.services.postgresql.superUser; psql = config.services.postgresql.package; in '' @@ -239,8 +239,8 @@ in -i "${piCfgFile}" chown ${cfg.user}:${cfg.group} ${cfg.stateDir}/privacyidea.cfg if ! test -e "${cfg.stateDir}/db-created"; then - ${pkgs.sudo}/bin/sudo -u ${pgsu} ${psql}/bin/createuser --no-superuser --no-createdb --no-createrole ${cfg.user} - ${pkgs.sudo}/bin/sudo -u ${pgsu} ${psql}/bin/createdb --owner ${cfg.user} privacyidea + ${config.security.sudo.package}/bin/sudo -u ${pgsu} ${psql}/bin/createuser --no-superuser --no-createdb --no-createrole ${cfg.user} + ${config.security.sudo.package}/bin/sudo -u ${pgsu} ${psql}/bin/createdb --owner ${cfg.user} privacyidea ${pi-manage} create_enckey ${pi-manage} create_audit_keys ${pi-manage} createdb |