Support client default config files on non Windows.

This commit is contained in:
Roger A. Light
2014-05-25 00:26:52 +01:00
parent ae6baad2fa
commit fe91e71399
4 changed files with 456 additions and 303 deletions
+3
View File
@@ -1,5 +1,8 @@
- Default TLS mode now accepts TLS v1.2, v1.1 and v1.0.
Clients:
- Both clients can now load default configuration options from a file.
1.3.2 - 2014xxxx
================
+406 -303
View File
File diff suppressed because it is too large Load Diff
+23
View File
@@ -80,6 +80,16 @@
<refsect1>
<title>Options</title>
<para>The options below may be given on the command line, but may also
be placed in a config file located at
<option>$XDG_CONFIG_HOME/mosquitto_pub</option> or
<option>$HOME/.config/mosquitto_sub</option> with one pair of
<option>-option <replaceable>value</replaceable></option>
per line. The values in the config file will be used as defaults
and can be overridden by using the command line. The exceptions to
this are the message type options, of which only one can be
specified. Note also that currently some options cannot be negated,
e.g. <option>-S</option>.</para>
<variablelist>
<varlistentry>
<term><option>-A</option></term>
@@ -403,6 +413,19 @@
</itemizedlist>
</refsect1>
<refsect1>
<title>Files</title>
<variablelist>
<varlistentry>
<term><filename>$XDG_CONFIG_HOME/mosquitto_pub</filename></term>
<term><filename>$HOME/.config/mosquitto_pub</filename></term>
<listitem>
<para>Configuration file for default options.</para>
</listitem>
</varlistentry>
</variablelist>
</refsect1>
<refsect1>
<title>Bugs</title>
<para><command>mosquitto_pub</command> bug information can be found at <uri type="webpage">http://launchpad.net/mosquitto</uri></para>
+24
View File
@@ -78,6 +78,17 @@
<refsect1>
<title>Options</title>
<para>The options below may be given on the command line, but may also
be placed in a config file located at
<option>$XDG_CONFIG_HOME/mosquitto_sub</option> or
<option>$HOME/.config/mosquitto_sub</option> with one pair of
<option>-option <replaceable>value</replaceable></option>
per line. The values in the config file will be used as defaults
and can be overridden by using the command line. The exceptions to
this are <option>-t</option> and <option>-T</option>, which if
given in the config file will not be overridden. Note also that
currently some options cannot be negated, e.g.
<option>-S</option>.</para>
<variablelist>
<varlistentry>
<term><option>-A</option></term>
@@ -432,6 +443,19 @@
</itemizedlist>
</refsect1>
<refsect1>
<title>Files</title>
<variablelist>
<varlistentry>
<term><filename>$XDG_CONFIG_HOME/mosquitto_sub</filename></term>
<term><filename>$HOME/.config/mosquitto_sub</filename></term>
<listitem>
<para>Configuration file for default options.</para>
</listitem>
</varlistentry>
</variablelist>
</refsect1>
<refsect1>
<title>Bugs</title>
<para><command>mosquitto_sub</command> bug information can be found at