transactional refreshCache function in cokiki

1 files changed, 10 insertions, 10 deletions

diff --git a/cokiki.hs b/cokiki.hs
index 9448aea..fc69037 100644
--- a/cokiki.hs
+++ b/cokiki.hs
@@ -78,22 +78,22 @@ whenRoot uid root cmn action
     no = hPutStrLn stderr "operation requires root."
 
 sshClient uid root cmn = whenRoot uid root cmn $ do
-    -- /etc/ssh/ssh_config    <--  'GlobalKnownHostsFile /var/cache/kiki/ssh_known_hosts'
+    -- /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
     sshconfig' <-
         case qs of
-            d:ds | elem "/var/cache/kiki/ssh_known_hosts" d
+            d:ds | elem "/var/cache/kiki/config/ssh_known_hosts" d
                  -> do hPutStrLn stderr "ssh-client already configured."
                        return Nothing
             d:ds -> do hPutStrLn stderr "modifying GlobalKnownHostsFile directive"
-                       let hs = " " : "/var/cache/kiki/ssh_known_hosts" : drop 1 d
+                       let hs = " " : "/var/cache/kiki/config/ssh_known_hosts" : drop 1 d
                            stmt = take 1 d ++ hs
                        return $ Just (ps ++ stmt : ds)
             []   -> do -- Unconfigured add fresh directive.
                        hPutStrLn stderr "adding GlobalKnownHostsFile directive"
                        let stmt = L8.unwords ["GlobalKnownHostsFile"
-                                             ,  "/var/cache/kiki/ssh_known_hosts"
+                                             ,  "/var/cache/kiki/config/ssh_known_hosts"
                                              ,  "/etc/ssh/ssh_known_hosts"
                                              ,  "/etc/ssh/ssh_known_hosts2"
                                              ]
@@ -101,31 +101,31 @@ sshClient uid root cmn = whenRoot uid root cmn $ do
     sshconfig' `deepseq` return () -- force lazy input
     maybe (return ()) (myWriteFile (root "/etc/ssh/ssh_config") . unparseSshConfig) sshconfig'
 
-    -- /var/cache/kiki/ssh_known_hosts        <--  contains known hosts from /root/.gnupg/...
+    -- /var/cache/kiki/config/ssh_known_hosts        <--  contains known hosts from /root/.gnupg/...
     Kiki.importAndRefresh root cmn
 
 sshServer uid 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/ssh_host_rsa_key" d) gs
+        got = filter (\(d:ds) -> elem "/var/cache/kiki/config/ssh_host_rsa_key" d) gs
     case got of
         _:_ -> do hPutStrLn stderr "ssh-server already configured."
         [] -> do let sshconfig' = drop 1 $ sshconfig ++ [stmt]
-                     stmt = ["HostKey", " ", "/var/cache/kiki/ssh_host_rsa_key"]
+                     stmt = ["HostKey", " ", "/var/cache/kiki/config/ssh_host_rsa_key"]
                  hPutStrLn stderr "adding HostKey directive"
                  myWriteFile (root "/etc/ssh/sshd_config") $ unparseSshConfig sshconfig'
-    -- /etc/ssh/sshd_config <-- 'HostKey /var/cache/kiki/ssh_host_ecdsa_key' etc.
+    -- /etc/ssh/sshd_config <-- 'HostKey /var/cache/kiki/config/ssh_host_ecdsa_key' etc.
     Kiki.importAndRefresh root cmn
 
 strongswan uid root cmn = whenRoot uid root cmn $ do
     -- Parsing as if ssh config, that's not right, but good enough for now.
     ipsecconf <- parseSshConfig . fromMaybe "" <$> maybeReadFile (root "/etc/ipsec.conf")
     let p:gs = groupBy (\_ d -> not $ sshIsDirective "include" d) $ ["#"]:ipsecconf
-        got = filter (\(d:ds) -> elem "/var/cache/kiki/ipsec.conf" d) gs
+        got = filter (\(d:ds) -> elem "/var/cache/kiki/config/ipsec.conf" d) gs
     case got of
         _:_ -> do hPutStrLn stderr "ipsec already configured."
         [] -> do let ipsecconf' = drop 1 $ ipsecconf ++ [stmt]
-                     stmt = ["include", " ", "/var/cache/kiki/ipsec.conf"]
+                     stmt = ["include", " ", "/var/cache/kiki/config/ipsec.conf"]
                  hPutStrLn stderr "adding include directive"
                  myWriteFile (root "/etc/ipsec.conf") $ unparseSshConfig ipsecconf'
     -- etc/ipsec.conf    <--  'include /var/cache/kiki/ipsec.conf'