Compare commits
2 commits
a04313de0f
...
700889cf0a
Author | SHA1 | Date | |
---|---|---|---|
Patrick Großmann | 700889cf0a | ||
Patrick Großmann | 99db0c70cc |
|
@ -37,8 +37,7 @@
|
|||
|
||||
systemd.network.networks = {
|
||||
"01-lan1" = {
|
||||
address = ["192.168.178.31/24"];
|
||||
gateway = ["192.168.178.1"];
|
||||
DHCP = "yes";
|
||||
matchConfig.MACAddress = config.secrets.secrets.local.networking.lan1.mac;
|
||||
networkConfig = {
|
||||
IPv6PrivacyExtensions = "yes";
|
||||
|
@ -60,9 +59,7 @@
|
|||
dhcpV6Config.RouteMetric = 10;
|
||||
};
|
||||
"01-wlan1" = {
|
||||
DHCP = "no";
|
||||
address = ["192.168.1.6/24"];
|
||||
gateway = ["192.168.1.2"];
|
||||
DHCP = "yes";
|
||||
matchConfig.MACAddress = config.secrets.secrets.local.networking.wlan1.mac;
|
||||
networkConfig = {
|
||||
IPv6PrivacyExtensions = "yes";
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
# TODO
|
||||
# autoconfig
|
||||
# service sending
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
|
@ -284,17 +283,32 @@ in {
|
|||
};
|
||||
services.nginx = {
|
||||
enable = true;
|
||||
virtualHosts."mta-sts.pgrossmann.org".extraConfig = ''
|
||||
virtualHosts."mta-sts.${priv_domain}".extraConfig = ''
|
||||
encode gzip
|
||||
file_server
|
||||
root * ${
|
||||
pkgs.runCommand "testdir" {} ''
|
||||
pkgs.runCommand "priv_domain" {} ''
|
||||
mkdir -p "$out/.well-known"
|
||||
echo "
|
||||
version: STSv1
|
||||
mode: enforce
|
||||
max_age: 604800
|
||||
mx: mx1.pgrossmann.org
|
||||
mx: mx1.${priv_domain}
|
||||
" > "$out/.well-known/mta-sts.txt"
|
||||
''
|
||||
} ;
|
||||
'';
|
||||
virtualHosts."mta-sts.${domain}".extraConfig = ''
|
||||
encode gzip
|
||||
file_server
|
||||
root * ${
|
||||
pkgs.runCommand "domain" {} ''
|
||||
mkdir -p "$out/.well-known"
|
||||
echo "
|
||||
version: STSv1
|
||||
mode: enforce
|
||||
max_age: 604800
|
||||
mx: mx1.${domain}
|
||||
" > "$out/.well-known/mta-sts.txt"
|
||||
''
|
||||
} ;
|
||||
|
|
|
@ -42,11 +42,6 @@
|
|||
hostname = "desktopnix.local";
|
||||
user = "root";
|
||||
};
|
||||
|
||||
"valhalla" = {
|
||||
hostname = "valhalla.fs.tum.de";
|
||||
user = "grossmann";
|
||||
};
|
||||
"binex" = {
|
||||
hostname = "praksrv.sec.in.tum.de";
|
||||
user = "team402";
|
||||
|
|
Loading…
Reference in a new issue