Renamed usage tag strongswan -> ipsec.

1 files changed, 8 insertions, 8 deletions

diff --git a/kiki.hs b/kiki.hs
index 4aa5885..cf4089a 100644
--- a/kiki.hs
+++ b/kiki.hs
@@ -1547,7 +1547,7 @@ kiki "init-key" args = do
              { opFiles = Map.fromList $
                 [ ( HomeSec, buildStreamInfo KF_All KeyRingFile )
                 , ( HomePub, (buildStreamInfo KF_All KeyRingFile) { access = Pub } )
-                , ( ArgFile ipsecpath, peminfo 1024 "strongswan" )
+                , ( ArgFile ipsecpath, peminfo 1024 "ipsec" )
                 , ( ArgFile sshcpath, peminfo 2048 "ssh-client" )
                 , ( ArgFile sshspath, peminfo 2048 "ssh-server" ) ]
              , opPassphrases = [ PassphraseMemoizer (rtPassphrases rt) ]
@@ -1571,9 +1571,9 @@ kiki "init-key" args = do
 
     -- Finally, export public keys if they do not exist.
     let writeFileWARNING fname bs = do
-        --TODO
-        hPutStrLn stderr $ fname ++ ": DID NOT CHECK TRUST (TODO)"
-        writeFile fname bs
+            --TODO
+            hPutStrLn stderr $ fname ++ ": DID NOT CHECK TRUST (TODO)"
+            writeFile fname bs
     flip (maybe $ warn "missing working key?") (rtGrip rt) $ \grip -> do
     gotc <- doesFileExist (sshcpathpub)
     when (not gotc) $ do
@@ -1588,7 +1588,7 @@ kiki "init-key" args = do
             goti <- doesFileExist (ipsecpathpub)
             when (not goti) $ do
                 either warn (writeFile $ ipsecpathpub)
-                    $ show_pem' "strongswan" grip (rtKeyDB rt) pemFromPacket
+                    $ show_pem' "ipsec" grip (rtKeyDB rt) pemFromPacket
         else return ()
 
 
@@ -1607,7 +1607,7 @@ kiki "init-key" args = do
                 their_master = packet $ keyMappedPacket kd
                 -- We find all cross-certified ipsec keys for the given cross-certified onion name.
                 ipsecs = sortOn (Down . timestamp)
-                         $ getCrossSignedSubkeys their_master (keySubKeys kd) "strongswan"
+                         $ getCrossSignedSubkeys their_master (keySubKeys kd) "ipsec"
             forM_ (take 1 ipsecs) $ \k -> do
             goti <- doesFileExist (cpath)
             when (not goti) $ do
@@ -1693,7 +1693,7 @@ kiki "tar" args = do
 tarContent rt spec pubpem knownhosts secpem = ipsecs ++ sshs ++ secrets "root"
  where
     ipsecs = do
-        (kk,ipsec,sigs) <- selectPublicKeyAndSigs (KeyUidMatch "",Just "strongswan") (rtKeyDB rt)
+        (kk,ipsec,sigs) <- selectPublicKeyAndSigs (KeyUidMatch "",Just "ipsec") (rtKeyDB rt)
         let kd = (rtKeyDB rt Map.! kk)
             k = packet $ keyMappedPacket kd
             (addr,(onames,ns)) = getHostnames kd
@@ -1729,7 +1729,7 @@ tarContent rt spec pubpem knownhosts secpem = ipsecs ++ sshs ++ secrets "root"
                         return $ spem (dir $ homedir ++ "/.ssh/" ++ sshkeyname k) k
             sshsvr = spem (dir "etc/ssh/ssh_host_rsa_key") <$> lookupSecret "ssh-host" kd
             ipseckey = do
-                k <- lookupSecret "strongswan" kd
+                k <- lookupSecret "ipsec" kd
                 oname <- fst . snd $ getHostnames kd
                 return $ spem (dir $ "etc/ipsec.d/private/"++Char8.unpack oname++".pem") k
         torkey ++ sshcli ++ sshsvr ++ ipseckey