project-wide: nixdirfmt

This commit is contained in:
kat witch 2021-04-04 23:56:50 +01:00
parent d78814336a
commit 5e8ee72ac8
No known key found for this signature in database
GPG key ID: 1B477797DCA5EC72
7 changed files with 32 additions and 34 deletions

View file

@ -57,7 +57,8 @@ with config.resources; {
dns_ptr = "athame.kittywit.ch"; dns_ptr = "athame.kittywit.ch";
ip_address = athame.refAttr "ipv4_address"; ip_address = athame.refAttr "ipv4_address";
}; };
}; */ };
*/
#dns.records.kittywitch_athame = { #dns.records.kittywitch_athame = {
# tld = "kittywit.ch."; # tld = "kittywit.ch.";

View file

@ -36,7 +36,6 @@
interfaces.enp1s0.useDHCP = true; interfaces.enp1s0.useDHCP = true;
}; };
networking.firewall.allowedTCPPorts = networking.firewall.allowedTCPPorts =
[ 22 80 443 5160 5060 8999 64738 1935 53589 5001 ]; [ 22 80 443 5160 5060 8999 64738 1935 53589 5001 ];
networking.firewall.allowedUDPPorts = [ 5160 5060 64738 ]; networking.firewall.allowedUDPPorts = [ 5160 5060 64738 ];

View file

@ -19,11 +19,7 @@
users.groups."voice-cert".members = [ "nginx" "murmur" ]; users.groups."voice-cert".members = [ "nginx" "murmur" ];
security.acme.certs = { security.acme.certs = { "voice.kittywit.ch" = { group = "voice-cert"; }; };
"voice.kittywit.ch" = {
group = "voice-cert";
};
};
deploy.tf.dns.records.kittywitch_voice = { deploy.tf.dns.records.kittywitch_voice = {
tld = "kittywit.ch."; tld = "kittywit.ch.";

View file

@ -24,5 +24,7 @@
certDir = "/var/lib/acme/sync.kittywit.ch/"; certDir = "/var/lib/acme/sync.kittywit.ch/";
}; };
security.acme.certs."sync.kittywit.ch".postRun = "cp key.pem privkey.pem\nchown acme:voice-cert privkey.pem"; security.acme.certs."sync.kittywit.ch".postRun = ''
cp key.pem privkey.pem
chown acme:voice-cert privkey.pem'';
} }