/mandos/release

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/release

« back to all changes in this revision

Viewing changes to mandos.conf.xml

  • Committer: Teddy Hogeborn
  • Date: 2019-07-29 16:35:53 UTC
  • mto: This revision was merged to the branch mainline in revision 384.
  • Revision ID: teddy@recompile.se-20190729163553-1i442i2cbx64c537
Make tests and man page examples match

Make the tests test_manual_page_example[1-5] match exactly what is
written in the manual page, and add comments to manual page as
reminders to keep tests and manual page examples in sync.

* mandos-ctl (Test_commands_from_options.test_manual_page_example_1):
  Remove "--verbose" option, since the manual does not have it as the
  first example, and change assertion to match.
* mandos-ctl.xml (EXAMPLE): Add comments to all examples documenting
  which test function they correspond to.  Also remove unnecessary
  quotes from option arguments in fourth example, and clarify language
  slightly in fifth example.

Show diffs side-by-side

added added

removed removed

Lines of Context:
3
3
        "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
4
4
<!ENTITY CONFNAME "mandos.conf">
5
5
<!ENTITY CONFPATH "<filename>/etc/mandos/mandos.conf</filename>">
6
 
<!ENTITY TIMESTAMP "2016-02-28">
 
6
<!ENTITY TIMESTAMP "2019-06-20">
7
7
<!ENTITY % common SYSTEM "common.ent">
8
8
%common;
9
9
]>
41
41
      <year>2014</year>
42
42
      <year>2015</year>
43
43
      <year>2016</year>
 
44
      <year>2017</year>
 
45
      <year>2018</year>
 
46
      <year>2019</year>
44
47
      <holder>Teddy Hogeborn</holder>
45
48
      <holder>Björn Påhlsson</holder>
46
49
    </copyright>
204
207
      built-in module <systemitem class="library">ConfigParser</systemitem>
205
208
      requires it.
206
209
    </para>
 
210
    <xi:include href="bugs.xml"/>
207
211
  </refsect1>
208
212
  
209
213
  <refsect1 id="example">
223
227
      <programlisting>
224
228
[DEFAULT]
225
229
# A configuration example
226
 
interface = eth0
 
230
interface = enp1s0
227
231
address = fe80::aede:48ff:fe71:f6f2
228
232
port = 1025
229
233
debug = True
230
 
priority = SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA
 
234
priority = SECURE128:!CTYPE-X.509:+CTYPE-RAWPK:!RSA:!VERS-ALL:+VERS-TLS1.3:%PROFILE_ULTRA
231
235
servicename = Daena
232
236
use_dbus = False
233
237
use_ipv6 = True