summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cokiki.hs32
-rw-r--r--kiki.hs13
2 files changed, 31 insertions, 14 deletions
diff --git a/cokiki.hs b/cokiki.hs
index 97b4f9a..c93e30e 100644
--- a/cokiki.hs
+++ b/cokiki.hs
@@ -15,18 +15,34 @@ import System.Posix.User
15import CommandLine 15import CommandLine
16 16
17usage = unlines 17usage = unlines
18 [ "cokiki <command> [--chroot=ROOTDIR] [--homedir=HOMEDIR] [--passphrase-fd=FD]" 18 [ "cokiki <command> [--chroot=ROOTDIR]"
19 , " [--homedir=HOMEDIR]"
20 , " [--passphrase-fd=FD]"
21 , ""
22 , "cokiki modifies system configuration to recognize generated files"
23 , "in /var/cache/kiki. In addition to each command's documented effects"
24 , "(see COMMANDS), the following operation will be performed on your"
25 , "GnuPG keyring:"
26 , ""
27 , " master-key (generated if not present)"
28 , " tor (generated if not prsenet)"
29 , " ipsec (generated if not prsenet)"
30 , " ssh-server (imported or generated if not present)"
31 , " ssh-client (imported or gnnerated if not present)"
32 , ""
33 , "The /var/cache/kiki/* tree will also be refreshed."
19 , "" 34 , ""
20 , "COMMANDS" 35 , "COMMANDS"
21 , "" 36 , ""
22 , " ssh-client" 37 , " ssh-client Modify system ssh configuration to respect"
23 , " 1) Modify system ssh configuration to respect /var/cache/kiki/ssh_known_hosts." 38 , " /var/cache/kiki/ssh_known_hosts."
24 , " 2) Set kiki ssh-server key to /etc/ssh/ssh_host_rsa_key. If kiki already has" 39 , ""
25 , " an ssh-server key configured, it will be replaced." 40 , " ssh-server Modify system ssh configuration to use the"
26 , " 3) Refresh /var/cache/kiki/*" 41 , " kiki-managed host key at"
42 , " /var/cache/kiki/ssh_host_rsa_key."
27 , "" 43 , ""
28 , " ssh-server: TODO" 44 , " strongswan Modify /etc/ipsec.conf to include settings from"
29 , " strongswan: TODO" 45 , " /var/cache/kiki/ipsec.conf."
30 ] 46 ]
31 47
32main = do 48main = do
diff --git a/kiki.hs b/kiki.hs
index a662ef5..8ca6e5d 100644
--- a/kiki.hs
+++ b/kiki.hs
@@ -1406,13 +1406,14 @@ kiki "init" args | "--help" `elem` args = do
1406 , " | --homedir[=HOMEDIR]" 1406 , " | --homedir[=HOMEDIR]"
1407 , " | --chroot=ROOTDIR ] ..." 1407 , " | --chroot=ROOTDIR ] ..."
1408 , "" 1408 , ""
1409 , "Initialize a GnuPG keyring for use with kiki. After completion, you" 1409 , "Modify your GnuPG keyring and update /var/cache/kiki. The following"
1410 , "willl have a GnuPG master key with following specialized subkeys:" 1410 , "changes will occur to the keyring:"
1411 , "" 1411 , ""
1412 , " tor - freshly generated tor hidden service key" 1412 , " master-key (generated if not present)"
1413 , " ipsec - freshly generated VPN key" 1413 , " tor (generated if not prsenet)"
1414 , " ssh-server - possibly read from /etc/ssh/*" 1414 , " ipsec (generated if not prsenet)"
1415 , " ssh-client - possibly read from /root/.ssh/id_rsa" 1415 , " ssh-server (imported or generated if not present)"
1416 , " ssh-client (imported or gnnerated if not present)"
1416 , "" 1417 , ""
1417 , "OPTIONS" 1418 , "OPTIONS"
1418 , "" 1419 , ""