Fix secret permission
This commit is contained in:
parent
b08a27c475
commit
1d39967f91
3 changed files with 13 additions and 12 deletions
|
|
@ -1,8 +1,4 @@
|
||||||
{
|
{config, ...}:
|
||||||
config,
|
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
with config.constants; {
|
with config.constants; {
|
||||||
hardware.graphics.enable = true;
|
hardware.graphics.enable = true;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -7,6 +7,7 @@ with config.constants; {
|
||||||
services.caddy = {
|
services.caddy = {
|
||||||
enable = true;
|
enable = true;
|
||||||
email = postMaster;
|
email = postMaster;
|
||||||
|
user = userName;
|
||||||
virtualHosts = let
|
virtualHosts = let
|
||||||
acme = fqdns:
|
acme = fqdns:
|
||||||
builtins.listToAttrs (map (fqdn: {
|
builtins.listToAttrs (map (fqdn: {
|
||||||
|
|
@ -21,10 +22,10 @@ with config.constants; {
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
fqdns);
|
fqdns);
|
||||||
portStr = builtins.mapAttrs (n: v: toString v) port;
|
|
||||||
homeSrv = s: "nebula:${portStr.${s}}";
|
homeSrv = s: "nebula:${portStr.${s}}";
|
||||||
localSrv = s: "${localhost}:${portStr.${s}}";
|
localSrv = s: "${localhost}:${portStr.${s}}";
|
||||||
mtfqdn = "matrix.${domain}";
|
mtfqdn = "matrix.${domain}";
|
||||||
|
portStr = builtins.mapAttrs (n: v: toString v) port;
|
||||||
wn = s: "/.well-known/${s}";
|
wn = s: "/.well-known/${s}";
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,10 @@
|
||||||
{config, ...}: {
|
{config, ...}:
|
||||||
services.coturn = with config.constants; let
|
with config.constants; let
|
||||||
acmeDir = config.security.acme.certs.${coturn-realm}.directory;
|
acmeDir = config.security.acme.certs.${coturn-realm}.directory;
|
||||||
coturn-realm = "turn.${domain}";
|
coturn-realm = "turn.${domain}";
|
||||||
in {
|
coturn-user = config.users.users.turnserver;
|
||||||
|
in {
|
||||||
|
services.coturn = {
|
||||||
enable = true;
|
enable = true;
|
||||||
cert = "${acmeDir}/fullchain.pem";
|
cert = "${acmeDir}/fullchain.pem";
|
||||||
listening-port = port.coturn;
|
listening-port = port.coturn;
|
||||||
|
|
@ -15,5 +17,7 @@
|
||||||
use-auth-secret = true;
|
use-auth-secret = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
sops.secrets.coturn = {};
|
users.users.${userName}.extraGroups = [coturn-user.group];
|
||||||
|
security.acme.certs.${coturn-realm}.group = coturn-user.group;
|
||||||
|
sops.secrets.coturn.owner = coturn-user.name;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue