diff options
author | jeschli <jeschli@gmail.com> | 2019-04-02 19:38:35 +0200 |
---|---|---|
committer | jeschli <jeschli@gmail.com> | 2019-04-02 19:38:35 +0200 |
commit | f8b88080d5bb27e4a6b35b26d6036de40517ba57 (patch) | |
tree | f8a077997ca889950daa0cb5ec11cc486f420bbe /lass/2configs | |
parent | 17712c90772d68f174f579e570fa23a8fa674245 (diff) | |
parent | 6654f03b09b7b80e3ee6339c92e6172579349744 (diff) |
:Merge branch 'master' of prism.r:stockholm
Diffstat (limited to 'lass/2configs')
-rw-r--r-- | lass/2configs/default.nix | 3 | ||||
-rw-r--r-- | lass/2configs/syncthing.nix | 9 | ||||
-rw-r--r-- | lass/2configs/tests/dummy-secrets/syncthing.cert | 0 | ||||
-rw-r--r-- | lass/2configs/tests/dummy-secrets/syncthing.key | 0 | ||||
-rw-r--r-- | lass/2configs/websites/lassulus.nix | 2 |
5 files changed, 13 insertions, 1 deletions
diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix index 2547e8ba..085cc04b 100644 --- a/lass/2configs/default.nix +++ b/lass/2configs/default.nix @@ -218,4 +218,7 @@ with import <stockholm/lib>; networking.dhcpcd.extraConfig = '' noipv4ll ''; + services.netdata = { + enable = true; + }; } diff --git a/lass/2configs/syncthing.nix b/lass/2configs/syncthing.nix index 17debf82..164e8967 100644 --- a/lass/2configs/syncthing.nix +++ b/lass/2configs/syncthing.nix @@ -8,4 +8,13 @@ with import <stockholm/lib>; { predicate = "-p tcp --dport 22000"; target = "ACCEPT";} { predicate = "-p udp --dport 21027"; target = "ACCEPT";} ]; + krebs.syncthing = { + enable = true; + cert = toString <secrets/syncthing.cert>; + key = toString <secrets/syncthing.key>; + peers = mapAttrs (n: v: { id = v.syncthing.id; }) (filterAttrs (n: v: v.syncthing.id != null) config.krebs.hosts); + folders = [ + { path = "/tmp/testsync"; peers = [ "icarus" "mors" "skynet" ]; } + ]; + }; } diff --git a/lass/2configs/tests/dummy-secrets/syncthing.cert b/lass/2configs/tests/dummy-secrets/syncthing.cert new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/lass/2configs/tests/dummy-secrets/syncthing.cert diff --git a/lass/2configs/tests/dummy-secrets/syncthing.key b/lass/2configs/tests/dummy-secrets/syncthing.key new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/lass/2configs/tests/dummy-secrets/syncthing.key diff --git a/lass/2configs/websites/lassulus.nix b/lass/2configs/websites/lassulus.nix index 27cadd10..526909e8 100644 --- a/lass/2configs/websites/lassulus.nix +++ b/lass/2configs/websites/lassulus.nix @@ -61,7 +61,7 @@ in { alias ${config.krebs.tinc.retiolum.hostsArchive}; ''; locations."= /retiolum.hosts".extraConfig = '' - alias ${pkgs.retiolum-hosts}; + alias ${pkgs.krebs-hosts-retiolum}; ''; locations."= /wireguard-key".extraConfig = '' alias ${pkgs.writeText "prism.wg" config.krebs.hosts.prism.nets.wiregrill.wireguard.pubkey}; |