summaryrefslogtreecommitdiffstats
path: root/tv/2configs
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2019-08-13 15:35:12 +0200
committerlassulus <lassulus@lassul.us>2019-08-13 15:35:12 +0200
commit0699b41b05a1f9cd133c15c3aadf70c3a45170f6 (patch)
tree0bdd752d8a9ec64acb12ff160826a19b2e11e95c /tv/2configs
parente754ced01e2d5ef84dabba391bba2f372694b7cb (diff)
parent681075a8f41ecfbac4c113481adde4d61f497c36 (diff)
Merge remote-tracking branch 'ni/master'
Diffstat (limited to 'tv/2configs')
-rw-r--r--tv/2configs/default.nix1
-rw-r--r--tv/2configs/sshd.nix6
-rw-r--r--tv/2configs/urlwatch.nix10
3 files changed, 9 insertions, 8 deletions
diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix
index 4fc755c43..72c48da2c 100644
--- a/tv/2configs/default.nix
+++ b/tv/2configs/default.nix
@@ -120,6 +120,7 @@ with import <stockholm/lib>;
{
environment.systemPackages = [
+ pkgs.field
pkgs.get
pkgs.git
pkgs.git-crypt
diff --git a/tv/2configs/sshd.nix b/tv/2configs/sshd.nix
index 1749b552d..25468f23e 100644
--- a/tv/2configs/sshd.nix
+++ b/tv/2configs/sshd.nix
@@ -5,12 +5,6 @@ with import <stockholm/lib>;
{
services.openssh = {
enable = true;
- hostKeys = [
- {
- type = "ed25519";
- path = "/etc/ssh/ssh_host_ed25519_key";
- }
- ];
};
tv.iptables.input-internet-accept-tcp = singleton "ssh";
}
diff --git a/tv/2configs/urlwatch.nix b/tv/2configs/urlwatch.nix
index 40dc7d237..378b5d167 100644
--- a/tv/2configs/urlwatch.nix
+++ b/tv/2configs/urlwatch.nix
@@ -1,9 +1,15 @@
with import <stockholm/lib>;
{ config, pkgs, ... }: let
- json = url: {
+ exec = filename: args: url: {
inherit url;
- filter = "system:${pkgs.jq}/bin/jq .";
+ filter = "system:${
+ concatMapStringsSep " " shell.escape ([filename] ++ toList args)
+ }";
};
+ json = json' ["."];
+ json' = exec "${pkgs.jq}/bin/jq";
+ xml = xml' ["--format" "-"];
+ xml' = exec "${pkgs.libxml2}/bin/xmllint";
in {
krebs.urlwatch = {
enable = true;