From 78c2c3753e69818aa7fd5d3a0354fea5d0fc452b Mon Sep 17 00:00:00 2001 From: joe Date: Mon, 29 Aug 2016 22:24:08 -0400 Subject: cokiki build fix & show --packets option. --- cokiki.hs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'cokiki.hs') diff --git a/cokiki.hs b/cokiki.hs index f8eed0a..54cc4ba 100644 --- a/cokiki.hs +++ b/cokiki.hs @@ -19,6 +19,7 @@ import System.Exit import System.IO import System.Posix.User import CommandLine +import Data.OpenPGP (SymmetricAlgorithm(Unencrypted)) usage = unlines [ "cokiki [--chroot=ROOTDIR]" @@ -116,7 +117,7 @@ sshClient uid root cmn = whenRoot uid root cmn $ do maybe (return ()) (myWriteFile (root "/etc/ssh/ssh_config") . unparseSshConfig) sshconfig' -- /var/cache/kiki/config/ssh_known_hosts <-- contains known hosts from /root/.gnupg/... - Kiki.importAndRefresh root cmn + Kiki.importAndRefresh root cmn Unencrypted sshServer uid root cmn = whenRoot uid root cmn $ do sshconfig <- parseSshConfig . fromMaybe "" <$> maybeReadFile (root "/etc/ssh/sshd_config") @@ -129,7 +130,7 @@ sshServer uid root cmn = whenRoot uid root cmn $ do hPutStrLn stderr "adding HostKey directive" myWriteFile (root "/etc/ssh/sshd_config") $ unparseSshConfig sshconfig' -- /etc/ssh/sshd_config <-- 'HostKey /var/cache/kiki/config/ssh_host_ecdsa_key' etc. - Kiki.importAndRefresh root cmn + Kiki.importAndRefresh root cmn Unencrypted strongswan uid root cmn = whenRoot uid root cmn $ do -- Parsing as if ssh config, that's not right, but good enough for now. @@ -143,7 +144,7 @@ strongswan uid root cmn = whenRoot uid root cmn $ do hPutStrLn stderr "adding include directive" myWriteFile (root "/etc/ipsec.conf") $ unparseSshConfig ipsecconf' -- etc/ipsec.conf <-- 'include /var/cache/kiki/ipsec.conf' - Kiki.importAndRefresh root cmn + Kiki.importAndRefresh root cmn Unencrypted configureTor uid root cmn = whenRoot uid root cmn $ do -- Parsing as if ssh config, that's not right, but good enough for now. @@ -197,7 +198,7 @@ configureTor uid root cmn = whenRoot uid root cmn $ do , ["HiddenServicePort"," ","22"," ","127.0.0.1:22"] , ["HiddenServicePort"," ","25"," ","127.0.0.1:25"] ] myWriteFile (root "/etc/tor/torrc") $ unparseSshConfig torrc' - Kiki.importAndRefresh root cmn + Kiki.importAndRefresh root cmn Unencrypted return () -- cgit v1.2.3