rename RemoteConfigKey to RemoteConfigField
And some associated renames. I was going to have some values named fooKeyKey otherwise..
This commit is contained in:
parent
d1130ea04a
commit
59908586f4
11 changed files with 39 additions and 39 deletions
|
@ -442,7 +442,7 @@ handleRequest' st external req mp responsehandler
|
|||
credstorage setting = CredPairStorage
|
||||
{ credPairFile = base
|
||||
, credPairEnvironment = (base ++ "login", base ++ "password")
|
||||
, credPairRemoteKey = setting
|
||||
, credPairRemoteField = setting
|
||||
}
|
||||
where
|
||||
base = replace "/" "_" $ fromUUID (externalUUID external) ++ "-" ++ setting
|
||||
|
|
|
@ -23,7 +23,7 @@ creds :: UUID -> CredPairStorage
|
|||
creds u = CredPairStorage
|
||||
{ credPairFile = fromUUID u
|
||||
, credPairEnvironment = ("AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY")
|
||||
, credPairRemoteKey = "s3creds"
|
||||
, credPairRemoteField = "s3creds"
|
||||
}
|
||||
|
||||
data Service = S3 | Glacier
|
||||
|
|
|
@ -74,7 +74,7 @@ gitConfigSpecialRemote u c cfgs = do
|
|||
forM_ cfgs $ \(k, v) ->
|
||||
setConfig (remoteConfig c k) v
|
||||
storeUUIDIn (remoteConfig c "uuid") u
|
||||
case M.lookup sameasUUIDKey c of
|
||||
case M.lookup sameasUUIDField c of
|
||||
Nothing -> noop
|
||||
Just sameasuuid -> setConfig (remoteConfig c "config-uuid") sameasuuid
|
||||
|
||||
|
|
|
@ -341,7 +341,7 @@ davCreds :: UUID -> CredPairStorage
|
|||
davCreds u = CredPairStorage
|
||||
{ credPairFile = fromUUID u
|
||||
, credPairEnvironment = ("WEBDAV_USERNAME", "WEBDAV_PASSWORD")
|
||||
, credPairRemoteKey = "davcreds"
|
||||
, credPairRemoteField = "davcreds"
|
||||
}
|
||||
|
||||
{- Content-Type to use for files uploaded to WebDAV. -}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue