diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-08-13 09:31:49 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-08-13 09:31:49 -0400 |
| commit | da0918e71e82c407e1dc7f5cb80f33cad93263af (patch) | |
| tree | f91255bdd8019aee0ac60de69e42eee56335d180 /src/lib/Bcfg2/Server/Plugin | |
| parent | 5c5edfa9b3a2f3baad06802269e7acd1d3e77566 (diff) | |
| download | bcfg2-da0918e71e82c407e1dc7f5cb80f33cad93263af.tar.gz bcfg2-da0918e71e82c407e1dc7f5cb80f33cad93263af.tar.bz2 bcfg2-da0918e71e82c407e1dc7f5cb80f33cad93263af.zip | |
testsuite: fixed unit tests for new SSLCA stuff
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugin')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugin/helpers.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/lib/Bcfg2/Server/Plugin/helpers.py b/src/lib/Bcfg2/Server/Plugin/helpers.py index 2d157eba9..b18f1c52d 100644 --- a/src/lib/Bcfg2/Server/Plugin/helpers.py +++ b/src/lib/Bcfg2/Server/Plugin/helpers.py @@ -631,6 +631,9 @@ class StructFile(XMLFileBacked): #: the file being cached __identifier__ = None + #: Whether or not to enable encryption + encryption = True + #: Callbacks used to determine if children of items with the given #: tags should be included in the return value of #: :func:`Bcfg2.Server.Plugin.helpers.StructFile.Match` and @@ -674,7 +677,7 @@ class StructFile(XMLFileBacked): self.logger.error('Genshi parse error in %s: %s' % (self.name, err)) - if HAS_CRYPTO: + if HAS_CRYPTO and self.encryption: lax_decrypt = self.xdata.get( "lax_decryption", str(Bcfg2.Options.setup.lax_decryption)).lower() == "true" |