diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-05-14 09:25:16 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-05-14 09:25:25 +0200 |
| commit | 92a26320e7b9bbfe781e222a17c518443f63316a (patch) | |
| tree | db6e4fe7706ec8c065d7efe10e93b38ea1b149ba /nixos/modules/module-list.nix | |
| parent | 2006fd4fc5a20c72ab2166b2b4039307f4f54bcb (diff) | |
| parent | 85a05878846b75254f97b8690c18a470cfe982f0 (diff) | |
| download | nixlib-92a26320e7b9bbfe781e222a17c518443f63316a.tar nixlib-92a26320e7b9bbfe781e222a17c518443f63316a.tar.gz nixlib-92a26320e7b9bbfe781e222a17c518443f63316a.tar.bz2 nixlib-92a26320e7b9bbfe781e222a17c518443f63316a.tar.lz nixlib-92a26320e7b9bbfe781e222a17c518443f63316a.tar.xz nixlib-92a26320e7b9bbfe781e222a17c518443f63316a.tar.zst nixlib-92a26320e7b9bbfe781e222a17c518443f63316a.zip | |
Merge master into staging-next
Diffstat (limited to 'nixos/modules/module-list.nix')
| -rw-r--r-- | nixos/modules/module-list.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 40904ef0c175..5adbc26522cf 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -792,6 +792,7 @@ ./services/security/nginx-sso.nix ./services/security/oauth2_proxy.nix ./services/security/oauth2_proxy_nginx.nix + ./services/security/privacyidea.nix ./services/security/physlock.nix ./services/security/shibboleth-sp.nix ./services/security/sks.nix |