diff options
| author | lassulus <lassulus@lassul.us> | 2017-07-03 00:02:34 +0200 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2017-07-03 00:02:34 +0200 |
| commit | c30e1fbc74c050386a82d1050ecc77b44401df6b (patch) | |
| tree | c7d29147fe0387e9618c16838ab4bd3a0fcbfbd3 /makefu/1systems | |
| parent | d5aca8696caeac6d88923e1f668af213abc987fa (diff) | |
| parent | 5f3bece0d647f65c2354ae0944a50d775a3b488e (diff) | |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/1systems')
| -rw-r--r-- | makefu/1systems/gum.nix | 5 | ||||
| -rw-r--r-- | makefu/1systems/vbob.nix | 1 | ||||
| -rw-r--r-- | makefu/1systems/x.nix | 5 |
3 files changed, 10 insertions, 1 deletions
diff --git a/makefu/1systems/gum.nix b/makefu/1systems/gum.nix index 519313f57..51761d3fd 100644 --- a/makefu/1systems/gum.nix +++ b/makefu/1systems/gum.nix @@ -24,7 +24,10 @@ in { # ../2configs/disable_v6.nix ../2configs/exim-retiolum.nix ../2configs/tinc/retiolum.nix - ../2configs/urlwatch.nix + ../2configs/urlwatch + + # Security + ../2configs/sshd-totp.nix # Tools ../2configs/tools/core.nix diff --git a/makefu/1systems/vbob.nix b/makefu/1systems/vbob.nix index b79ec64c0..d8e275bf6 100644 --- a/makefu/1systems/vbob.nix +++ b/makefu/1systems/vbob.nix @@ -8,6 +8,7 @@ (toString <nixpkgs/nixos/modules/virtualisation/virtualbox-image.nix>) (toString <nixpkgs/nixos/modules/virtualisation/virtualbox-guest.nix>) ../2configs/main-laptop.nix #< base-gui + ../2configs/sshd-totp.nix # Tools ../2configs/tools/core.nix diff --git a/makefu/1systems/x.nix b/makefu/1systems/x.nix index b37c32944..235862e85 100644 --- a/makefu/1systems/x.nix +++ b/makefu/1systems/x.nix @@ -19,6 +19,8 @@ with import <stockholm/lib>; # ../2configs/disable_v6.nix # Testing + # ../2configs/lanparty/lancache.nix + # ../2configs/lanparty/lancache-dns.nix # ../2configs/deployment/dirctator.nix # ../2configs/vncserver.nix # ../2configs/deployment/led-fader @@ -58,6 +60,9 @@ with import <stockholm/lib>; # Filesystem ../2configs/fs/sda-crypto-root-home.nix + # Security + ../2configs/sshd-totp.nix + ]; makefu.server.primary-itf = "wlp3s0"; |