summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2012-09-28 10:58:45 -0700
committerJelmer Vernooij <jelmer@samba.org>2012-10-18 22:34:30 +0200
commit0f5e45b84c9b54909294fc0ea48f7b6fb3ca2878 (patch)
tree05eef10cb98e9c370150021f538596f8ebcd13df
parent4e1a06dc238c31a3b2343fcf4983c78fdc52f758 (diff)
downloadsamba-0f5e45b84c9b54909294fc0ea48f7b6fb3ca2878.tar.gz
samba-0f5e45b84c9b54909294fc0ea48f7b6fb3ca2878.tar.bz2
samba-0f5e45b84c9b54909294fc0ea48f7b6fb3ca2878.zip
smb.conf(5): Add basic documentation for 'tls keyfile'.
-rw-r--r--docs-xml/smbdotconf/security/tlscafile.xml2
-rw-r--r--docs-xml/smbdotconf/security/tlskeyfile.xml18
2 files changed, 18 insertions, 2 deletions
diff --git a/docs-xml/smbdotconf/security/tlscafile.xml b/docs-xml/smbdotconf/security/tlscafile.xml
index 6675ff37b7..ea2a595514 100644
--- a/docs-xml/smbdotconf/security/tlscafile.xml
+++ b/docs-xml/smbdotconf/security/tlscafile.xml
@@ -7,8 +7,6 @@
<para>This option can be set to a file (PEM format)
containing CA certificates of root CAs to trust to sign
certificates or intermediate CA certificates.</para>
-
- <para>At the moment, TLS is only used by the web server.</para>
</description>
<related>tls certfile</related>
diff --git a/docs-xml/smbdotconf/security/tlskeyfile.xml b/docs-xml/smbdotconf/security/tlskeyfile.xml
new file mode 100644
index 0000000000..a37a9381ee
--- /dev/null
+++ b/docs-xml/smbdotconf/security/tlskeyfile.xml
@@ -0,0 +1,18 @@
+<samba:parameter name="tls keyfile"
+ type="string"
+ context="G"
+ basic="1" advanced="1" developer="1"
+ xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+ <description>
+ <para>This option can be set to a file (PEM format)
+ containing the RSA private key. This file must be accessible without
+ a pass-phrase, i.e. it must not be encrypted.</para>
+ </description>
+
+ <related>tls certfile</related>
+ <related>tls crlfile</related>
+ <related>tls dh params file</related>
+ <related>tls enabled</related>
+ <related>tls cafile</related>
+ <value type="default"></value>
+</samba:parameter>