diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-01-10 07:43:31 -0500 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-01-10 07:43:37 -0500 |
| commit | 1e9b17c412a4471880aaf1824d1e6b3f1009dff6 (patch) | |
| tree | 8b6e31766dfd25ac2c67c09e0cf528bebc50bd23 /src | |
| parent | a00c37567760abdc845f8d3cff455b6c7e8464a5 (diff) | |
| download | bcfg2-1e9b17c412a4471880aaf1824d1e6b3f1009dff6.tar.gz bcfg2-1e9b17c412a4471880aaf1824d1e6b3f1009dff6.tar.bz2 bcfg2-1e9b17c412a4471880aaf1824d1e6b3f1009dff6.zip | |
SSLCA: set entry type on key and cert Path entries
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/SSLCA.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/SSLCA.py b/src/lib/Bcfg2/Server/Plugins/SSLCA.py index f83c04e87..0d51adf18 100644 --- a/src/lib/Bcfg2/Server/Plugins/SSLCA.py +++ b/src/lib/Bcfg2/Server/Plugins/SSLCA.py @@ -77,6 +77,7 @@ class SSLCADataFile(Bcfg2.Server.Plugin.SpecificData): def bind_entry(self, entry, _): """ Bind the data in the file to the given abstract entry """ entry.text = self.data + entry.set("type", "file") return entry @@ -318,6 +319,7 @@ class SSLCAEntrySet(Bcfg2.Server.Plugin.EntrySet): return self.best_matching(metadata).bind_entry(entry, metadata) except PluginExecutionError: entry.text = self.build_key(entry, metadata) + entry.set("type", "file") return entry elif self.cert: key = self.cert.get_spec(metadata)['key'] @@ -344,6 +346,7 @@ class SSLCAEntrySet(Bcfg2.Server.Plugin.EntrySet): # if we get here, it's because either a) there was no best # matching entry; or b) the existing cert did not verify entry.text = self.build_cert(entry, metadata, keyfile) + entry.set("type", "file") return entry finally: if cleanup_keyfile: |