summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNarayan Desai <desai@mcs.anl.gov>2009-05-14 03:06:39 +0000
committerNarayan Desai <desai@mcs.anl.gov>2009-05-14 03:06:39 +0000
commit8cd988d6347e79d5ff8b36f3dd625d1b45e5ef40 (patch)
treecd11197c7696852f7f4e4ba308df0c361aa7092d /src
parent65f9f83a1fe481c60d24ef187c424e991208008a (diff)
downloadbcfg2-8cd988d6347e79d5ff8b36f3dd625d1b45e5ef40.tar.gz
bcfg2-8cd988d6347e79d5ff8b36f3dd625d1b45e5ef40.tar.bz2
bcfg2-8cd988d6347e79d5ff8b36f3dd625d1b45e5ef40.zip
Remove deprecated fingerprint admin mode
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5226 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src')
-rw-r--r--src/lib/Server/Admin/Fingerprint.py27
-rw-r--r--src/lib/Server/Admin/__init__.py2
2 files changed, 1 insertions, 28 deletions
diff --git a/src/lib/Server/Admin/Fingerprint.py b/src/lib/Server/Admin/Fingerprint.py
deleted file mode 100644
index 07c67bc72..000000000
--- a/src/lib/Server/Admin/Fingerprint.py
+++ /dev/null
@@ -1,27 +0,0 @@
-'''Fingerprint mode for bcfg2-admin'''
-
-import Bcfg2.tlslite.api
-import Bcfg2.Server.Admin
-
-class Fingerprint(Bcfg2.Server.Admin.Mode):
- '''Produce server key fingerprint'''
- __shorthelp__ = "Print the server certificate fingerprint"
- __longhelp__ = __shorthelp__ + "\n\nbcfg2-admin fingerprint"
- __usage__ = "bcfg2-admin fingerprint"
-
- def __init__(self, cfile):
- Bcfg2.Server.Admin.Mode.__init__(self, cfile)
-
- def __call__(self, args):
- Bcfg2.Server.Admin.Mode.__call__(self, args)
- print self.getFingerprint()
-
- def getFingerprint(self):
- '''calculate key fingerprint'''
- try:
- keypath = self.cfp.get('communication', 'certificate')
- except:
- keypath = self.cfp.get('communication', 'key')
- x509 = Bcfg2.tlslite.api.X509()
- x509.parse(open(keypath).read())
- return x509.getFingerprint()
diff --git a/src/lib/Server/Admin/__init__.py b/src/lib/Server/Admin/__init__.py
index 28db72aac..392d46d7c 100644
--- a/src/lib/Server/Admin/__init__.py
+++ b/src/lib/Server/Admin/__init__.py
@@ -1,6 +1,6 @@
__revision__ = '$Revision$'
-__all__ = ['Mode', 'Client', 'Compare', 'Fingerprint', 'Init', 'Minestruct',
+__all__ = ['Mode', 'Client', 'Compare', 'Init', 'Minestruct',
'Pull', 'Query', 'Snapshots', 'Tidy', 'Viz']
import ConfigParser