1 files changed, 17 insertions, 16 deletions

diff --git a/cokiki.hs b/cokiki.hs
index 70ea256..c6d1aa5 100644
--- a/cokiki.hs
+++ b/cokiki.hs
@@ -25,6 +25,7 @@ usage = unlines
     [ "cokiki <command> [--chroot=ROOTDIR]"
     , "                 [--homedir=HOMEDIR]"
     , "                 [--passphrase-fd=FD]"
+    , "                 [-(4|5)]"
     , ""
     , "cokiki modifies system configuration to recognize generated files"
     , "in /var/cache/kiki. In addition to each command's documented effects"
@@ -61,12 +62,12 @@ usage = unlines
 main = do
     (cmd,args) <- splitAt 1 <$> getArgs
     uid <- getEffectiveUserID
-    let msel = case cmd of
-                ["ssh-client"] -> Just $ sshClient  uid <$> Kiki.dashdashChroot <*> Kiki.dashdashHomedir
-                ["ssh-server"] -> Just $ sshServer  uid <$> Kiki.dashdashChroot <*> Kiki.dashdashHomedir
-                ["strongswan"] -> Just $ strongswan uid <$> Kiki.dashdashChroot <*> Kiki.dashdashHomedir
-                ["tor"]        -> Just $ configureTor uid <$> Kiki.dashdashChroot <*> Kiki.dashdashHomedir
-                ["hosts"]      -> Just $ configureHosts uid <$> Kiki.dashdashChroot <*> Kiki.dashdashHomedir
+    let msel = fmap (\c -> c <$> Kiki.dashdashPGPVersion <*> Kiki.dashdashChroot <*> Kiki.dashdashHomedir) $ case cmd of
+                ["ssh-client"] -> Just $ sshClient      uid
+                ["ssh-server"] -> Just $ sshServer      uid
+                ["strongswan"] -> Just $ strongswan     uid
+                ["tor"]        -> Just $ configureTor   uid
+                ["hosts"]      -> Just $ configureHosts uid
                 _ -> Nothing
         spec = uncurry fancy Kiki.kikiOptions ""
         errorQuit msg = do
@@ -97,7 +98,7 @@ whenRoot uid root cmn action
  where
     no = hPutStrLn stderr "operation requires root."
 
-sshClient uid root cmn = whenRoot uid root cmn $ do
+sshClient uid pgpver root cmn = whenRoot uid root cmn $ do
     -- /etc/ssh/config/ssh_config    <--  'GlobalKnownHostsFile /var/cache/kiki/ssh_known_hosts'
     sshconfig <- parseSshConfig . fromMaybe "" <$> maybeReadFile (root "/etc/ssh/ssh_config")
     let (ps,qs) = sshSplitAtDirective "GlobalKnownHostsFile" sshconfig
@@ -122,9 +123,9 @@ 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 Unencrypted
+    Kiki.importAndRefresh pgpver root cmn Unencrypted
 
-sshServer uid root cmn = whenRoot uid root cmn $ do
+sshServer uid pgpver root cmn = whenRoot uid root cmn $ do
     sshconfig <- parseSshConfig . fromMaybe "" <$> maybeReadFile (root "/etc/ssh/sshd_config")
     let p:gs = groupBy (\_ d -> not $ sshIsDirective "HostKey" d) $ ["#"]:sshconfig
         got = filter (\(d:ds) -> elem "/var/cache/kiki/config/ssh_host_rsa_key" d) gs
@@ -135,9 +136,9 @@ 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 Unencrypted
+    Kiki.importAndRefresh pgpver root cmn Unencrypted
 
-strongswan uid root cmn = whenRoot uid root cmn $ do
+strongswan uid pgpver root cmn = whenRoot uid root cmn $ do
     -- (1) /etc/ipsec.conf    <--  'include /var/cache/kiki/config/ipsec.conf'
     -- Parsing as if ssh config, that's not right, but good enough for now.
     ipsecconf <- parseSshConfig . fromMaybe "" <$> maybeReadFile (root "/etc/ipsec.conf")
@@ -161,9 +162,9 @@ strongswan uid root cmn = whenRoot uid root cmn $ do
                      stmt = ["include", " ", "/var/cache/kiki/config/ipsec.secrets"]
                  hPutStrLn stderr "adding include directive"
                  myWriteFile (root "/etc/ipsec.secrets") $ unparseSshConfig ipsecconf'
-    Kiki.importAndRefresh root cmn Unencrypted
+    Kiki.importAndRefresh pgpver root cmn Unencrypted
 
-configureTor uid root cmn = whenRoot uid root cmn $ do
+configureTor uid pgpver root cmn = whenRoot uid root cmn $ do
     -- Parsing as if ssh config, that's not right, but good enough for now.
     torrc <- parseSshConfig . fromMaybe "" <$> maybeReadFile (root "/etc/tor/torrc")
     let p:gs     = groupBy (\_ d -> not $ sshIsDirective "HiddenServiceDir" d) $ ["#"]:torrc
@@ -215,11 +216,11 @@ 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 Unencrypted
+    Kiki.importAndRefresh pgpver root cmn Unencrypted
     return ()
 
-configureHosts uid root cmn = whenRoot uid root cmn $ do
-    Kiki.importAndRefresh root cmn Unencrypted
+configureHosts uid pgpver root cmn = whenRoot uid root cmn $ do
+    Kiki.importAndRefresh pgpver root cmn Unencrypted
     hosts <- Hosts.decode . fromMaybe "" <$> maybeReadFile (root "/etc/hosts")
     kikihosts <- Hosts.decode . fromMaybe "" <$> maybeReadFile (root "/var/cache/kiki/config/hosts")
     let hosts' = hosts `Hosts.plus` kikihosts