diff options
author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2011-10-27 08:49:09 -0400 |
---|---|---|
committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2011-10-27 08:49:09 -0400 |
commit | fff865e8f428f93c7718b9932552ea0261a95500 (patch) | |
tree | f2a2d5db8b46b37c17292b5828f6ae4f81c66cec /src/lib/Server/Plugins/Cfg.py | |
parent | e2261d351c8f11a9cef4b47b6db9774761b4dd5b (diff) | |
download | bcfg2-fff865e8f428f93c7718b9932552ea0261a95500.tar.gz bcfg2-fff865e8f428f93c7718b9932552ea0261a95500.tar.bz2 bcfg2-fff865e8f428f93c7718b9932552ea0261a95500.zip |
Add a number of features to SSHbase:
* Support for group-specific host keys
* Support for fully static host- and group-specific ssh_known_hosts
* (Support for totally generic host keys and ssh_known_hosts, too, but that's pretty useless.)
* Support for info.xml, info, and :info files; only info.xml is likely to be useful, with the <Path> directive
Diffstat (limited to 'src/lib/Server/Plugins/Cfg.py')
-rw-r--r-- | src/lib/Server/Plugins/Cfg.py | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/lib/Server/Plugins/Cfg.py b/src/lib/Server/Plugins/Cfg.py index f202628cd..0a791f171 100644 --- a/src/lib/Server/Plugins/Cfg.py +++ b/src/lib/Server/Plugins/Cfg.py @@ -12,6 +12,7 @@ import stat import sys import tempfile from subprocess import Popen, PIPE +from Bcfg2.Bcfg2Py3k import u_str import Bcfg2.Server.Plugin @@ -33,14 +34,6 @@ except: logger = logging.getLogger('Bcfg2.Plugins.Cfg') -# py3k compatibility -def u_str(string, encoding): - if sys.hexversion >= 0x03000000: - return string.encode(encoding) - else: - return unicode(string, encoding) - - # snipped from TGenshi def removecomment(stream): """A genshi filter that removes comments from the stream.""" |