Other config

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

tests/preseed-config.php

@@ -36,18 +36,36 @@ if (getenv('OBJECT_STORE') === 's3') {
 }
 if (getenv('OBJECT_STORE') === 'swift') {
 	$swiftHost = getenv('DRONE') === 'true' ? 'dockswift' : 'localhost';
-	$auth = getenv('SWIFT-AUTH') === '' ? '2.0' : getenv('SWIFT-AUTH');
-	$CONFIG['objectstore'] = [
-		'class' => 'OC\\Files\\ObjectStore\\Swift',
-		'arguments' => array(
-			'autocreate' => true,
-			'username' => 'swift',
-			'tenantName' => 'service',
-			'password' => 'swift',
-			'serviceName' => 'swift',
-			'region' => 'regionOne',
-			'url' => "http://$swiftHost:5000/$auth",
-			'bucket' => 'nextcloud'
-		)
-	];
+
+	if (getenv('SWIFT-AUTH') === 'v2.0') {
+		$CONFIG['objectstore'] = [
+			'class' => 'OC\\Files\\ObjectStore\\Swift',
+			'arguments' => array(
+				'autocreate' => true,
+				'username' => 'swift',
+				'tenantName' => 'service',
+				'password' => 'swift',
+				'serviceName' => 'swift',
+				'region' => 'regionOne',
+				'url' => "http://$swiftHost:5000/v2.0",
+				'bucket' => 'nextcloud'
+			)
+		];
+	} else {
+		$CONFIG['objectstore'] = [
+			'class' => 'OC\\Files\\ObjectStore\\Swift',
+			'arguments' => array(
+				'autocreate' => true,
+				'user' => [
+					'id' => 'swift',
+				],
+				'tenantName' => 'service',
+				'password' => 'swift',
+				'serviceName' => 'swift',
+				'region' => 'regionOne',
+				'url' => "http://$swiftHost:5000/v3",
+				'bucket' => 'nextcloud'
+			)
+		];
+	}
 }