diff options
| author | tv <tv@krebsco.de> | 2016-07-22 13:22:13 +0200 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2016-07-22 13:22:13 +0200 |
| commit | 45c62ec4d3ec61ba593657676f5a09d47622564e (patch) | |
| tree | 7937fbefaddc5e0168e44ab1d6e355c42192d7e8 /makefu/1systems/shoney.nix | |
| parent | 8b58e6e6e25e38586f3cc8879aa0444d4fdf6f0d (diff) | |
| parent | 0bd78c3b0de0fa79322e9031f45dcc62abd094d1 (diff) | |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'makefu/1systems/shoney.nix')
| -rw-r--r-- | makefu/1systems/shoney.nix | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/makefu/1systems/shoney.nix b/makefu/1systems/shoney.nix index 3a3ac9c7c..7081f6a95 100644 --- a/makefu/1systems/shoney.nix +++ b/makefu/1systems/shoney.nix @@ -13,15 +13,12 @@ in { ../2configs/save-diskspace.nix ../2configs/hw/CAC.nix ../2configs/fs/CAC-CentOS-7-64bit.nix + ../2configs/tinc/retiolum.nix ]; - environment.systemPackages = [ pkgs.honeyd ]; - services.tinc.networks.siem.name = "sjump"; - krebs = { enable = true; - retiolum.enable = true; build.host = config.krebs.hosts.shoney; nginx.enable = true; tinc_graphs = { |