From 835ddb0de049850c113de4f9870edb49fff05494 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 18 Jul 2016 18:57:36 +0200
Subject: m 1 vbob: document forticlientsslvpn mess

---
 makefu/1systems/vbob.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'makefu/1systems/vbob.nix')

diff --git a/makefu/1systems/vbob.nix b/makefu/1systems/vbob.nix
index 3fcb173c..4818cea2 100644
--- a/makefu/1systems/vbob.nix
+++ b/makefu/1systems/vbob.nix
@@ -8,7 +8,7 @@
       (toString <nixpkgs/nixos/modules/virtualisation/virtualbox-image.nix>)
       (toString <nixpkgs/nixos/modules/virtualisation/virtualbox-guest.nix>)
       ../2configs/main-laptop.nix #< base-gui
-      # (toString <secrets>)/extra-hosts.nix
+      <secrets/extra-hosts.nix>
 
       # environment
 
@@ -28,8 +28,15 @@
         openssh.authorizedKeys.keys = [ config.krebs.users.makefu-vbob.pubkey  ];
     };
   };
+
+  environment.shellAliases = {
+    forti  = "cat ~/vpn/pw.txt | xclip; sudo forticlientsslvpn";
+  };
+  # TODO: for forticleintsslpn
+  #       ln -s /r/current-system/sw/bin/pppd /usr/sbin/pppd
+  #       ln -s /r/current-system/sw/bin/tail /usr/bin/tail
   environment.systemPackages = with pkgs;[
-    fortclientsslvpn
+    fortclientsslvpn ppp xclip
     get
     logstash
     docker
-- 
cgit v1.2.3


From 46232b30beba336ccc6a1a75e1cc9d66646b5dcc Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 20 Jul 2016 17:18:57 +0200
Subject: makefu: s/krebs\.retiolum/krebs.tinc.retiolum/g

---
 makefu/1systems/vbob.nix | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'makefu/1systems/vbob.nix')

diff --git a/makefu/1systems/vbob.nix b/makefu/1systems/vbob.nix
index 4818cea2..129a0602 100644
--- a/makefu/1systems/vbob.nix
+++ b/makefu/1systems/vbob.nix
@@ -11,6 +11,7 @@
       <secrets/extra-hosts.nix>
 
       # environment
+      ../2configs/tinc/retiolum.nix
 
     ];
   # workaround for https://github.com/NixOS/nixpkgs/issues/16641
@@ -52,13 +53,6 @@
     8010
   ];
 
-  krebs.retiolum = {
-    enable = true;
-    connectTo = [
-      "omo"
-      "gum"
-    ];
-  };
   virtualisation.docker.enable = false;
 
   fileSystems."/media/share" = {
-- 
cgit v1.2.3


From 2b862262f2878c9f4ef35894a8343d94f6d636be Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 20 Jul 2016 20:36:16 +0200
Subject: m 1 vbob: comment out extra-hosts

---
 makefu/1systems/vbob.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'makefu/1systems/vbob.nix')

diff --git a/makefu/1systems/vbob.nix b/makefu/1systems/vbob.nix
index 129a0602..27a21631 100644
--- a/makefu/1systems/vbob.nix
+++ b/makefu/1systems/vbob.nix
@@ -8,7 +8,7 @@
       (toString <nixpkgs/nixos/modules/virtualisation/virtualbox-image.nix>)
       (toString <nixpkgs/nixos/modules/virtualisation/virtualbox-guest.nix>)
       ../2configs/main-laptop.nix #< base-gui
-      <secrets/extra-hosts.nix>
+      # <secrets/extra-hosts.nix>
 
       # environment
       ../2configs/tinc/retiolum.nix
-- 
cgit v1.2.3