From 8d5222c2f7f858d33588c3d3a9a105b9a6481025 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 11 Sep 2019 10:55:56 +0200
Subject: tv focus: init

---
 tv/3modules/default.nix | 1 +
 tv/3modules/focus.nix   | 4 ++++
 2 files changed, 5 insertions(+)
 create mode 100644 tv/3modules/focus.nix

diff --git a/tv/3modules/default.nix b/tv/3modules/default.nix
index edaf50f0..db2cdcd1 100644
--- a/tv/3modules/default.nix
+++ b/tv/3modules/default.nix
@@ -3,6 +3,7 @@
     ./charybdis
     ./dnsmasq.nix
     ./ejabberd
+    ./focus.nix
     ./hosts.nix
     ./iptables.nix
     ./slock.nix
diff --git a/tv/3modules/focus.nix b/tv/3modules/focus.nix
new file mode 100644
index 00000000..b1a7b2e5
--- /dev/null
+++ b/tv/3modules/focus.nix
@@ -0,0 +1,4 @@
+with import <stockholm/lib>;
+{
+  options.tv.focus.enable = mkEnableOption "tv.focus";
+}
-- 
cgit v1.2.3


From 4c2184a0f1b4d80a62bad92a37cbc25835082052 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 11 Sep 2019 14:37:26 +0200
Subject: krebs.tinc.*.hostsArchive: fix file mode

---
 krebs/3modules/tinc.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/krebs/3modules/tinc.nix b/krebs/3modules/tinc.nix
index 24eac715..ed00d187 100644
--- a/krebs/3modules/tinc.nix
+++ b/krebs/3modules/tinc.nix
@@ -110,8 +110,12 @@ let
         hostsArchive = mkOption {
           type = types.package;
           default = pkgs.runCommand "retiolum-hosts.tar.bz2" {} ''
-            ${pkgs.coreutils}/bin/ln -s ${tinc.config.hostsPackage} hosts
-            ${pkgs.gnutar}/bin/tar -hcjf $out hosts
+            cp \
+                --no-preserve=mode \
+                --recursive \
+                ${tinc.config.hostsPackage} \
+                hosts
+            ${pkgs.gnutar}/bin/tar -cjf $out hosts
           '';
           readOnly = true;
         };
-- 
cgit v1.2.3