/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 clients.conf

Merge from Björn:

* plugin-runner.c (main): Bug fix: For the "--options-for" option, do
                          not mangle arguments with colon characters.
                          Also support adding empty arguments.

* plugins.d/mandos-client.c: (mc): New global variable; moved from
                                   "main".
  (init_gpgme, pgp_packet_decrypt, init_gnutls_global,
  init_gnutls_session, start_mandos_communication): Removed "mc"
                                                    argument.  All
                                                    callers changed.

  (resolve_callback, browse_callback): Ignore "userdata" argument.
                                       All callers changed.
  (handle_sigterm): New function.
  (main): Add "handle_sigterm" as signal handler for SIGTERM before
          starting the main loop.

Show diffs side-by-side

added added

removed removed

Lines of Context:
clients.conf
9
9
# How often to run the checker to confirm that a client is still up.
10
10
# Note: a new checker will not be started if an old one is still
11
11
# running.  The server will wait for a checker to complete until the
12
 
# "timeout" above occurs, at which time the client will be marked
 
12
# above "timeout" occurs, at which time the client will be marked
13
13
# invalid, and any running checker killed.
14
14
;interval = 5m
15
15
 
43
43
;        5MHdW9AYsNJZAQSOpirE4Xi31CSlWAi9KV+cUCmWF5zOFy1x23P6PjdaRm
44
44
;        4T2zw4dxS5NswXWU0sVEXxjs6PYxuIiCTL7vdpx8QjBkrPWDrAbcMyBr2O
45
45
;        QlnHIvPzEArRQLo=
46
 
;        =iHhv
47
46
;
48
47
;# Host name; used only by the checker, not used by the server itself.
49
48
;host = foo.example.org
56
55
;fingerprint = 3e393aeaefb84c7e89e2f547b3a107558fca3a27
57
56
;
58
57
;# If "secret" is not specified, a file can be read for the data.
59
 
;;secfile = /etc/mandos/bar-secret.txt.asc
 
58
;secfile = /etc/mandos/bar-secret.bin
60
59
;
61
60
;# An IP address for host is also fine, if the checker accepts it.
62
61
;host = 192.0.2.3