merge main into ldap

This commit is contained in:
halcyon 2022-12-17 19:17:52 +01:00
commit 3d8b8089d6
No known key found for this signature in database
GPG key ID: 7C1F2DA2BC929412
7 changed files with 48 additions and 18 deletions

View file

@ -56,16 +56,19 @@
modules = [
inputs.sops-nix.nixosModules.sops
./hosts/quitte/configuration.nix
./modules/options.nix
./modules/base.nix
./modules/sops.nix
./modules/keycloak.nix
./modules/ldap.nix
# ./modules/keycloak.nix replaced by portunus
./modules/nginx.nix
./modules/hedgedoc.nix
./modules/wiki.nix
./modules/stream.nix
./modules/nextcloud.nix
{
fsr.enable_office_bloat = false;
fsr.domain = "staging.ifsr.de";
sops.defaultSopsFile = ./secrets/quitte.yaml;
}
];
@ -75,8 +78,9 @@
modules = [
inputs.sops-nix.nixosModules.sops
./hosts/quitte/configuration.nix
./modules/options.nix
./modules/base.nix
./modules/keycloak.nix
# ./modules/keycloak.nix replaced by portunus
./modules/nginx.nix
./modules/hedgedoc.nix
./modules/wiki.nix