Re: [Freeipa-devel] [PATCH 0131] fix standalone installation of externally signed CA on IPA master

2016-01-28 Thread Martin Basti



On 26.01.2016 13:44, Martin Babinsky wrote:

On 01/26/2016 01:06 PM, Martin Babinsky wrote:

https://fedorahosted.org/freeipa/ticket/5636



This also happens on ipa-4-3/master but the offending check was moved 
around. Attaching patch for 4-3/master branches.





ACK for master and ipa-4-3

I continue with testing on ipa-4-2 to be sure
-- 
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code

Re: [Freeipa-devel] [PATCH 0131] fix standalone installation of externally signed CA on IPA master

2016-01-28 Thread Martin Basti



On 28.01.2016 14:49, Martin Basti wrote:



On 26.01.2016 13:44, Martin Babinsky wrote:

On 01/26/2016 01:06 PM, Martin Babinsky wrote:

https://fedorahosted.org/freeipa/ticket/5636



This also happens on ipa-4-3/master but the offending check was moved 
around. Attaching patch for 4-3/master branches.





ACK for master and ipa-4-3

I continue with testing on ipa-4-2 to be sure



ACK

master: 72e72615df8b178ebbcb2e4944ba289ef263c951
ipa-4-3: 87cd18892fcbc520c8d45c5f7624a909c9347779
ipa-4-2: 24384624b3ad2eb0e5ffe6483c34156c7d335888
-- 
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code

[Freeipa-devel] [PATCH 0131] fix standalone installation of externally signed CA on IPA master

2016-01-26 Thread Martin Babinsky

https://fedorahosted.org/freeipa/ticket/5636

--
Martin^3 Babinsky
From 93952405192c16a573d8066265523e73318d5844 Mon Sep 17 00:00:00 2001
From: Martin Babinsky 
Date: Tue, 26 Jan 2016 13:02:44 +0100
Subject: [PATCH] fix standalone installation of externally signed CA on IPA
 master

https://fedorahosted.org/freeipa/ticket/5636
---
 ipaserver/install/ca.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ipaserver/install/ca.py b/ipaserver/install/ca.py
index 84cbf423246534259cd6b7a8cca25caa16e5594f..d2fb5feeaf96e8450eddb1bc4e65ef3316b05b38 100644
--- a/ipaserver/install/ca.py
+++ b/ipaserver/install/ca.py
@@ -46,7 +46,8 @@ def install_check(standalone, replica_config, options):
 return
 
 if standalone:
-if cainstance.is_ca_installed_locally():
+if (not options.external_cert_files and
+cainstance.is_ca_installed_locally()):
 sys.exit("CA is already installed on this host.")
 elif api.Command.ca_is_enabled()['result']:
 sys.exit(
-- 
2.5.0

-- 
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code

Re: [Freeipa-devel] [PATCH 0131] fix standalone installation of externally signed CA on IPA master

2016-01-26 Thread Martin Babinsky

On 01/26/2016 01:06 PM, Martin Babinsky wrote:

https://fedorahosted.org/freeipa/ticket/5636



This also happens on ipa-4-3/master but the offending check was moved 
around. Attaching patch for 4-3/master branches.


--
Martin^3 Babinsky
From 84f2114aee0f59634d3e0f41e655bec9313fd0f5 Mon Sep 17 00:00:00 2001
From: Martin Babinsky 
Date: Tue, 26 Jan 2016 13:41:37 +0100
Subject: [PATCH] fix standalone installation of externally signed CA on IPA
 master

https://fedorahosted.org/freeipa/ticket/5636
---
 install/tools/ipa-ca-install | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/install/tools/ipa-ca-install b/install/tools/ipa-ca-install
index 83cf98ec6a34093c826470e06ad448e6033bc682..1bc5def03bf687a1e4f9fb38a54363b5429c8fc4 100755
--- a/install/tools/ipa-ca-install
+++ b/install/tools/ipa-ca-install
@@ -276,7 +276,8 @@ def main():
 if not dsinstance.DsInstance().is_configured():
 sys.exit("IPA server is not configured on this system.\n")
 
-if cainstance.is_ca_installed_locally():
+if (not options.external_cert_files and
+cainstance.is_ca_installed_locally()):
 sys.exit("CA is already installed on this host.")
 
 standard_logging_setup(paths.IPASERVER_CA_INSTALL_LOG, debug=options.debug)
-- 
2.5.0

-- 
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code