diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-09-03 09:19:18 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-09-03 09:19:18 -0400 |
| commit | 01ccb6dd6f70b3860904e93f389c572a92c94ba1 (patch) | |
| tree | 05b2f95aa4830787738e9512e3ec5d5cf675abbe /src/lib/Bcfg2/Server/Encryption.py | |
| parent | eb9aae50988c321d6c0d18499a0fa3565feaea7e (diff) | |
| download | bcfg2-01ccb6dd6f70b3860904e93f389c572a92c94ba1.tar.gz bcfg2-01ccb6dd6f70b3860904e93f389c572a92c94ba1.tar.bz2 bcfg2-01ccb6dd6f70b3860904e93f389c572a92c94ba1.zip | |
bcfg2-crypt: Fixed name of config file option
Diffstat (limited to 'src/lib/Bcfg2/Server/Encryption.py')
| -rwxr-xr-x | src/lib/Bcfg2/Server/Encryption.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/Bcfg2/Server/Encryption.py b/src/lib/Bcfg2/Server/Encryption.py index dc707187c..dd3f46b07 100755 --- a/src/lib/Bcfg2/Server/Encryption.py +++ b/src/lib/Bcfg2/Server/Encryption.py @@ -215,7 +215,7 @@ class CryptoTool(object): """ get the passphrase for the current file """ if not Bcfg2.Options.setup.passphrases: raise PassphraseError("No passphrases available in %s" % - Bcfg2.Options.setup.configfile) + Bcfg2.Options.setup.config) pname = None if Bcfg2.Options.setup.passphrase: @@ -229,7 +229,7 @@ class CryptoTool(object): return (pname, passphrase) except KeyError: raise PassphraseError("Could not find passphrase %s in %s" % - (pname, Bcfg2.Options.setup.configfile)) + (pname, Bcfg2.Options.setup.config)) else: if len(Bcfg2.Options.setup.passphrases) == 1: pname, passphrase = Bcfg2.Options.setup.passphrases.items()[0] @@ -285,7 +285,7 @@ class CfgEncryptor(Encryptor): if self.passphrase is None: raise PassphraseError("Multiple passphrases found in %s, " "specify one on the command line with -p" % - Bcfg2.Options.setup.configfile) + Bcfg2.Options.setup.config) def encrypt(self): return ssl_encrypt(self.data, self.passphrase) @@ -373,13 +373,13 @@ class PropertiesCryptoMixin(object): if pname: self.logger.warning("Passphrase %s not found in %s, " "using passphrase given on command line" % - (pname, Bcfg2.Options.setup.configfile)) + (pname, Bcfg2.Options.setup.config)) passphrase = self.passphrase pname = self.pname else: raise PassphraseError("Multiple passphrases found in %s, " "specify one on the command line with -p" % - Bcfg2.Options.setup.configfile) + Bcfg2.Options.setup.config) return (pname, passphrase) def _write(self, filename, data): |