Skip to content

Commit d5639d8

Browse files
authored
Fix formatting in box.cfg reference (#4091)
1 parent 30125ad commit d5639d8

12 files changed

+104
-3
lines changed

doc/reference/configuration/cfg_authentication.rst

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
box.cfg{ auth_delay = 5 }
3636
3737
38+
|
3839
| Type: number
3940
| Default: 0
4041
| Environment variable: TT_AUTH_DELAY
@@ -53,6 +54,7 @@
5354
For example, if a client tries to authenticate fewer than ``auth_retries`` times within ``auth_delay`` seconds, no authentication delay is enforced.
5455
The retry counter is also reset after any successful authentication attempt.
5556

57+
|
5658
| Type: number
5759
| Default: 0
5860
| Environment variable: TT_AUTH_RETRIES
@@ -76,6 +78,7 @@
7678
:doc:`box.schema.user.passwd </reference/reference_lua/box_schema/user_passwd>`
7779
to use the new authentication protocol.
7880

81+
|
7982
| Type: string
8083
| Default value: 'chap-sha1'
8184
| Environment variable: TT_AUTH_TYPE
@@ -94,6 +97,7 @@
9497
:doc:`net.box </reference/reference_lua/net_box>` and
9598
:ref:`replication <replication-master_replica_bootstrap>` connections.
9699

100+
|
97101
| Type: boolean
98102
| Default: false
99103
| Environment variable: TT_DISABLE_GUEST
@@ -113,6 +117,7 @@
113117
114118
box.cfg{ password_min_length = 10 }
115119
120+
|
116121
| Type: integer
117122
| Default: 0
118123
| Environment variable: TT_PASSWORD_MIN_LENGTH
@@ -127,6 +132,7 @@
127132

128133
If **true**, a password should contain uppercase letters (A-Z).
129134

135+
|
130136
| Type: boolean
131137
| Default: false
132138
| Environment variable: TT_PASSWORD_ENFORCE_UPPERCASE
@@ -141,6 +147,7 @@
141147

142148
If **true**, a password should contain lowercase letters (a-z).
143149

150+
|
144151
| Type: boolean
145152
| Default: false
146153
| Environment variable: TT_PASSWORD_ENFORCE_LOWERCASE
@@ -155,6 +162,7 @@
155162

156163
If **true**, a password should contain digits (0-9).
157164

165+
|
158166
| Type: boolean
159167
| Default: false
160168
| Environment variable: TT_PASSWORD_ENFORCE_DIGITS
@@ -169,6 +177,7 @@
169177

170178
If **true**, a password should contain at least one special character (such as ``&|?!@$``).
171179

180+
|
172181
| Type: boolean
173182
| Default: false
174183
| Environment variable: TT_PASSWORD_ENFORCE_SPECIALCHARS
@@ -195,6 +204,7 @@
195204
196205
box.cfg{ password_lifetime_days = 365 }
197206
207+
|
198208
| Type: integer
199209
| Default: 0
200210
| Environment variable: TT_PASSWORD_LIFETIME_DAYS
@@ -215,6 +225,7 @@
215225
216226
box.cfg{ password_history_length = 3 }
217227
228+
|
218229
| Type: integer
219230
| Default: 0
220231
| Environment variable: TT_PASSWORD_HISTORY_LENGTH

doc/reference/configuration/cfg_basic.rst

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
and :ref:`pid_file <cfg_basic-pid_file>` parameters must be non-null for
2525
this to work.
2626

27+
|
2728
| Type: boolean
2829
| Default: false
2930
| Environment variable: TT_BACKGROUND
@@ -55,6 +56,7 @@
5556
$ ps -ef | grep tarantool
5657
1000 14939 14188 1 10:53 pts/2 00:00:16 tarantool <running>: sessions
5758
59+
|
5860
| Type: string
5961
| Default: null
6062
| Environment variable: TT_CUSTOM_PROC_TITLE
@@ -89,6 +91,7 @@
8991
Starting from version 2.10.0, you can specify :ref:`several URIs <index-uri-several>`,
9092
and the port number is always stored as an integer value.
9193

94+
|
9295
| Type: integer or string
9396
| Default: null
9497
| Environment variable: TT_LISTEN
@@ -107,6 +110,7 @@
107110
However, you can set different values for the ``memtx_dir`` and :ref:`wal_dir <cfg_basic-wal_dir>` options
108111
to store them on different physical disks for performance matters.
109112

113+
|
110114
| Type: string
111115
| Default: "."
112116
| Environment variable: TT_MEMTX_DIR
@@ -121,6 +125,7 @@
121125
Store the process id in this file. Can be relative to :ref:`work_dir
122126
<cfg_basic-work_dir>`. A typical value is “:file:`tarantool.pid`”.
123127

128+
|
124129
| Type: string
125130
| Default: null
126131
| Environment variable: TT_PID_FILE
@@ -141,6 +146,7 @@
141146
Although read-only mode prevents the server from writing to the :ref:`WAL <internals-wal>`,
142147
it does not prevent writing diagnostics with the :ref:`log module <log-module>`.
143148

149+
|
144150
| Type: boolean
145151
| Default: false
146152
| Environment variable: TT_READ_ONLY
@@ -174,6 +180,7 @@
174180
(The number of bytes that are actually used can be seen with
175181
:ref:`box.info.sql().cache.size <box_introspection-box_info>`.)
176182

183+
|
177184
| Type: number
178185
| Default: 5242880
179186
| Environment variable: TT_SQL_CACHE_SIZE
@@ -189,6 +196,7 @@
189196
relative to :ref:`work_dir <cfg_basic-work_dir>`. If not specified, defaults
190197
to ``work_dir``.
191198

199+
|
192200
| Type: string
193201
| Default: "."
194202
| Environment variable: TT_VINYL_DIR
@@ -209,6 +217,7 @@
209217
Compaction can also be ordered manually with
210218
:doc:`/reference/reference_lua/box_index/compact`.
211219

220+
|
212221
| Type: float
213222
| Default: 60
214223
| Environment variable: TT_VINYL_TIMEOUT
@@ -222,6 +231,7 @@
222231

223232
UNIX user name to switch to after start.
224233

234+
|
225235
| Type: string
226236
| Default: null
227237
| Environment variable: TT_USERNAME
@@ -240,6 +250,7 @@
240250
However, you can set different values for the ``wal_dir`` and :ref:`memtx_dir <cfg_basic-memtx_dir>` options
241251
to store them on different physical disks for performance matters.
242252

253+
|
243254
| Type: string
244255
| Default: "."
245256
| Environment variable: TT_WAL_DIR
@@ -268,6 +279,7 @@
268279
will put xlog files in ``/home/user/A/B``, snapshot files in ``/home/user/A/C``,
269280
and all other files or subdirectories in ``/home/user/A``.
270281

282+
|
271283
| Type: string
272284
| Default: null
273285
| Environment variable: TT_WORK_DIR
@@ -285,6 +297,7 @@
285297
:ref:`socket.getaddrinfo() <socket-getaddrinfo>` and
286298
:ref:`coio_call() <c_api-coio-coio_call>`).
287299

300+
|
288301
| Type: integer
289302
| Default: 4
290303
| Environment variable: TT_WORKER_POOL_THREADS
@@ -301,6 +314,7 @@
301314
Setting to ``true`` means "do not include".
302315
In an older version of Tarantool the default value of this parameter was ``false``.
303316

317+
|
304318
| Type: boolean
305319
| Default: true
306320
| Environment variable: TT_STRIP_CORE
@@ -312,8 +326,9 @@
312326

313327
Since version :doc:`2.6.1 </release/2.6.1>`.
314328

315-
Enables :ref:`transactional manager <txn_mode_transaction-manager>` if set to ``true``.
329+
Enable :ref:`transactional manager <txn_mode_transaction-manager>` if set to ``true``.
316330

331+
|
317332
| Type: boolean
318333
| Default: false
319334
| Environment variable: TT_MEMTX_USE_MVCC_ENGINE

doc/reference/configuration/cfg_binary_logging_snapshots.rst

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424

2525
Otherwise, Tarantool aborts recovery if there is an error while reading.
2626

27+
|
2728
| Type: boolean
2829
| Default: false
2930
| Environment variable: TT_FORCE_RECOVERY
@@ -39,6 +40,7 @@
3940
When a request would cause an ``.xlog`` file to become larger than
4041
``wal_max_size``, Tarantool creates a new WAL file.
4142

43+
|
4244
| Type: integer
4345
| Default: 268435456 (256 * 1024 * 1024) bytes
4446
| Environment variable: TT_WAL_MAX_SIZE
@@ -60,6 +62,7 @@
6062
:ref:`box.stat.vinyl().regulator <box_introspection-box_stat_vinyl_regulator>`
6163
may show for the write rate of dumps to ``.run`` and ``.index`` files.
6264

65+
|
6366
| Type: float
6467
| Default: null
6568
| Environment variable: TT_SNAP_IO_RATE_LIMIT
@@ -82,6 +85,7 @@
8285
* ``fsync``: fibers wait for their data, :manpage:`fsync(2)`
8386
follows each :manpage:`write(2)`.
8487

88+
|
8589
| Type: string
8690
| Default: "write"
8791
| Environment variable: TT_WAL_MODE
@@ -97,6 +101,7 @@
97101
file directory, when checking for changes to write-ahead-log
98102
files for the sake of :ref:`replication <replication>` or :ref:`hot standby <index-hot_standby>`.
99103

104+
|
100105
| Type: float
101106
| Default: 2
102107
| Environment variable: TT_WAL_DIR_RESCAN_DELAY
@@ -119,6 +124,7 @@
119124
You might consider increasing the ``wal_queue_max_size`` value in case of
120125
large tuples (approximately one megabyte or larger).
121126

127+
|
122128
| Type: number
123129
| Default: 16777216 bytes
124130
| Environment variable: TT_WAL_QUEUE_MAX_SIZE
@@ -144,6 +150,7 @@
144150
The ``wal_cleanup_delay`` option has no effect on nodes running as
145151
:ref:`anonymous replicas <cfg_replication-replication_anon>`.
146152

153+
|
147154
| Type: number
148155
| Default: 14400 seconds
149156
| Environment variable: TT_WAL_CLEANUP_DELAY
@@ -193,6 +200,7 @@
193200
* If a replica doesn't support the extended format configured on a master, auxiliary fields are skipped.
194201
* If a replica and master have different configurations for WAL records, the master's configuration is ignored.
195202

203+
|
196204
| Type: map
197205
| Default: nil
198206
| Environment variable: TT_WAL_EXT
@@ -208,6 +216,7 @@
208216
(**Enterprise Edition only**) If **true**, forces Tarantool to overwrite a data file a few times before deletion to render recovery of a deleted file impossible.
209217
The option applies to both ``.xlog`` and ``.snap`` files as well as Vinyl data files.
210218

219+
|
211220
| Type: boolean
212221
| Default: false
213222
| Environment variable: TT_SECURE_ERASING

doc/reference/configuration/cfg_deprecated.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ These parameters are deprecated since Tarantool version 1.7.4:
2323

2424
**Deprecated**, do not use.
2525

26+
|
2627
| Type: boolean
2728
| Default: false
2829
| Dynamic: no
@@ -53,6 +54,7 @@ These parameters are deprecated since Tarantool version 1.7.4:
5354
If there is an error while reading a snapshot file
5455
(at server instance start), abort.
5556

57+
|
5658
| Type: boolean
5759
| Default: true
5860
| Dynamic: no
@@ -64,6 +66,7 @@ These parameters are deprecated since Tarantool version 1.7.4:
6466
**Deprecated** in favor of
6567
:ref:`force_recovery <cfg_binary_logging_snapshots-force_recovery>`.
6668

69+
|
6770
| Type: boolean
6871
| Default: true
6972
| Dynamic: yes
@@ -91,6 +94,7 @@ These parameters are deprecated since Tarantool version 1.7.4:
9194
indexes and connection information. Depending on actual configuration and
9295
workload, Tarantool can consume up to 20% more than the limit set here.
9396

97+
|
9498
| Type: float
9599
| Default: 1.0
96100
| Dynamic: no
@@ -160,6 +164,7 @@ These parameters are deprecated since Tarantool version 1.7.4:
160164
Setting to ``false`` is equivalent to setting the ``off``
161165
:ref:`election_fencing_mode <cfg_replication-election_fencing_mode>`.
162166

167+
|
163168
| Type: boolean
164169
| Default: true
165170
| Environment variable: TT_ELECTION_FENCING_ENABLED

doc/reference/configuration/cfg_feedback.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ adjust or turn off this feature.
2222
If this is set to ``true``, feedback will be sent as described above.
2323
If this is set to ``false``, no feedback will be sent.
2424

25+
|
2526
| Type: boolean
2627
| Default: true
2728
| Environment variable: TT_FEEDBACK_ENABLED
@@ -36,6 +37,7 @@ adjust or turn off this feature.
3637
The address to which the packet is sent.
3738
Usually the recipient is Tarantool, but it can be any URL.
3839

40+
|
3941
| Type: string
4042
| Default: ``https://feedback.tarantool.io``
4143
| Environment variable: TT_FEEDBACK_HOST
@@ -49,6 +51,7 @@ adjust or turn off this feature.
4951

5052
The number of seconds between sendings, usually 3600 (1 hour).
5153

54+
|
5255
| Type: float
5356
| Default: 3600
5457
| Environment variable: TT_FEEDBACK_INTERVAL

0 commit comments

Comments
 (0)