[Freeipa-devel] [PATCH] 358 Do not check if port 8443 is available in step 2 of external CA install

2014-10-22 Thread Jan Cholasta

Hi,

the attached patch fixes https://fedorahosted.org/freeipa/ticket/4660.

Honza

--
Jan Cholasta
From 1a42a07cfa02753053298c75d3a76cb1cb3bf839 Mon Sep 17 00:00:00 2001
From: Jan Cholasta jchol...@redhat.com
Date: Wed, 22 Oct 2014 11:18:35 +0200
Subject: [PATCH] Do not check if port 8443 is available in step 2 of external
 CA install

The port is never available in step 2 of external CA install, as Dogtag is
already running.

https://fedorahosted.org/freeipa/ticket/4660
---
 install/tools/ipa-ca-install | 3 ++-
 install/tools/ipa-server-install | 9 +
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/install/tools/ipa-ca-install b/install/tools/ipa-ca-install
index cb072e6..1bda22d 100755
--- a/install/tools/ipa-ca-install
+++ b/install/tools/ipa-ca-install
@@ -301,7 +301,8 @@ def install_master(safe_options, options):
 domain_name = api.env.domain
 host_name = api.env.host
 
-check_ca()
+if external != 2:
+check_ca()
 
 dirname = dsinstance.config_dirname(
 dsinstance.realm_to_serverid(realm_name))
diff --git a/install/tools/ipa-server-install b/install/tools/ipa-server-install
index 0394314..67dd21f 100755
--- a/install/tools/ipa-server-install
+++ b/install/tools/ipa-server-install
@@ -869,10 +869,11 @@ def main():
 # Make sure the 389-ds ports are available
 check_dirsrv(options.unattended)
 
-if setup_ca:
-if not cainstance.check_port():
-print IPA requires port 8443 for PKI but it is currently in use.
-sys.exit(Aborting installation)
+if setup_ca:
+if not cainstance.check_port():
+print (IPA requires port 8443 for PKI but it is currently in 
+   use.)
+sys.exit(Aborting installation)
 
 if options.conf_ntp:
 try:
-- 
1.9.3

___
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel

Re: [Freeipa-devel] [PATCH] 358 Do not check if port 8443 is available in step 2 of external CA install

2014-10-22 Thread David Kupka

On 10/22/2014 11:28 AM, Jan Cholasta wrote:

Hi,

the attached patch fixes https://fedorahosted.org/freeipa/ticket/4660.

Honza



___
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel


Works for me, ACK.
--
David Kupka

___
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel


Re: [Freeipa-devel] [PATCH] 358 Do not check if port 8443 is available in step 2 of external CA install

2014-10-22 Thread Jan Cholasta

Dne 22.10.2014 v 13:30 David Kupka napsal(a):

On 10/22/2014 11:28 AM, Jan Cholasta wrote:

Hi,

the attached patch fixes https://fedorahosted.org/freeipa/ticket/4660.

Honza



___
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel


Works for me, ACK.


Thanks.

See attachment for ipa-4-0 version of the patch.

--
Jan Cholasta
From dcb53769739e74de865ed54c5ee22f15eb287abc Mon Sep 17 00:00:00 2001
From: Jan Cholasta jchol...@redhat.com
Date: Wed, 22 Oct 2014 11:18:35 +0200
Subject: [PATCH] Do not check if port 8443 is available in step 2 of external
 CA install

The port is never available in step 2 of external CA install, as Dogtag is
already running.

https://fedorahosted.org/freeipa/ticket/4660
---
 install/tools/ipa-server-install | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/install/tools/ipa-server-install b/install/tools/ipa-server-install
index beb5cfe..3d34d4b 100755
--- a/install/tools/ipa-server-install
+++ b/install/tools/ipa-server-install
@@ -803,10 +803,11 @@ def main():
 # Make sure the 389-ds ports are available
 check_dirsrv(options.unattended)
 
-if setup_ca:
-if not cainstance.check_port():
-print IPA requires port 8443 for PKI but it is currently in use.
-sys.exit(Aborting installation)
+if setup_ca:
+if not cainstance.check_port():
+print (IPA requires port 8443 for PKI but it is currently in 
+   use.)
+sys.exit(Aborting installation)
 
 if options.conf_ntp:
 try:
-- 
1.9.3

___
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel

Re: [Freeipa-devel] [PATCH] 358 Do not check if port 8443 is available in step 2 of external CA install

2014-10-22 Thread Petr Vobornik

On 22.10.2014 13:57, Jan Cholasta wrote:

Dne 22.10.2014 v 13:30 David Kupka napsal(a):

On 10/22/2014 11:28 AM, Jan Cholasta wrote:

Hi,

the attached patch fixes https://fedorahosted.org/freeipa/ticket/4660.

Honza



Works for me, ACK.


Thanks.

See attachment for ipa-4-0 version of the patch.



Looks good.

Pushed to:
ipa-4-0: 3cb982bc010216c7613de67ea537ba0dbe8d8342
ipa-4-1: e22cf5bafc4c862a16bd8ac0b950c7547b048ae9
master: 50e66337340ae8f9c243658b58409de4e911d1c4
--
Petr Vobornik

___
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel