Completed
Push — master ( d83f1d...f0790b )
by Morris
18:35 queued 18:15
created
config/config.sample.php 2 patches
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
 /**
@@ -1044,11 +1044,11 @@  discard block
 block discarded – undo
1044 1044
  * for more information.
1045 1045
  */
1046 1046
 'redis' => [
1047
-	'host' => 'localhost', // can also be a unix domain socket: '/tmp/redis.sock'
1048
-	'port' => 6379,
1049
-	'timeout' => 0.0,
1050
-	'password' => '', // Optional, if not defined no password will be used.
1051
-	'dbindex' => 0, // Optional, if undefined SELECT will not run and will use Redis Server's default DB Index.
1047
+    'host' => 'localhost', // can also be a unix domain socket: '/tmp/redis.sock'
1048
+    'port' => 6379,
1049
+    'timeout' => 0.0,
1050
+    'password' => '', // Optional, if not defined no password will be used.
1051
+    'dbindex' => 0, // Optional, if undefined SELECT will not run and will use Redis Server's default DB Index.
1052 1052
 ],
1053 1053
 
1054 1054
 /**
@@ -1074,13 +1074,13 @@  discard block
 block discarded – undo
1074 1074
  * See https://redis.io/topics/cluster-spec for details about the Redis cluster
1075 1075
  */
1076 1076
 'redis.cluster' => [
1077
-	'seeds' => [ // provide some/all of the cluster servers to bootstrap discovery, port required
1078
-		'localhost:7000',
1079
-		'localhost:7001'
1080
-	],
1081
-	'timeout' => 0.0,
1082
-	'read_timeout' => 0.0,
1083
-	'failover_mode' => \RedisCluster::FAILOVER_ERROR
1077
+    'seeds' => [ // provide some/all of the cluster servers to bootstrap discovery, port required
1078
+        'localhost:7000',
1079
+        'localhost:7001'
1080
+    ],
1081
+    'timeout' => 0.0,
1082
+    'read_timeout' => 0.0,
1083
+    'failover_mode' => \RedisCluster::FAILOVER_ERROR
1084 1084
 ],
1085 1085
 
1086 1086
 
@@ -1088,35 +1088,35 @@  discard block
 block discarded – undo
1088 1088
  * Server details for one or more memcached servers to use for memory caching.
1089 1089
  */
1090 1090
 'memcached_servers' => array(
1091
-	// hostname, port and optional weight. Also see:
1092
-	// http://www.php.net/manual/en/memcached.addservers.php
1093
-	// http://www.php.net/manual/en/memcached.addserver.php
1094
-	array('localhost', 11211),
1095
-	//array('other.host.local', 11211),
1091
+    // hostname, port and optional weight. Also see:
1092
+    // http://www.php.net/manual/en/memcached.addservers.php
1093
+    // http://www.php.net/manual/en/memcached.addserver.php
1094
+    array('localhost', 11211),
1095
+    //array('other.host.local', 11211),
1096 1096
 ),
1097 1097
 
1098 1098
 /**
1099 1099
  * Connection options for memcached, see http://apprize.info/php/scaling/15.html
1100 1100
  */
1101 1101
 'memcached_options' => array(
1102
-	// Set timeouts to 50ms
1103
-	\Memcached::OPT_CONNECT_TIMEOUT => 50,
1104
-	\Memcached::OPT_RETRY_TIMEOUT =>   50,
1105
-	\Memcached::OPT_SEND_TIMEOUT =>    50,
1106
-	\Memcached::OPT_RECV_TIMEOUT =>    50,
1107
-	\Memcached::OPT_POLL_TIMEOUT =>    50,
1102
+    // Set timeouts to 50ms
1103
+    \Memcached::OPT_CONNECT_TIMEOUT => 50,
1104
+    \Memcached::OPT_RETRY_TIMEOUT =>   50,
1105
+    \Memcached::OPT_SEND_TIMEOUT =>    50,
1106
+    \Memcached::OPT_RECV_TIMEOUT =>    50,
1107
+    \Memcached::OPT_POLL_TIMEOUT =>    50,
1108 1108
 
1109
-	// Enable compression
1110
-	\Memcached::OPT_COMPRESSION =>          true,
1109
+    // Enable compression
1110
+    \Memcached::OPT_COMPRESSION =>          true,
1111 1111
 
1112
-	// Turn on consistent hashing
1113
-	\Memcached::OPT_LIBKETAMA_COMPATIBLE => true,
1112
+    // Turn on consistent hashing
1113
+    \Memcached::OPT_LIBKETAMA_COMPATIBLE => true,
1114 1114
 
1115
-	// Enable Binary Protocol
1116
-	\Memcached::OPT_BINARY_PROTOCOL =>      true,
1115
+    // Enable Binary Protocol
1116
+    \Memcached::OPT_BINARY_PROTOCOL =>      true,
1117 1117
 
1118
-	// Binary serializer vill be enabled if the igbinary PECL module is available
1119
-	//\Memcached::OPT_SERIALIZER => \Memcached::SERIALIZER_IGBINARY,
1118
+    // Binary serializer vill be enabled if the igbinary PECL module is available
1119
+    //\Memcached::OPT_SERIALIZER => \Memcached::SERIALIZER_IGBINARY,
1120 1120
 ),
1121 1121
 
1122 1122
 
@@ -1162,31 +1162,31 @@  discard block
 block discarded – undo
1162 1162
  * One way to test is applying for a trystack account at http://trystack.org/
1163 1163
  */
1164 1164
 'objectstore' => [
1165
-	'class' => 'OC\\Files\\ObjectStore\\Swift',
1166
-	'arguments' => [
1167
-		// trystack will use your facebook id as the user name
1168
-		'username' => 'facebook100000123456789',
1169
-		// in the trystack dashboard go to user -> settings -> API Password to
1170
-		// generate a password
1171
-		'password' => 'Secr3tPaSSWoRdt7',
1172
-		// must already exist in the objectstore, name can be different
1173
-		'container' => 'nextcloud',
1174
-		// prefix to prepend to the fileid, default is 'oid:urn:'
1175
-		'objectPrefix' => 'oid:urn:',
1176
-		// create the container if it does not exist. default is false
1177
-		'autocreate' => true,
1178
-		// required, dev-/trystack defaults to 'RegionOne'
1179
-		'region' => 'RegionOne',
1180
-		// The Identity / Keystone endpoint
1181
-		'url' => 'http://8.21.28.222:5000/v2.0',
1182
-		// required on dev-/trystack
1183
-		'tenantName' => 'facebook100000123456789',
1184
-		// dev-/trystack uses swift by default, the lib defaults to 'cloudFiles'
1185
-		// if omitted
1186
-		'serviceName' => 'swift',
1187
-		// The Interface / url Type, optional
1188
-		'urlType' => 'internal'
1189
-	],
1165
+    'class' => 'OC\\Files\\ObjectStore\\Swift',
1166
+    'arguments' => [
1167
+        // trystack will use your facebook id as the user name
1168
+        'username' => 'facebook100000123456789',
1169
+        // in the trystack dashboard go to user -> settings -> API Password to
1170
+        // generate a password
1171
+        'password' => 'Secr3tPaSSWoRdt7',
1172
+        // must already exist in the objectstore, name can be different
1173
+        'container' => 'nextcloud',
1174
+        // prefix to prepend to the fileid, default is 'oid:urn:'
1175
+        'objectPrefix' => 'oid:urn:',
1176
+        // create the container if it does not exist. default is false
1177
+        'autocreate' => true,
1178
+        // required, dev-/trystack defaults to 'RegionOne'
1179
+        'region' => 'RegionOne',
1180
+        // The Identity / Keystone endpoint
1181
+        'url' => 'http://8.21.28.222:5000/v2.0',
1182
+        // required on dev-/trystack
1183
+        'tenantName' => 'facebook100000123456789',
1184
+        // dev-/trystack uses swift by default, the lib defaults to 'cloudFiles'
1185
+        // if omitted
1186
+        'serviceName' => 'swift',
1187
+        // The Interface / url Type, optional
1188
+        'urlType' => 'internal'
1189
+    ],
1190 1190
 ],
1191 1191
 
1192 1192
 
@@ -1227,8 +1227,8 @@  discard block
 block discarded – undo
1227 1227
  * encryption in MySQL or specify a custom wait timeout on a cheap hoster.
1228 1228
  */
1229 1229
 'dbdriveroptions' => array(
1230
-	PDO::MYSQL_ATTR_SSL_CA => '/file/path/to/ca_cert.pem',
1231
-	PDO::MYSQL_ATTR_INIT_COMMAND => 'SET wait_timeout = 28800'
1230
+    PDO::MYSQL_ATTR_SSL_CA => '/file/path/to/ca_cert.pem',
1231
+    PDO::MYSQL_ATTR_INIT_COMMAND => 'SET wait_timeout = 28800'
1232 1232
 ),
1233 1233
 
1234 1234
 /**
@@ -1285,10 +1285,10 @@  discard block
 block discarded – undo
1285 1285
  *  - pgsql (PostgreSQL)
1286 1286
  */
1287 1287
 'supportedDatabases' => array(
1288
-	'sqlite',
1289
-	'mysql',
1290
-	'pgsql',
1291
-	'oci',
1288
+    'sqlite',
1289
+    'mysql',
1290
+    'pgsql',
1291
+    'oci',
1292 1292
 ),
1293 1293
 
1294 1294
 /**
Please login to merge, or discard this patch.
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -67,7 +67,7 @@  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
   ),
@@ -192,7 +192,7 @@  discard block
 block discarded – undo
192 192
  *
193 193
  * Defaults to ``60*60*24*15`` seconds (15 days)
194 194
  */
195
-'remember_login_cookie_lifetime' => 60*60*24*15,
195
+'remember_login_cookie_lifetime' => 60 * 60 * 24 * 15,
196 196
 
197 197
 /**
198 198
  * The lifetime of a session after inactivity.
@@ -1074,7 +1074,7 @@  discard block
 block discarded – undo
1074 1074
  * See https://redis.io/topics/cluster-spec for details about the Redis cluster
1075 1075
  */
1076 1076
 'redis.cluster' => [
1077
-	'seeds' => [ // provide some/all of the cluster servers to bootstrap discovery, port required
1077
+	'seeds' => [// provide some/all of the cluster servers to bootstrap discovery, port required
1078 1078
 		'localhost:7000',
1079 1079
 		'localhost:7001'
1080 1080
 	],
@@ -1138,7 +1138,7 @@  discard block
 block discarded – undo
1138 1138
  *
1139 1139
  * Defaults to ``60*60*24`` (1 day)
1140 1140
  */
1141
-'cache_chunk_gc_ttl' => 60*60*24,
1141
+'cache_chunk_gc_ttl' => 60 * 60 * 24,
1142 1142
 
1143 1143
 /**
1144 1144
  * Using Object Store with Nextcloud
@@ -1462,7 +1462,7 @@  discard block
 block discarded – undo
1462 1462
  * Defaults to ``60*60`` seconds (1 hour) or the php
1463 1463
  *             max_execution_time, whichever is higher.
1464 1464
  */
1465
-'filelocking.ttl' => 60*60,
1465
+'filelocking.ttl' => 60 * 60,
1466 1466
 
1467 1467
 /**
1468 1468
  * Memory caching backend for file locking
Please login to merge, or discard this patch.