From 6ad7a8801cbc68ce481ae936983178709779c813 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 3 Jun 2020 00:46:03 +0200
Subject: tv dnsmasq: listen only on configured interfaces

---
 tv/3modules/dnsmasq.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'tv/3modules')

diff --git a/tv/3modules/dnsmasq.nix b/tv/3modules/dnsmasq.nix
index ec927f98a..ab24ac089 100644
--- a/tv/3modules/dnsmasq.nix
+++ b/tv/3modules/dnsmasq.nix
@@ -31,8 +31,9 @@ in {
       };
       services.dnsmasq.enable = true;
       services.dnsmasq.extraConfig = ''
+        bind-interfaces
         dhcp-range=${cfg.dhcp-range}
-        interface=${cfg.interface}
+        listen-address=${cfg.address}
       '';
       tv.iptables.extra.filter.INPUT = [
         "-i ${cfg.interface} -p tcp -m tcp --dport bootps -j ACCEPT"
-- 
cgit v1.2.3


From 739db44f3fee490d7d6581500c9201de58c6bb96 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 3 Jun 2020 10:38:48 +0200
Subject: tv Xresources: enable service when using xserver

---
 tv/3modules/Xresources.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tv/3modules')

diff --git a/tv/3modules/Xresources.nix b/tv/3modules/Xresources.nix
index ce7ac9ac2..ab233dd65 100644
--- a/tv/3modules/Xresources.nix
+++ b/tv/3modules/Xresources.nix
@@ -1,7 +1,7 @@
 with import <stockholm/lib>;
 { config, pkgs, ... }: let
   cfg = {
-    enable = config.tv.Xresources != {};
+    enable = config.services.xserver.enable && config.tv.Xresources != {};
     user = config.krebs.build.user;
   };
 in {
-- 
cgit v1.2.3

[cgit] Unable to lock slot /tmp/cgit/7a300000.lock: No such file or directory (2)