deMaybe credPairRemoteKey

It's always Just

Remote/External.hs

@@ -438,7 +438,7 @@ handleRequest' st external req mp responsehandler
 	credstorage setting = CredPairStorage
 		{ credPairFile = base
 		, credPairEnvironment = (base ++ "login", base ++ "password")
-		, credPairRemoteKey = Just setting
+		, credPairRemoteKey = setting
 		}
 	  where
 		base = replace "/" "_" $ fromUUID (externalUUID external) ++ "-" ++ setting

Remote/Helper/AWS.hs

@@ -23,7 +23,7 @@ creds :: UUID -> CredPairStorage
 creds u = CredPairStorage
 	{ credPairFile = fromUUID u
 	, credPairEnvironment = ("AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY")
-	, credPairRemoteKey = Just "s3creds"
+	, credPairRemoteKey = "s3creds"
 	}
 
 data Service = S3 | Glacier

Remote/WebDAV.hs

@@ -328,7 +328,7 @@ davCreds :: UUID -> CredPairStorage
 davCreds u = CredPairStorage
 	{ credPairFile = fromUUID u
 	, credPairEnvironment = ("WEBDAV_USERNAME", "WEBDAV_PASSWORD")
-	, credPairRemoteKey = Just "davcreds"
+	, credPairRemoteKey = "davcreds"
 	}
 
 {- Content-Type to use for files uploaded to WebDAV. -}