fablab-nea/nix-gscheits
1
0
Fork 0
Code Issues 7 Pull requests 3 Projects Releases Packages Wiki Activity Actions

Fix deprecations

Browse source
This commit is contained in:
Jakob Lechner 2023-07-13 22:56:35 +00:00
parent 3cefc7f9dd
commit 27460d3682
No known key found for this signature in database
GPG key ID: 996082EFB5906C10
5 changed files with 38 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

1
machines/party/hardware-configuration.nix
View file

@ -21,7 +21,6 @@
loader.grub = {
enable = true;
version = 2;
device = "/dev/sda";
};
};

57
machines/raven/services/dnsmasq.nix
View file

@ -20,40 +20,37 @@ in
{
services.dnsmasq = {
enable = true;
extraConfig = ''
bind-dynamic
listen-address=192.168.93.1
listen-address=192.168.94.1
interface=lo
expand-hosts
domain=lab.fablab-nea.de
dhcp-range=192.168.93.20,192.168.93.254,4h
dhcp-range=192.168.94.20,192.168.94.254,4h
dhcp-boot=lpxelinux.0,raven,192.168.94.1
cache-size=10000
dns-forward-max=1000
auth-zone=lab.fablab-nea.de,192.168.94.0/24
auth-server=lab.fablab-nea.de,78.47.224.251
no-hosts
addn-hosts=${pkgs.writeText "hosts.dnsmasq" ''
settings = {
server = [
"142.250.185.78" # dns.as250.net
"2001:470:20::2" # ordns.he.net
"74.82.42.42" # ordns.he.net
];
bind-dynamic = true;
listen-address = [
"192.168.93.1"
"192.168.94.1"
];
interface = "lo";
expand-hosts = true;
domain = "lab.fablab-nea.de";
dhcp-range = [
"192.168.93.20,192.168.93.254,4h"
"192.168.94.20,192.168.94.254,4h"
];
dhcp-boot = "lpxelinux.0,raven,192.168.94.1";
cache-size = 10000;
dns-forward-max = 1000;
auth-zone = "lab.fablab-nea.de,192.168.94.0/24";
auth-server = "lab.fablab-nea.de,78.47.224.251";
no-hosts = true;
addn-hosts = "${pkgs.writeText "hosts.dnsmasq" ''
192.168.94.1 raven labsync unifi
192.168.94.2 switch
192.168.94.3 schneiderscheune-weinturm-ap
192.168.94.4 schneiderscheune-weinturm-sta
''}
'';
servers = [
"142.250.185.78" # dns.as250.net
"2001:470:20::2" # ordns.he.net
"74.82.42.42" # ordns.he.net
];
''}";
};
};
systemd.services."dnsmasq-events" = {