diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-02-07 08:26:39 -0500 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-02-07 08:26:39 -0500 |
| commit | 7db65d41386768a5081c34c16db17e82b96a5b7a (patch) | |
| tree | 07ff91016b461afb44ced8247bafcba2d1f21ae2 /src/lib/Bcfg2/Server/Plugins/FileProbes.py | |
| parent | 65caf3f586d7985d88652c73e7b214ba3e40eac2 (diff) | |
| download | bcfg2-7db65d41386768a5081c34c16db17e82b96a5b7a.tar.gz bcfg2-7db65d41386768a5081c34c16db17e82b96a5b7a.tar.bz2 bcfg2-7db65d41386768a5081c34c16db17e82b96a5b7a.zip | |
made XInlcude and Encryption support more consistent
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/FileProbes.py')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/FileProbes.py | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/FileProbes.py b/src/lib/Bcfg2/Server/Plugins/FileProbes.py index 461b718e2..33914bd45 100644 --- a/src/lib/Bcfg2/Server/Plugins/FileProbes.py +++ b/src/lib/Bcfg2/Server/Plugins/FileProbes.py @@ -52,11 +52,6 @@ print(Bcfg2.Client.XML.tostring(data, xml_declaration=False).decode('UTF-8')) """ -class FileProbesConfig(Bcfg2.Server.Plugin.StructFile): - """ Config file for FileProbes """ - encryption = False - - class FileProbes(Bcfg2.Server.Plugin.Plugin, Bcfg2.Server.Plugin.Probing): """ This module allows you to probe a client for a file, which is then @@ -69,8 +64,10 @@ class FileProbes(Bcfg2.Server.Plugin.Plugin, def __init__(self, core, datastore): Bcfg2.Server.Plugin.Plugin.__init__(self, core, datastore) Bcfg2.Server.Plugin.Probing.__init__(self) - self.config = FileProbesConfig(os.path.join(self.data, 'config.xml'), - should_monitor=True) + self.config = \ + Bcfg2.Server.Plugin.StructFile(os.path.join(self.data, + 'config.xml'), + should_monitor=True) self.entries = dict() self.probes = dict() |