Passed
Push — master ( fabcd6...f1cc6c )
by Joas
15:10 queued 15s
created
config/config.sample.php 2 patches
Indentation   +159 added lines, -159 removed lines patch added patch discarded remove patch
@@ -41,17 +41,17 @@  discard block
 block discarded – undo
41 41
  */
42 42
 'instanceid' => '',
43 43
 
44
- /**
45
-  * The salt used to hash all passwords, auto-generated by the Nextcloud
46
-  * installer. (There are also per-user salts.) If you lose this salt you lose
47
-  * all your passwords. This example is for documentation only, and you should
48
-  * never use it.
49
-  *
50
-  * @deprecated This salt is deprecated and only used for legacy-compatibility,
51
-  * developers should *NOT* use this value for anything nowadays.
52
-  *
53
-  * 'passwordsalt' => 'd3c944a9af095aa08f',
54
- */
44
+    /**
45
+     * The salt used to hash all passwords, auto-generated by the Nextcloud
46
+     * installer. (There are also per-user salts.) If you lose this salt you lose
47
+     * all your passwords. This example is for documentation only, and you should
48
+     * never use it.
49
+     *
50
+     * @deprecated This salt is deprecated and only used for legacy-compatibility,
51
+     * developers should *NOT* use this value for anything nowadays.
52
+     *
53
+     * 'passwordsalt' => 'd3c944a9af095aa08f',
54
+     */
55 55
 'passwordsalt' => '',
56 56
 
57 57
 /**
@@ -69,12 +69,12 @@  discard block
 block discarded – undo
69 69
  *   Using TLS certificates where commonName=<IP address> is deprecated
70 70
  */
71 71
 'trusted_domains' =>
72
-   [
72
+    [
73 73
     'demo.example.org',
74 74
     'otherdomain.example.org',
75 75
     '10.111.112.113',
76 76
     '[2001:db8::1]'
77
-  ],
77
+    ],
78 78
 
79 79
 
80 80
 /**
@@ -826,10 +826,10 @@  discard block
 block discarded – undo
826 826
  *  - www.edri.org
827 827
  */
828 828
 'connectivity_check_domains' => [
829
-	'www.nextcloud.com',
830
-	'www.startpage.com',
831
-	'www.eff.org',
832
-	'www.edri.org'
829
+    'www.nextcloud.com',
830
+    'www.startpage.com',
831
+    'www.eff.org',
832
+    'www.edri.org'
833 833
 ],
834 834
 
835 835
 /**
@@ -979,9 +979,9 @@  discard block
 block discarded – undo
979 979
  * Defaults to an empty array.
980 980
  */
981 981
 'log.condition' => [
982
-	'shared_secret' => '57b58edb6637fe3059b3595cf9c41b9',
983
-	'users' => ['sample-user'],
984
-	'apps' => ['files'],
982
+    'shared_secret' => '57b58edb6637fe3059b3595cf9c41b9',
983
+    'users' => ['sample-user'],
984
+    'apps' => ['files'],
985 985
 ],
986 986
 
987 987
 /**
@@ -1043,18 +1043,18 @@  discard block
 block discarded – undo
1043 1043
  *  - iOS client app id: ``1125420102``
1044 1044
  */
1045 1045
 'customclient_desktop' =>
1046
-	'https://nextcloud.com/install/#install-clients',
1046
+    'https://nextcloud.com/install/#install-clients',
1047 1047
 'customclient_android' =>
1048
-	'https://play.google.com/store/apps/details?id=com.nextcloud.client',
1048
+    'https://play.google.com/store/apps/details?id=com.nextcloud.client',
1049 1049
 'customclient_ios' =>
1050
-	'https://itunes.apple.com/us/app/nextcloud/id1125420102?mt=8',
1050
+    'https://itunes.apple.com/us/app/nextcloud/id1125420102?mt=8',
1051 1051
 'customclient_ios_appid' =>
1052
-		'1125420102',
1052
+        '1125420102',
1053 1053
 /**
1054
- * Apps
1055
- *
1056
- * Options for the Apps folder, Apps store, and App code checker.
1057
- */
1054
+         * Apps
1055
+         *
1056
+         * Options for the Apps folder, Apps store, and App code checker.
1057
+         */
1058 1058
 
1059 1059
 /**
1060 1060
  * When enabled, admins may install apps from the Nextcloud app store.
@@ -1086,11 +1086,11 @@  discard block
 block discarded – undo
1086 1086
  * indicates if a Web server can write files to that folder.
1087 1087
  */
1088 1088
 'apps_paths' => [
1089
-	[
1090
-		'path'=> '/var/www/nextcloud/apps',
1091
-		'url' => '/apps',
1092
-		'writable' => true,
1093
-	],
1089
+    [
1090
+        'path'=> '/var/www/nextcloud/apps',
1091
+        'url' => '/apps',
1092
+        'writable' => true,
1093
+    ],
1094 1094
 ],
1095 1095
 
1096 1096
 /**
@@ -1188,8 +1188,8 @@  discard block
 block discarded – undo
1188 1188
  * Defaults to ``''`` (empty string)
1189 1189
  */
1190 1190
 'preview_office_cl_parameters' =>
1191
-	' --headless --nologo --nofirststartwizard --invisible --norestore '.
1192
-	'--convert-to png --outdir ',
1191
+    ' --headless --nologo --nofirststartwizard --invisible --norestore '.
1192
+    '--convert-to png --outdir ',
1193 1193
 
1194 1194
 /**
1195 1195
  * Set the URL of the Imaginary service to send image previews to.
@@ -1234,16 +1234,16 @@  discard block
 block discarded – undo
1234 1234
  *  - OC\Preview\Krita
1235 1235
  */
1236 1236
 'enabledPreviewProviders' => [
1237
-	'OC\Preview\PNG',
1238
-	'OC\Preview\JPEG',
1239
-	'OC\Preview\GIF',
1240
-	'OC\Preview\BMP',
1241
-	'OC\Preview\XBitmap',
1242
-	'OC\Preview\MP3',
1243
-	'OC\Preview\TXT',
1244
-	'OC\Preview\MarkDown',
1245
-	'OC\Preview\OpenDocument',
1246
-	'OC\Preview\Krita',
1237
+    'OC\Preview\PNG',
1238
+    'OC\Preview\JPEG',
1239
+    'OC\Preview\GIF',
1240
+    'OC\Preview\BMP',
1241
+    'OC\Preview\XBitmap',
1242
+    'OC\Preview\MP3',
1243
+    'OC\Preview\TXT',
1244
+    'OC\Preview\MarkDown',
1245
+    'OC\Preview\OpenDocument',
1246
+    'OC\Preview\Krita',
1247 1247
 ],
1248 1248
 
1249 1249
 /**
@@ -1333,11 +1333,11 @@  discard block
 block discarded – undo
1333 1333
 
1334 1334
 /**
1335 1335
  * Extra SSL options to be used for configuration.
1336
-  *
1336
+ *
1337 1337
  * Defaults to an empty array.
1338 1338
  */
1339 1339
 'openssl' => [
1340
-	'config' => '/absolute/location/of/openssl.cnf',
1340
+    'config' => '/absolute/location/of/openssl.cnf',
1341 1341
 ],
1342 1342
 
1343 1343
 /**
@@ -1388,20 +1388,20 @@  discard block
 block discarded – undo
1388 1388
  * See https://redis.io/topics/encryption for more information.
1389 1389
  */
1390 1390
 'redis' => [
1391
-	'host' => 'localhost', // can also be a unix domain socket: '/tmp/redis.sock'
1392
-	'port' => 6379,
1393
-	'timeout' => 0.0,
1394
-	'read_timeout' => 0.0,
1395
-	'user' =>  '', // Optional: if not defined, no password will be used.
1396
-	'password' => '', // Optional: if not defined, no password will be used.
1397
-	'dbindex' => 0, // Optional: if undefined SELECT will not run and will use Redis Server's default DB Index.
1398
-	// If redis in-transit encryption is enabled, provide certificates
1399
-	// SSL context https://www.php.net/manual/en/context.ssl.php
1400
-	'ssl_context' => [
1401
-		'local_cert' => '/certs/redis.crt',
1402
-		'local_pk' => '/certs/redis.key',
1403
-		'cafile' => '/certs/ca.crt'
1404
-	]
1391
+    'host' => 'localhost', // can also be a unix domain socket: '/tmp/redis.sock'
1392
+    'port' => 6379,
1393
+    'timeout' => 0.0,
1394
+    'read_timeout' => 0.0,
1395
+    'user' =>  '', // Optional: if not defined, no password will be used.
1396
+    'password' => '', // Optional: if not defined, no password will be used.
1397
+    'dbindex' => 0, // Optional: if undefined SELECT will not run and will use Redis Server's default DB Index.
1398
+    // If redis in-transit encryption is enabled, provide certificates
1399
+    // SSL context https://www.php.net/manual/en/context.ssl.php
1400
+    'ssl_context' => [
1401
+        'local_cert' => '/certs/redis.crt',
1402
+        'local_pk' => '/certs/redis.key',
1403
+        'cafile' => '/certs/ca.crt'
1404
+    ]
1405 1405
 ],
1406 1406
 
1407 1407
 /**
@@ -1427,22 +1427,22 @@  discard block
 block discarded – undo
1427 1427
  * https://github.com/phpredis/phpredis/commit/c5994f2a42b8a348af92d3acb4edff1328ad8ce1
1428 1428
  */
1429 1429
 'redis.cluster' => [
1430
-	'seeds' => [ // provide some or all of the cluster servers to bootstrap discovery, port required
1431
-		'localhost:7000',
1432
-		'localhost:7001',
1433
-	],
1434
-	'timeout' => 0.0,
1435
-	'read_timeout' => 0.0,
1436
-	'failover_mode' => \RedisCluster::FAILOVER_ERROR,
1437
-	'user' =>  '', // Optional: if not defined, no password will be used.
1438
-	'password' => '', // Optional: if not defined, no password will be used.
1439
-	// If redis in-transit encryption is enabled, provide certificates
1440
-	// SSL context https://www.php.net/manual/en/context.ssl.php
1441
-	'ssl_context' => [
1442
-		'local_cert' => '/certs/redis.crt',
1443
-		'local_pk' => '/certs/redis.key',
1444
-		'cafile' => '/certs/ca.crt'
1445
-	]
1430
+    'seeds' => [ // provide some or all of the cluster servers to bootstrap discovery, port required
1431
+        'localhost:7000',
1432
+        'localhost:7001',
1433
+    ],
1434
+    'timeout' => 0.0,
1435
+    'read_timeout' => 0.0,
1436
+    'failover_mode' => \RedisCluster::FAILOVER_ERROR,
1437
+    'user' =>  '', // Optional: if not defined, no password will be used.
1438
+    'password' => '', // Optional: if not defined, no password will be used.
1439
+    // If redis in-transit encryption is enabled, provide certificates
1440
+    // SSL context https://www.php.net/manual/en/context.ssl.php
1441
+    'ssl_context' => [
1442
+        'local_cert' => '/certs/redis.crt',
1443
+        'local_pk' => '/certs/redis.key',
1444
+        'cafile' => '/certs/ca.crt'
1445
+    ]
1446 1446
 ],
1447 1447
 
1448 1448
 
@@ -1450,36 +1450,36 @@  discard block
 block discarded – undo
1450 1450
  * Server details for one or more memcached servers to use for memory caching.
1451 1451
  */
1452 1452
 'memcached_servers' => [
1453
-	// hostname, port and optional weight
1454
-	// or path and port 0 for unix socket. Also see:
1455
-	// https://www.php.net/manual/en/memcached.addservers.php
1456
-	// https://www.php.net/manual/en/memcached.addserver.php
1457
-	['localhost', 11211],
1458
-	//array('other.host.local', 11211),
1453
+    // hostname, port and optional weight
1454
+    // or path and port 0 for unix socket. Also see:
1455
+    // https://www.php.net/manual/en/memcached.addservers.php
1456
+    // https://www.php.net/manual/en/memcached.addserver.php
1457
+    ['localhost', 11211],
1458
+    //array('other.host.local', 11211),
1459 1459
 ],
1460 1460
 
1461 1461
 /**
1462 1462
  * Connection options for memcached
1463 1463
  */
1464 1464
 'memcached_options' => [
1465
-	// Set timeouts to 50ms
1466
-	\Memcached::OPT_CONNECT_TIMEOUT => 50,
1467
-	\Memcached::OPT_RETRY_TIMEOUT =>   50,
1468
-	\Memcached::OPT_SEND_TIMEOUT =>    50,
1469
-	\Memcached::OPT_RECV_TIMEOUT =>    50,
1470
-	\Memcached::OPT_POLL_TIMEOUT =>    50,
1465
+    // Set timeouts to 50ms
1466
+    \Memcached::OPT_CONNECT_TIMEOUT => 50,
1467
+    \Memcached::OPT_RETRY_TIMEOUT =>   50,
1468
+    \Memcached::OPT_SEND_TIMEOUT =>    50,
1469
+    \Memcached::OPT_RECV_TIMEOUT =>    50,
1470
+    \Memcached::OPT_POLL_TIMEOUT =>    50,
1471 1471
 
1472
-	// Enable compression
1473
-	\Memcached::OPT_COMPRESSION =>          true,
1472
+    // Enable compression
1473
+    \Memcached::OPT_COMPRESSION =>          true,
1474 1474
 
1475
-	// Turn on consistent hashing
1476
-	\Memcached::OPT_LIBKETAMA_COMPATIBLE => true,
1475
+    // Turn on consistent hashing
1476
+    \Memcached::OPT_LIBKETAMA_COMPATIBLE => true,
1477 1477
 
1478
-	// Enable Binary Protocol
1479
-	\Memcached::OPT_BINARY_PROTOCOL =>      true,
1478
+    // Enable Binary Protocol
1479
+    \Memcached::OPT_BINARY_PROTOCOL =>      true,
1480 1480
 
1481
-	// Binary serializer vill be enabled if the igbinary PECL module is available
1482
-	//\Memcached::OPT_SERIALIZER => \Memcached::SERIALIZER_IGBINARY,
1481
+    // Binary serializer vill be enabled if the igbinary PECL module is available
1482
+    //\Memcached::OPT_SERIALIZER => \Memcached::SERIALIZER_IGBINARY,
1483 1483
 ],
1484 1484
 
1485 1485
 
@@ -1525,63 +1525,63 @@  discard block
 block discarded – undo
1525 1525
  * One way to test is applying for a trystack account at http://trystack.org/
1526 1526
  */
1527 1527
 'objectstore' => [
1528
-	'class' => 'OC\\Files\\ObjectStore\\Swift',
1529
-	'arguments' => [
1530
-		// trystack will use your facebook id as the username
1531
-		'username' => 'facebook100000123456789',
1532
-		// in the trystack dashboard go to user -> settings -> API Password to
1533
-		// generate a password
1534
-		'password' => 'Secr3tPaSSWoRdt7',
1535
-		// must already exist in the objectstore, name can be different
1536
-		'container' => 'nextcloud',
1537
-		// prefix to prepend to the fileid, default is 'oid:urn:'
1538
-		'objectPrefix' => 'oid:urn:',
1539
-		// create the container if it does not exist. default is false
1540
-		'autocreate' => true,
1541
-		// required, dev-/trystack defaults to 'RegionOne'
1542
-		'region' => 'RegionOne',
1543
-		// The Identity / Keystone endpoint
1544
-		'url' => 'http://8.21.28.222:5000/v2.0',
1545
-		// uploadPartSize: size of the uploaded chunks, defaults to 524288000
1546
-		'uploadPartSize' => 524288000,
1547
-		// required on dev-/trystack
1548
-		'tenantName' => 'facebook100000123456789',
1549
-		// dev-/trystack uses swift by default, the lib defaults to 'cloudFiles'
1550
-		// if omitted
1551
-		'serviceName' => 'swift',
1552
-		// The Interface / url Type, optional
1553
-		'urlType' => 'internal'
1554
-	],
1528
+    'class' => 'OC\\Files\\ObjectStore\\Swift',
1529
+    'arguments' => [
1530
+        // trystack will use your facebook id as the username
1531
+        'username' => 'facebook100000123456789',
1532
+        // in the trystack dashboard go to user -> settings -> API Password to
1533
+        // generate a password
1534
+        'password' => 'Secr3tPaSSWoRdt7',
1535
+        // must already exist in the objectstore, name can be different
1536
+        'container' => 'nextcloud',
1537
+        // prefix to prepend to the fileid, default is 'oid:urn:'
1538
+        'objectPrefix' => 'oid:urn:',
1539
+        // create the container if it does not exist. default is false
1540
+        'autocreate' => true,
1541
+        // required, dev-/trystack defaults to 'RegionOne'
1542
+        'region' => 'RegionOne',
1543
+        // The Identity / Keystone endpoint
1544
+        'url' => 'http://8.21.28.222:5000/v2.0',
1545
+        // uploadPartSize: size of the uploaded chunks, defaults to 524288000
1546
+        'uploadPartSize' => 524288000,
1547
+        // required on dev-/trystack
1548
+        'tenantName' => 'facebook100000123456789',
1549
+        // dev-/trystack uses swift by default, the lib defaults to 'cloudFiles'
1550
+        // if omitted
1551
+        'serviceName' => 'swift',
1552
+        // The Interface / url Type, optional
1553
+        'urlType' => 'internal'
1554
+    ],
1555 1555
 ],
1556 1556
 
1557 1557
 /**
1558 1558
  * To use swift V3
1559 1559
  */
1560 1560
 'objectstore' => [
1561
-	'class' => 'OC\\Files\\ObjectStore\\Swift',
1562
-	'arguments' => [
1563
-		'autocreate' => true,
1564
-		'user' => [
1565
-			'name' => 'swift',
1566
-			'password' => 'swift',
1567
-			'domain' => [
1568
-				'name' => 'default',
1569
-			],
1570
-		],
1571
-		'scope' => [
1572
-			'project' => [
1573
-				'name' => 'service',
1574
-				'domain' => [
1575
-					'name' => 'default',
1576
-				],
1577
-			],
1578
-		],
1579
-		'tenantName' => 'service',
1580
-		'serviceName' => 'swift',
1581
-		'region' => 'regionOne',
1582
-		'url' => 'http://yourswifthost:5000/v3',
1583
-		'bucket' => 'nextcloud',
1584
-	],
1561
+    'class' => 'OC\\Files\\ObjectStore\\Swift',
1562
+    'arguments' => [
1563
+        'autocreate' => true,
1564
+        'user' => [
1565
+            'name' => 'swift',
1566
+            'password' => 'swift',
1567
+            'domain' => [
1568
+                'name' => 'default',
1569
+            ],
1570
+        ],
1571
+        'scope' => [
1572
+            'project' => [
1573
+                'name' => 'service',
1574
+                'domain' => [
1575
+                    'name' => 'default',
1576
+                ],
1577
+            ],
1578
+        ],
1579
+        'tenantName' => 'service',
1580
+        'serviceName' => 'swift',
1581
+        'region' => 'regionOne',
1582
+        'url' => 'http://yourswifthost:5000/v3',
1583
+        'bucket' => 'nextcloud',
1584
+    ],
1585 1585
 ],
1586 1586
 
1587 1587
 /**
@@ -1698,11 +1698,11 @@  discard block
 block discarded – undo
1698 1698
  * does not verify the server cert except --ssl-verify-server-cert is passed manually.
1699 1699
  */
1700 1700
 'dbdriveroptions' => [
1701
-	PDO::MYSQL_ATTR_SSL_CA => '/file/path/to/ca_cert.pem',
1702
-	PDO::MYSQL_ATTR_SSL_KEY => '/file/path/to/mysql-client-key.pem',
1703
-	PDO::MYSQL_ATTR_SSL_CERT => '/file/path/to/mysql-client-cert.pem',
1704
-	PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT => false,
1705
-	PDO::MYSQL_ATTR_INIT_COMMAND => 'SET wait_timeout = 28800'
1701
+    PDO::MYSQL_ATTR_SSL_CA => '/file/path/to/ca_cert.pem',
1702
+    PDO::MYSQL_ATTR_SSL_KEY => '/file/path/to/mysql-client-key.pem',
1703
+    PDO::MYSQL_ATTR_SSL_CERT => '/file/path/to/mysql-client-cert.pem',
1704
+    PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT => false,
1705
+    PDO::MYSQL_ATTR_INIT_COMMAND => 'SET wait_timeout = 28800'
1706 1706
 ],
1707 1707
 
1708 1708
 /**
@@ -1777,10 +1777,10 @@  discard block
 block discarded – undo
1777 1777
  *  - pgsql (PostgreSQL)
1778 1778
  */
1779 1779
 'supportedDatabases' => [
1780
-	'sqlite',
1781
-	'mysql',
1782
-	'pgsql',
1783
-	'oci',
1780
+    'sqlite',
1781
+    'mysql',
1782
+    'pgsql',
1783
+    'oci',
1784 1784
 ],
1785 1785
 
1786 1786
 /**
@@ -2179,8 +2179,8 @@  discard block
 block discarded – undo
2179 2179
  * WARNING: only use this if you know what you are doing
2180 2180
  */
2181 2181
 'csrf.optout' => [
2182
-	'/^WebDAVFS/', // OS X Finder
2183
-	'/^Microsoft-WebDAV-MiniRedir/', // Windows webdav drive
2182
+    '/^WebDAVFS/', // OS X Finder
2183
+    '/^Microsoft-WebDAV-MiniRedir/', // Windows webdav drive
2184 2184
 ],
2185 2185
 
2186 2186
 /**
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -250,7 +250,7 @@  discard block
 block discarded – undo
250 250
  *
251 251
  * Defaults to ``60*60*24*15`` seconds (15 days)
252 252
  */
253
-'remember_login_cookie_lifetime' => 60*60*24*15,
253
+'remember_login_cookie_lifetime' => 60 * 60 * 24 * 15,
254 254
 
255 255
 /**
256 256
  * The lifetime of a session after inactivity.
@@ -1427,7 +1427,7 @@  discard block
 block discarded – undo
1427 1427
  * https://github.com/phpredis/phpredis/commit/c5994f2a42b8a348af92d3acb4edff1328ad8ce1
1428 1428
  */
1429 1429
 'redis.cluster' => [
1430
-	'seeds' => [ // provide some or all of the cluster servers to bootstrap discovery, port required
1430
+	'seeds' => [// provide some or all of the cluster servers to bootstrap discovery, port required
1431 1431
 		'localhost:7000',
1432 1432
 		'localhost:7001',
1433 1433
 	],
@@ -1501,7 +1501,7 @@  discard block
 block discarded – undo
1501 1501
  *
1502 1502
  * Defaults to ``60*60*24`` (1 day)
1503 1503
  */
1504
-'cache_chunk_gc_ttl' => 60*60*24,
1504
+'cache_chunk_gc_ttl' => 60 * 60 * 24,
1505 1505
 
1506 1506
 /**
1507 1507
  * Using Object Store with Nextcloud
@@ -2093,7 +2093,7 @@  discard block
 block discarded – undo
2093 2093
  * Defaults to ``60*60`` seconds (1 hour) or the php
2094 2094
  *             max_execution_time, whichever is higher.
2095 2095
  */
2096
-'filelocking.ttl' => 60*60,
2096
+'filelocking.ttl' => 60 * 60,
2097 2097
 
2098 2098
 /**
2099 2099
  * Memory caching backend for file locking
Please login to merge, or discard this patch.