diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-02-11 14:06:50 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-02-11 14:07:56 -0400 |
| commit | 066a06606aeb7f4a3cd70e7b592fef8dc6a9b71e (patch) | |
| tree | 98458711a7dab3e3c669b513ed7b84cc2502374b /Command | |
| parent | f779747a0d4d5c9e39a3c82498fe1809d56b4d25 (diff) | |
plumb creds from webapp to initremote
Avoids abusing setting environment variables, which was always a hack
and won't work on windows.
Diffstat (limited to 'Command')
| -rw-r--r-- | Command/EnableRemote.hs | 2 | ||||
| -rw-r--r-- | Command/InitRemote.hs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Command/EnableRemote.hs b/Command/EnableRemote.hs index a00046d5a..42ab43374 100644 --- a/Command/EnableRemote.hs +++ b/Command/EnableRemote.hs @@ -47,7 +47,7 @@ unknownNameError prefix = do perform :: RemoteType -> UUID -> R.RemoteConfig -> CommandPerform perform t u c = do - (c', u') <- R.setup t (Just u) c + (c', u') <- R.setup t (Just u) Nothing c next $ cleanup u' c' cleanup :: UUID -> R.RemoteConfig -> CommandCleanup diff --git a/Command/InitRemote.hs b/Command/InitRemote.hs index 79fbcf39c..dc54023cc 100644 --- a/Command/InitRemote.hs +++ b/Command/InitRemote.hs @@ -44,7 +44,7 @@ start (name:ws) = ifM (isJust <$> findExisting name) perform :: RemoteType -> String -> R.RemoteConfig -> CommandPerform perform t name c = do - (c', u) <- R.setup t Nothing c + (c', u) <- R.setup t Nothing Nothing c next $ cleanup u name c' cleanup :: UUID -> String -> R.RemoteConfig -> CommandCleanup |