move some redis servers around
This commit is contained in:
parent
7056803ef5
commit
4d18a49ca1
4 changed files with 14 additions and 6 deletions
|
@ -37,6 +37,7 @@
|
||||||
, vscode-server
|
, vscode-server
|
||||||
, course-management
|
, course-management
|
||||||
, print-interface
|
, print-interface
|
||||||
|
, authentik
|
||||||
, ...
|
, ...
|
||||||
}@inputs:
|
}@inputs:
|
||||||
let
|
let
|
||||||
|
@ -75,10 +76,13 @@
|
||||||
ese-manual.nixosModules.default
|
ese-manual.nixosModules.default
|
||||||
course-management.nixosModules.default
|
course-management.nixosModules.default
|
||||||
vscode-server.nixosModules.default
|
vscode-server.nixosModules.default
|
||||||
|
authentik.nixosModules.default
|
||||||
|
|
||||||
./hosts/quitte/configuration.nix
|
./hosts/quitte/configuration.nix
|
||||||
./options
|
./options
|
||||||
|
|
||||||
./modules/core
|
./modules/core
|
||||||
|
./modules/authentik
|
||||||
./modules/ldap
|
./modules/ldap
|
||||||
./modules/mail
|
./modules/mail
|
||||||
./modules/web
|
./modules/web
|
||||||
|
|
|
@ -1,11 +1,8 @@
|
||||||
{ config, ... }:
|
{ config, lib, ... }:
|
||||||
let
|
let
|
||||||
domain = "idm.${config.networking.domain}";
|
domain = "idm.${config.networking.domain}";
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
age.secrets.authentik-core = {
|
|
||||||
file = ../../../../secrets/nuc/authentik/core.age;
|
|
||||||
};
|
|
||||||
sops.secrets."authentik/env" = { };
|
sops.secrets."authentik/env" = { };
|
||||||
services.authentik = {
|
services.authentik = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
@ -16,5 +13,4 @@ in
|
||||||
};
|
};
|
||||||
environmentFile = config.sops.secrets."authentik/env".path;
|
environmentFile = config.sops.secrets."authentik/env".path;
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -184,6 +184,7 @@ in
|
||||||
redis = {
|
redis = {
|
||||||
vmOverCommit = true;
|
vmOverCommit = true;
|
||||||
servers.rspamd = {
|
servers.rspamd = {
|
||||||
|
port = 0;
|
||||||
enable = true;
|
enable = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ config, ... }:
|
{ config, lib, ... }:
|
||||||
let
|
let
|
||||||
domain = "tickets.${config.networking.domain}";
|
domain = "tickets.${config.networking.domain}";
|
||||||
in
|
in
|
||||||
|
@ -9,11 +9,18 @@ in
|
||||||
createLocally = true;
|
createLocally = true;
|
||||||
type = "PostgreSQL";
|
type = "PostgreSQL";
|
||||||
};
|
};
|
||||||
|
redis.port = 6380;
|
||||||
port = 8085;
|
port = 8085;
|
||||||
secretKeyBaseFile = config.sops.secrets."zammad_secret".path;
|
secretKeyBaseFile = config.sops.secrets."zammad_secret".path;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
services.redis = {
|
||||||
|
servers.zammad = {
|
||||||
|
port = lib.mkForce 6380;
|
||||||
|
enable = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
# disably spammy logs
|
# disably spammy logs
|
||||||
systemd.services.zammad-web.preStart = ''
|
systemd.services.zammad-web.preStart = ''
|
||||||
sed -i -e "s|debug|warn|" ./config/environments/production.rb
|
sed -i -e "s|debug|warn|" ./config/environments/production.rb
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue