diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-09-08 15:40:47 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-09-08 15:40:47 -0400 |
| commit | 317ab14da283e8ff88a45b036fb3aee9f5b4083f (patch) | |
| tree | 34a77cf21203cccef5cd8a845fef7d45fc5edfff /Assistant/WebApp | |
| parent | 5401b9f2497c7719dfe65d9d576f645bec282785 (diff) | |
add remote directory to pair request
Diffstat (limited to 'Assistant/WebApp')
| -rw-r--r-- | Assistant/WebApp/Configurators/Pairing.hs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Assistant/WebApp/Configurators/Pairing.hs b/Assistant/WebApp/Configurators/Pairing.hs index cc7d1cf77..8b56f3392 100644 --- a/Assistant/WebApp/Configurators/Pairing.hs +++ b/Assistant/WebApp/Configurators/Pairing.hs @@ -56,9 +56,10 @@ getStartPairR :: Handler RepHtml getStartPairR = promptSecret Nothing $ \rawsecret secret -> do hostname <- liftIO $ getHostname username <- liftIO $ getUserName + reldir <- fromJust . relDir <$> lift getYesod let sshkey = "" -- TODO generate/read ssh key let mkmsg addr = PairReqM $ PairReq $ - mkVerifiable (PairData hostname addr username sshkey) secret + mkVerifiable (PairData hostname addr username reldir sshkey) secret pip <- liftIO $ PairingInProgress secret <$> multicastPairMsg mkmsg dstatus <- daemonStatus <$> lift getYesod liftIO $ modifyDaemonStatus_ dstatus $ |