From 13a613b7f5605a198aaf3a4e4fe4e4fd5fddb454 Mon Sep 17 00:00:00 2001
From: Michal 'rysiek' Wozniak <rysiek@hackerspace.pl>
Date: Mon, 9 Mar 2020 01:34:31 +0000
Subject: [PATCH] split-ssh fixed on Debian 10; fwknop added on Fedora

---
 split-ssh.top                    | 2 +-
 templates-basic-utils-debian.sls | 1 +
 templates-basic-utils-fedora.sls | 1 +
 templates-split-ssh-code.sls     | 2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/split-ssh.top b/split-ssh.top
index b6fe18e..6201017 100644
--- a/split-ssh.top
+++ b/split-ssh.top
@@ -3,5 +3,5 @@
 base:
     ssh-vault:
         - rysieks-qubes.split-ssh-vault
-    'L@personal,work,comms':
+    'L@personal,work,comms,isnic':
         - rysieks-qubes.split-ssh-client
diff --git a/templates-basic-utils-debian.sls b/templates-basic-utils-debian.sls
index fac3a8d..ef9f06d 100644
--- a/templates-basic-utils-debian.sls
+++ b/templates-basic-utils-debian.sls
@@ -6,6 +6,7 @@ templates-basic-utils-debian.packages:
       - vim
       - apt-transport-https
       - nmap
+      - ncat
       - ssh-askpass-gnome
       - git
       - knot-dnsutils
diff --git a/templates-basic-utils-fedora.sls b/templates-basic-utils-fedora.sls
index 20fb58b..4696889 100644
--- a/templates-basic-utils-fedora.sls
+++ b/templates-basic-utils-fedora.sls
@@ -7,3 +7,4 @@ templates-basic-utils-fedora.packages:
       - nmap-ncat
       - git-core
       - bind-utils
+      - fwknop
diff --git a/templates-split-ssh-code.sls b/templates-split-ssh-code.sls
index c562d01..8eb880d 100644
--- a/templates-split-ssh-code.sls
+++ b/templates-split-ssh-code.sls
@@ -4,7 +4,7 @@
 # split-ssh *code* in templates
 #
 
-"https://github.com/henn/qubes-app-split-ssh.git":
+"https://github.com/rysiekpl/qubes-app-split-ssh.git":
     git.latest:
         - target: "/opt/qubes-app-split-ssh/"
         - branch: master
-- 
GitLab