majic-ansible-roles Changeset

Changeset - b7a248e3c287

Parent rev.

Child rev.

[Not reviewed]

0 2 0

Branko Majic (branko) - 9 years ago 2015-09-26 16:52:10
branko@majic.rs

MAR-35: Fixed documentation for tls_private_key_dir and tls_certificate_dir options. Fixed default definition for common packages that should be deployed on servers.

2 files changed with 3 insertions and 3 deletions:

docs/rolereference.rst

roles/common/defaults/main.yml

0 comments (0 inline, 0 general)

docs/rolereference.rst

➞

Show inline comments

@@ @@ -8,14 +8,14 @@ Common parameters @@
 A number of common parameters are used by all of the roles during
 deployment. This section lists such parameters.
-**tls_private_key_dir** (string, optional, ``tls/``)
+**tls_private_key_dir** (string, optional if paths to private keys for all roles are explicitly specified)
   Path to directory on Ansible host that contains the private keys used by
   services deployed by various roles. When TLS key path is not explicitly
   defined in a role, this is the directory where the TLS key will be looked-up
   during Ansible run. Expected filename pattern is ``FQDN_SERVICE.key`` (for
   example, ``mail.example.com_smtp.key`` or ``xmpp.example.com_xmpp.key``).
-**tls_certificate_dir** (string, mandatory if ``ldap_server_tls_certificate`` is not defined)
+**tls_certificate_dir** (string, optional if paths to certificate files for all roles are explicitly specified)
   Path to directory on Ansible host that contains the X.509 certificate files
   used by services deployed by various roles. When X.509 certificate path is not
   explicitly defined in a role, this is the directory where the X.509

roles/common/defaults/main.yml

➞

Show inline comments

 ---
-packages: []
+common_packages: []
 os_users: []
 os_groups: []
 ca_certificates: []

0 comments (0 inline, 0 general)