summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2013-01-17 08:01:44 -0500
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2013-01-17 09:27:07 -0500
commit72a80f89361145f1560ccc248f357a9de82eded6 (patch)
treee6827a6ec1e219c3d1a7f40a185aba67e6af738b /doc
parentebe7542db7217c2fac3d7111e80f94caedfb69e2 (diff)
downloadbcfg2-72a80f89361145f1560ccc248f357a9de82eded6.tar.gz
bcfg2-72a80f89361145f1560ccc248f357a9de82eded6.tar.bz2
bcfg2-72a80f89361145f1560ccc248f357a9de82eded6.zip
abstracted encryption support from Properties/CfgPrivateKeyCreator to StructFile
Diffstat (limited to 'doc')
-rw-r--r--doc/server/encryption.txt9
-rw-r--r--doc/server/plugins/generators/cfg.txt3
2 files changed, 11 insertions, 1 deletions
diff --git a/doc/server/encryption.txt b/doc/server/encryption.txt
index e84b9fb31..1f6cb72e6 100644
--- a/doc/server/encryption.txt
+++ b/doc/server/encryption.txt
@@ -23,7 +23,7 @@ separations between teams, environments, etc.
single Bcfg2 repository with multiple admins who should not
necessarily have access to each other's sensitive data.
-Two types of data can be encrypted:
+Two basic types of data can be encrypted:
* :ref:`server-plugins-generators-cfg` files can be encrypted
as whole files. See :ref:`server-plugins-generators-cfg-encryption`
@@ -50,6 +50,13 @@ In general, Properties encryption is preferred for a few reasons:
amongst different teams, this lets teams collaborate more closely on
files and other data.
+Other types of data that can be encrypted are:
+
+* Text content of Path tags in
+ :ref:`server-plugins-structures-bundler-index`
+* Passphrases in XML description files for generated
+ :ref:`server-plugins-generators-cfg-sshkeys`
+
.. _bcfg2-crypt:
bcfg2-crypt
diff --git a/doc/server/plugins/generators/cfg.txt b/doc/server/plugins/generators/cfg.txt
index e843b1d2d..1cb4b8727 100644
--- a/doc/server/plugins/generators/cfg.txt
+++ b/doc/server/plugins/generators/cfg.txt
@@ -583,6 +583,9 @@ influenced by several options in the ``[sshkeys]`` section of
| | group from. | | |
+----------------+---------------------------------------------------------+-----------------------+------------+
+See :ref:`server-encryption` for more details on encryption in Bcfg2
+in general.
+
Deltas
======