diff options
author | joe <joe@jerkface.net> | 2016-05-03 12:58:56 +0200 |
---|---|---|
committer | joe <joe@jerkface.net> | 2016-05-03 12:59:45 +0200 |
commit | c4a01a2f5f8021f390c4f58b6e4ebc6a62557b9b (patch) | |
tree | 884849ca829c60066d9edac785169c3d474c5fe2 /lib/Kiki.hs | |
parent | aa85e30ff97c2b4c94f47621bbe1372142a55b7e (diff) |
nowtf
Diffstat (limited to 'lib/Kiki.hs')
-rw-r--r-- | lib/Kiki.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/Kiki.hs b/lib/Kiki.hs index f21e8d8..f5490e0 100644 --- a/lib/Kiki.hs +++ b/lib/Kiki.hs | |||
@@ -376,7 +376,7 @@ refreshCache rt rootdir = do | |||
376 | (_,(sout,serr)) <- runExternal "(f=$(mktemp); cat > \"$f\"; ssh-keygen -l -f \"$f\" | (read _ hash _; echo -n $hash.ssh.cryptonomic.net) | tr -d ':')" | 376 | (_,(sout,serr)) <- runExternal "(f=$(mktemp); cat > \"$f\"; ssh-keygen -l -f \"$f\" | (read _ hash _; echo -n $hash.ssh.cryptonomic.net) | tr -d ':')" |
377 | (Just $ sshblobFromPacket sshkey) | 377 | (Just $ sshblobFromPacket sshkey) |
378 | -- ssh-keygen -l -f /dev/stdin | 378 | -- ssh-keygen -l -f /dev/stdin |
379 | putStrLn $ "wtf="++show(sout,serr, sshblobFromPacket sshkey) | 379 | -- putStrLn $ "wtf="++show(sout,serr, sshblobFromPacket sshkey) |
380 | return $ strongswanForContact addr contactname (Char8.fromChunks [sout]) | 380 | return $ strongswanForContact addr contactname (Char8.fromChunks [sout]) |
381 | [] -> error "fuck." | 381 | [] -> error "fuck." |
382 | return $ Char8.concat bss | 382 | return $ Char8.concat bss |
@@ -421,7 +421,7 @@ refreshCache rt rootdir = do | |||
421 | 421 | ||
422 | strongswanForContact addr oname rightip = Char8.unlines | 422 | strongswanForContact addr oname rightip = Char8.unlines |
423 | [ "conn " <> oname | 423 | [ "conn " <> oname |
424 | , " right=" <> rightip | 424 | , " right=lan." <> rightip |
425 | , " rightsubnet=" <> p (showA addr) <> "/128" | 425 | , " rightsubnet=" <> p (showA addr) <> "/128" |
426 | , " rightauth=pubkey" | 426 | , " rightauth=pubkey" |
427 | , " rightid=" <> p (showA addr) | 427 | , " rightid=" <> p (showA addr) |