4 files changed, 5 insertions, 7 deletions
diff --git a/install/conf/ipa-pki-proxy.conf b/install/conf/ipa-pki-proxy.conf
index 9a6345898..4368896b9 100644
--- a/install/conf/ipa-pki-proxy.conf
+++ b/install/conf/ipa-pki-proxy.conf
@@ -1,4 +1,4 @@
-# VERSION 4 - DO NOT REMOVE THIS LINE
+# VERSION 5 - DO NOT REMOVE THIS LINE
 
 ProxyRequests Off
 
diff --git a/install/tools/ipa-replica-install b/install/tools/ipa-replica-install
index b79aeade2..0beca24d9 100755
--- a/install/tools/ipa-replica-install
+++ b/install/tools/ipa-replica-install
@@ -586,10 +586,9 @@ def main():
         else:
             fd.write("enable_ra=False\n")
             fd.write("ra_plugin=none\n")
-        if config.setup_drm:
-            fd.write("enable_drm=True\n")
-        else:
-            fd.write("enable_drm=False\n")
+
+        fd.write("enable_drm=%s\n" % config.setup_drm)
+
         fd.write("mode=production\n")
         fd.close()
     finally:
diff --git a/install/tools/ipa-server-install b/install/tools/ipa-server-install
index 4aa6fcca5..440d108a6 100755
--- a/install/tools/ipa-server-install
+++ b/install/tools/ipa-server-install
@@ -1209,7 +1209,6 @@ def main():
     http.restart()
 
     if setup_drm:
-        # code to create drm here
         drm = drminstance.DRMInstance(realm_name,
             dogtag_constants=dogtag.install_constants)
         drm.configure_instance(host_name, domain_name, dm_password,
diff --git a/install/tools/ipa-upgradeconfig b/install/tools/ipa-upgradeconfig
index b45b3179a..0dbe892d3 100644
--- a/install/tools/ipa-upgradeconfig
+++ b/install/tools/ipa-upgradeconfig
@@ -675,7 +675,7 @@ def certificate_renewal_update(ca):
 
     # Ok, now we need to stop tracking, then we can start tracking them
     # again with new configuration:
-    ca.stop_tracking_certificates(dogtag_constants)
+    ca.stop_tracking_system_certificates(dogtag_constants)
 
     if not sysupgrade.get_upgrade_state('dogtag',
                                         'certificate_renewal_update_1'):