diff options
| author | lassulus <lassulus@lassul.us> | 2019-09-11 14:57:39 +0200 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2019-09-11 14:57:39 +0200 |
| commit | 8cb8de31d0a3b1bcb6eb91d0c23740b8c14d29bd (patch) | |
| tree | a54b0e64d3871aae39169b54be8621c81fd71a27 | |
| parent | 20e38840fed74e5a71342c1ba335a6bf0ad5080a (diff) | |
| parent | 4c2184a0f1b4d80a62bad92a37cbc25835082052 (diff) | |
Merge remote-tracking branch 'ni/master'
| -rw-r--r-- | krebs/3modules/tinc.nix | 8 | ||||
| -rw-r--r-- | tv/3modules/default.nix | 1 | ||||
| -rw-r--r-- | tv/3modules/focus.nix | 4 |
3 files changed, 11 insertions, 2 deletions
diff --git a/krebs/3modules/tinc.nix b/krebs/3modules/tinc.nix index 24eac7158..ed00d187c 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; }; diff --git a/tv/3modules/default.nix b/tv/3modules/default.nix index edaf50f03..db2cdcd1f 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 000000000..b1a7b2e52 --- /dev/null +++ b/tv/3modules/focus.nix @@ -0,0 +1,4 @@ +with import <stockholm/lib>; +{ + options.tv.focus.enable = mkEnableOption "tv.focus"; +} |