Completed
Pull Request — master (#4808)
by Joas
24:19
created
config/config.sample.php 1 patch
Indentation   +102 added lines, -102 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
 /**
@@ -67,10 +67,10 @@  discard block
 block discarded – undo
67 67
  *   ubos-raspberry-pi.local and ubos-raspberry-pi-2.local
68 68
  */
69 69
 'trusted_domains' =>
70
-  array (
70
+    array (
71 71
     'demo.example.org',
72 72
     'otherdomain.example.org',
73
-  ),
73
+    ),
74 74
 
75 75
 
76 76
 /**
@@ -242,10 +242,10 @@  discard block
 block discarded – undo
242 242
  * IMAP (OC_User_IMAP), SMB (OC_User_SMB), and FTP (OC_User_FTP).
243 243
  */
244 244
 'user_backends' => array(
245
-	array(
246
-		'class' => 'OC_User_IMAP',
247
-		'arguments' => array('{imap.gmail.com:993/imap/ssl}INBOX')
248
-	)
245
+    array(
246
+        'class' => 'OC_User_IMAP',
247
+        'arguments' => array('{imap.gmail.com:993/imap/ssl}INBOX')
248
+    )
249 249
 ),
250 250
 
251 251
 /**
@@ -699,9 +699,9 @@  discard block
 block discarded – undo
699 699
  * Defaults to an empty array.
700 700
  */
701 701
 'log.condition' => [
702
-	'shared_secret' => '57b58edb6637fe3059b3595cf9c41b9',
703
-	'users' => ['sample-user'],
704
-	'apps' => ['files'],
702
+    'shared_secret' => '57b58edb6637fe3059b3595cf9c41b9',
703
+    'users' => ['sample-user'],
704
+    'apps' => ['files'],
705 705
 ],
706 706
 
707 707
 /**
@@ -761,11 +761,11 @@  discard block
 block discarded – undo
761 761
  * * iOS client    : ``https://itunes.apple.com/us/app/nextcloud/id1125420102?mt=8``
762 762
  */
763 763
 'customclient_desktop' =>
764
-	'https://nextcloud.com/install/#install-clients',
764
+    'https://nextcloud.com/install/#install-clients',
765 765
 'customclient_android' =>
766
-	'https://play.google.com/store/apps/details?id=com.nextcloud.client',
766
+    'https://play.google.com/store/apps/details?id=com.nextcloud.client',
767 767
 'customclient_ios' =>
768
-	'https://itunes.apple.com/us/app/nextcloud/id1125420102?mt=8',
768
+    'https://itunes.apple.com/us/app/nextcloud/id1125420102?mt=8',
769 769
 
770 770
 /**
771 771
  * Apps
@@ -789,11 +789,11 @@  discard block
 block discarded – undo
789 789
  * indicates if a Web server can write files to that folder.
790 790
  */
791 791
 'apps_paths' => array(
792
-	array(
793
-		'path'=> '/var/www/nextcloud/apps',
794
-		'url' => '/apps',
795
-		'writable' => true,
796
-	),
792
+    array(
793
+        'path'=> '/var/www/nextcloud/apps',
794
+        'url' => '/apps',
795
+        'writable' => true,
796
+    ),
797 797
 ),
798 798
 
799 799
 /**
@@ -867,8 +867,8 @@  discard block
 block discarded – undo
867 867
  * Defaults to ``''`` (empty string)
868 868
  */
869 869
 'preview_office_cl_parameters' =>
870
-	' --headless --nologo --nofirststartwizard --invisible --norestore '.
871
-	'--convert-to pdf --outdir ',
870
+    ' --headless --nologo --nofirststartwizard --invisible --norestore '.
871
+    '--convert-to pdf --outdir ',
872 872
 
873 873
 /**
874 874
  * Only register providers that have been explicitly enabled
@@ -915,14 +915,14 @@  discard block
 block discarded – undo
915 915
  *  - OC\Preview\XBitmap
916 916
  */
917 917
 'enabledPreviewProviders' => array(
918
-	'OC\Preview\PNG',
919
-	'OC\Preview\JPEG',
920
-	'OC\Preview\GIF',
921
-	'OC\Preview\BMP',
922
-	'OC\Preview\XBitmap',
923
-	'OC\Preview\MP3',
924
-	'OC\Preview\TXT',
925
-	'OC\Preview\MarkDown'
918
+    'OC\Preview\PNG',
919
+    'OC\Preview\JPEG',
920
+    'OC\Preview\GIF',
921
+    'OC\Preview\BMP',
922
+    'OC\Preview\XBitmap',
923
+    'OC\Preview\MP3',
924
+    'OC\Preview\TXT',
925
+    'OC\Preview\MarkDown'
926 926
 ),
927 927
 
928 928
 /**
@@ -991,11 +991,11 @@  discard block
 block discarded – undo
991 991
 
992 992
 /**
993 993
  * Extra SSL options to be used for configuration.
994
-  *
994
+ *
995 995
  * Defaults to an empty array.
996 996
  */
997 997
 'openssl' => array(
998
-	'config' => '/absolute/location/of/openssl.cnf',
998
+    'config' => '/absolute/location/of/openssl.cnf',
999 999
 ),
1000 1000
 
1001 1001
 /**
@@ -1049,11 +1049,11 @@  discard block
 block discarded – undo
1049 1049
  * for more information.
1050 1050
  */
1051 1051
 'redis' => [
1052
-	'host' => 'localhost', // can also be a unix domain socket: '/tmp/redis.sock'
1053
-	'port' => 6379,
1054
-	'timeout' => 0.0,
1055
-	'password' => '', // Optional, if not defined no password will be used.
1056
-	'dbindex' => 0, // Optional, if undefined SELECT will not run and will use Redis Server's default DB Index.
1052
+    'host' => 'localhost', // can also be a unix domain socket: '/tmp/redis.sock'
1053
+    'port' => 6379,
1054
+    'timeout' => 0.0,
1055
+    'password' => '', // Optional, if not defined no password will be used.
1056
+    'dbindex' => 0, // Optional, if undefined SELECT will not run and will use Redis Server's default DB Index.
1057 1057
 ],
1058 1058
 
1059 1059
 /**
@@ -1071,13 +1071,13 @@  discard block
 block discarded – undo
1071 1071
  *  - \RedisCluster::FAILOVER_DISTRIBUTE - randomly distribute read commands across master and slaves
1072 1072
  */
1073 1073
 'redis.cluster' => [
1074
-	'seeds' => [ // provide some/all of the cluster servers to bootstrap discovery, port required
1075
-		'localhost:7000',
1076
-		'localhost:7001'
1077
-	],
1078
-	'timeout' => 0.0,
1079
-	'read_timeout' => 0.0,
1080
-	'failover_mode' => \RedisCluster::FAILOVER_DISTRIBUTE
1074
+    'seeds' => [ // provide some/all of the cluster servers to bootstrap discovery, port required
1075
+        'localhost:7000',
1076
+        'localhost:7001'
1077
+    ],
1078
+    'timeout' => 0.0,
1079
+    'read_timeout' => 0.0,
1080
+    'failover_mode' => \RedisCluster::FAILOVER_DISTRIBUTE
1081 1081
 ],
1082 1082
 
1083 1083
 
@@ -1085,35 +1085,35 @@  discard block
 block discarded – undo
1085 1085
  * Server details for one or more memcached servers to use for memory caching.
1086 1086
  */
1087 1087
 'memcached_servers' => array(
1088
-	// hostname, port and optional weight. Also see:
1089
-	// http://www.php.net/manual/en/memcached.addservers.php
1090
-	// http://www.php.net/manual/en/memcached.addserver.php
1091
-	array('localhost', 11211),
1092
-	//array('other.host.local', 11211),
1088
+    // hostname, port and optional weight. Also see:
1089
+    // http://www.php.net/manual/en/memcached.addservers.php
1090
+    // http://www.php.net/manual/en/memcached.addserver.php
1091
+    array('localhost', 11211),
1092
+    //array('other.host.local', 11211),
1093 1093
 ),
1094 1094
 
1095 1095
 /**
1096 1096
  * Connection options for memcached, see http://apprize.info/php/scaling/15.html
1097 1097
  */
1098 1098
 'memcached_options' => array(
1099
-	// Set timeouts to 50ms
1100
-	\Memcached::OPT_CONNECT_TIMEOUT => 50,
1101
-	\Memcached::OPT_RETRY_TIMEOUT =>   50,
1102
-	\Memcached::OPT_SEND_TIMEOUT =>    50,
1103
-	\Memcached::OPT_RECV_TIMEOUT =>    50,
1104
-	\Memcached::OPT_POLL_TIMEOUT =>    50,
1099
+    // Set timeouts to 50ms
1100
+    \Memcached::OPT_CONNECT_TIMEOUT => 50,
1101
+    \Memcached::OPT_RETRY_TIMEOUT =>   50,
1102
+    \Memcached::OPT_SEND_TIMEOUT =>    50,
1103
+    \Memcached::OPT_RECV_TIMEOUT =>    50,
1104
+    \Memcached::OPT_POLL_TIMEOUT =>    50,
1105 1105
 
1106
-	// Enable compression
1107
-	\Memcached::OPT_COMPRESSION =>          true,
1106
+    // Enable compression
1107
+    \Memcached::OPT_COMPRESSION =>          true,
1108 1108
 
1109
-	// Turn on consistent hashing
1110
-	\Memcached::OPT_LIBKETAMA_COMPATIBLE => true,
1109
+    // Turn on consistent hashing
1110
+    \Memcached::OPT_LIBKETAMA_COMPATIBLE => true,
1111 1111
 
1112
-	// Enable Binary Protocol
1113
-	\Memcached::OPT_BINARY_PROTOCOL =>      true,
1112
+    // Enable Binary Protocol
1113
+    \Memcached::OPT_BINARY_PROTOCOL =>      true,
1114 1114
 
1115
-	// Binary serializer vill be enabled if the igbinary PECL module is available
1116
-	//\Memcached::OPT_SERIALIZER => \Memcached::SERIALIZER_IGBINARY,
1115
+    // Binary serializer vill be enabled if the igbinary PECL module is available
1116
+    //\Memcached::OPT_SERIALIZER => \Memcached::SERIALIZER_IGBINARY,
1117 1117
 ),
1118 1118
 
1119 1119
 
@@ -1159,31 +1159,31 @@  discard block
 block discarded – undo
1159 1159
  * One way to test is applying for a trystack account at http://trystack.org/
1160 1160
  */
1161 1161
 'objectstore' => [
1162
-	'class' => 'OC\\Files\\ObjectStore\\Swift',
1163
-	'arguments' => [
1164
-		// trystack will use your facebook id as the user name
1165
-		'username' => 'facebook100000123456789',
1166
-		// in the trystack dashboard go to user -> settings -> API Password to
1167
-		// generate a password
1168
-		'password' => 'Secr3tPaSSWoRdt7',
1169
-		// must already exist in the objectstore, name can be different
1170
-		'container' => 'nextcloud',
1171
-		// prefix to prepend to the fileid, default is 'oid:urn:'
1172
-		'objectPrefix' => 'oid:urn:',
1173
-		// create the container if it does not exist. default is false
1174
-		'autocreate' => true,
1175
-		// required, dev-/trystack defaults to 'RegionOne'
1176
-		'region' => 'RegionOne',
1177
-		// The Identity / Keystone endpoint
1178
-		'url' => 'http://8.21.28.222:5000/v2.0',
1179
-		// required on dev-/trystack
1180
-		'tenantName' => 'facebook100000123456789',
1181
-		// dev-/trystack uses swift by default, the lib defaults to 'cloudFiles'
1182
-		// if omitted
1183
-		'serviceName' => 'swift',
1184
-		// The Interface / url Type, optional
1185
-		'urlType' => 'internal'
1186
-	],
1162
+    'class' => 'OC\\Files\\ObjectStore\\Swift',
1163
+    'arguments' => [
1164
+        // trystack will use your facebook id as the user name
1165
+        'username' => 'facebook100000123456789',
1166
+        // in the trystack dashboard go to user -> settings -> API Password to
1167
+        // generate a password
1168
+        'password' => 'Secr3tPaSSWoRdt7',
1169
+        // must already exist in the objectstore, name can be different
1170
+        'container' => 'nextcloud',
1171
+        // prefix to prepend to the fileid, default is 'oid:urn:'
1172
+        'objectPrefix' => 'oid:urn:',
1173
+        // create the container if it does not exist. default is false
1174
+        'autocreate' => true,
1175
+        // required, dev-/trystack defaults to 'RegionOne'
1176
+        'region' => 'RegionOne',
1177
+        // The Identity / Keystone endpoint
1178
+        'url' => 'http://8.21.28.222:5000/v2.0',
1179
+        // required on dev-/trystack
1180
+        'tenantName' => 'facebook100000123456789',
1181
+        // dev-/trystack uses swift by default, the lib defaults to 'cloudFiles'
1182
+        // if omitted
1183
+        'serviceName' => 'swift',
1184
+        // The Interface / url Type, optional
1185
+        'urlType' => 'internal'
1186
+    ],
1187 1187
 ],
1188 1188
 
1189 1189
 
@@ -1224,8 +1224,8 @@  discard block
 block discarded – undo
1224 1224
  * encryption in MySQL or specify a custom wait timeout on a cheap hoster.
1225 1225
  */
1226 1226
 'dbdriveroptions' => array(
1227
-	PDO::MYSQL_ATTR_SSL_CA => '/file/path/to/ca_cert.pem',
1228
-	PDO::MYSQL_ATTR_INIT_COMMAND => 'SET wait_timeout = 28800'
1227
+    PDO::MYSQL_ATTR_SSL_CA => '/file/path/to/ca_cert.pem',
1228
+    PDO::MYSQL_ATTR_INIT_COMMAND => 'SET wait_timeout = 28800'
1229 1229
 ),
1230 1230
 
1231 1231
 /**
@@ -1282,10 +1282,10 @@  discard block
 block discarded – undo
1282 1282
  *  - pgsql (PostgreSQL)
1283 1283
  */
1284 1284
 'supportedDatabases' => array(
1285
-	'sqlite',
1286
-	'mysql',
1287
-	'pgsql',
1288
-	'oci',
1285
+    'sqlite',
1286
+    'mysql',
1287
+    'pgsql',
1288
+    'oci',
1289 1289
 ),
1290 1290
 
1291 1291
 /**
Please login to merge, or discard this patch.