diff options
| author | Matthew Harmsen <mharmsen@redhat.com> | 2015-06-15 19:01:49 -0600 |
|---|---|---|
| committer | Matthew Harmsen <mharmsen@redhat.com> | 2015-06-16 15:20:26 -0600 |
| commit | f5001994ab3947581426c94051bd4c0a88fb6697 (patch) | |
| tree | 7e032eda7e4e326ebcb5d9f32e31c8c5cc8cac81 /base/server/sbin/pkispawn | |
| parent | bd780990a15d10c3df9a8da81486878012e00884 (diff) | |
| download | pki-f5001994ab3947581426c94051bd4c0a88fb6697.tar.gz pki-f5001994ab3947581426c94051bd4c0a88fb6697.tar.xz pki-f5001994ab3947581426c94051bd4c0a88fb6697.zip | |
Suppress interactive HSM installation
- PKI TRAC Ticket #1417 - Interactive pkispawn of CA with HSM fails
Diffstat (limited to 'base/server/sbin/pkispawn')
| -rwxr-xr-x | base/server/sbin/pkispawn | 35 |
1 files changed, 20 insertions, 15 deletions
diff --git a/base/server/sbin/pkispawn b/base/server/sbin/pkispawn index d153c031d..99b0a93bb 100755 --- a/base/server/sbin/pkispawn +++ b/base/server/sbin/pkispawn @@ -226,21 +226,26 @@ def main(argv): sign='?', case_sensitive=False).lower() if use_hsm == 'y' or use_hsm == 'yes': - parser.set_property(config.pki_subsystem, - 'pki_hsm_enable', - 'True') - modulename = parser.read_text( - 'HSM Module Name (e. g. - nethsm)', allow_empty=False) - parser.set_property(config.pki_subsystem, - 'pki_hsm_modulename', - modulename) - libfile = parser.read_text( - 'HSM Lib File ' + - '(e. g. - /opt/nfast/toolkits/pkcs11/libcknfast.so)', - allow_empty=False) - parser.set_property(config.pki_subsystem, - 'pki_hsm_libfile', - libfile) + # XXX: Suppress interactive HSM installation + print "Interactive HSM installation is currently unsupported." + sys.exit(0) + + # TBD: Interactive HSM installation + # parser.set_property(config.pki_subsystem, + # 'pki_hsm_enable', + # 'True') + # modulename = parser.read_text( + # 'HSM Module Name (e. g. - nethsm)', allow_empty=False) + # parser.set_property(config.pki_subsystem, + # 'pki_hsm_modulename', + # modulename) + # libfile = parser.read_text( + # 'HSM Lib File ' + + # '(e. g. - /opt/nfast/toolkits/pkcs11/libcknfast.so)', + # allow_empty=False) + # parser.set_property(config.pki_subsystem, + # 'pki_hsm_libfile', + # libfile) print print "Directory Server:" |