From 3f5b4233cbf72b25ea86c4c15528200136d14c7a Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Fri, 28 May 2010 11:19:45 -0400 Subject: Catch the condition where dogtag is already configured (no preop.pin) This causes the installation to blow up badly otherwise. To remove an existing instance run: # pkiremove -pki_instance_root=/var/lib -pki_instance_name=pki-ca --- ipaserver/install/cainstance.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'ipaserver') diff --git a/ipaserver/install/cainstance.py b/ipaserver/install/cainstance.py index 11e896ba1..90028b41d 100644 --- a/ipaserver/install/cainstance.py +++ b/ipaserver/install/cainstance.py @@ -113,6 +113,9 @@ def get_preop_pin(instance_root, instance_name): preop_pin=match.group(1) break + if preop_pin is None: + raise RuntimeError("Unable to find preop.pin in %s. Is your CA already configured?" % filename) + return preop_pin def import_pkcs12(input_file, input_passwd, cert_database, -- cgit