Imported Debian patch 4.0.5-6~numeezy

install/restart_scripts/stop_pkicad

@@ -22,23 +22,22 @@
 import sys
 import syslog
 import traceback
+from ipapython import dogtag
 from ipalib import api
 from ipaplatform import services
-from ipaserver.install import certs
-
 
 def main():
     api.bootstrap(context='restart')
     api.finalize()
 
-    dogtag_service = services.knownservices['pki_tomcatd']
-
-    certs.renewal_lock.acquire('renew_ca_cert')
+    configured_constants = dogtag.configured_constants(api)
+    dogtag_service = services.knownservices[configured_constants.SERVICE_NAME]
+    dogtag_instance = configured_constants.PKI_INSTANCE_NAME
 
     syslog.syslog(syslog.LOG_NOTICE, "Stopping %s" % dogtag_service.service_name)
     try:
-        dogtag_service.stop('pki-tomcat')
-    except Exception as e:
+        dogtag_service.stop(dogtag_instance)
+    except Exception, e:
         syslog.syslog(
             syslog.LOG_ERR, "Cannot stop %s: %s" % (dogtag_service.service_name, e))
     else: