URL: https://github.com/freeipa/freeipa/pull/583 Author: tjaalton Title: #583: ipaplatform/debian/services: Fix is_running arguments. Action: synchronized
To pull the PR as Git branch: git remote add ghfreeipa https://github.com/freeipa/freeipa git fetch ghfreeipa pull/583/head:pr583 git checkout pr583
From fb4ea5c5411de2bddbdfa9a1a8304dc641dd1924 Mon Sep 17 00:00:00 2001 From: Timo Aaltonen <tjaal...@debian.org> Date: Tue, 14 Mar 2017 16:32:22 +0200 Subject: [PATCH 1/3] ipaplatform/debian/services: Fix is_running arguments. --- ipaplatform/debian/services.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ipaplatform/debian/services.py b/ipaplatform/debian/services.py index 85fba56..5eef5ff 100644 --- a/ipaplatform/debian/services.py +++ b/ipaplatform/debian/services.py @@ -72,7 +72,7 @@ def restart(self, instance_name='', capture_output=True, wait=True): if wait and self.is_running(instance_name): self.__wait_for_open_ports(instance_name) - def is_running(self, instance_name=""): + def is_running(self, instance_name="", wait=True): ret = True try: result = ipautil.run([paths.SBIN_SERVICE, From ce487555d0b0dcf59b75a0b828306bee2e065447 Mon Sep 17 00:00:00 2001 From: Timo Aaltonen <tjaal...@debian.org> Date: Tue, 14 Mar 2017 16:43:22 +0200 Subject: [PATCH 2/3] ipaplatform/debian/paths: Add IPA_HTTPD_KDCPROXY. --- ipaplatform/debian/paths.py | 1 + 1 file changed, 1 insertion(+) diff --git a/ipaplatform/debian/paths.py b/ipaplatform/debian/paths.py index ad0e13c..1f1b9a7 100644 --- a/ipaplatform/debian/paths.py +++ b/ipaplatform/debian/paths.py @@ -71,6 +71,7 @@ class DebianPathNamespace(BasePathNamespace): GENERATE_RNDC_KEY = "/bin/true" IPA_DNSKEYSYNCD_REPLICA = "/usr/lib/ipa/ipa-dnskeysync-replica" IPA_DNSKEYSYNCD = "/usr/lib/ipa/ipa-dnskeysyncd" + IPA_HTTPD_KDCPROXY = "/usr/lib/ipa/ipa-httpd-kdcproxy" IPA_ODS_EXPORTER = "/usr/lib/ipa/ipa-ods-exporter" HTTPD = "/usr/sbin/apache2ctl" REMOVE_DS_PL = "/usr/sbin/remove-ds" From a0e1b818239720f0d523a2a87065cc8e4c26bb21 Mon Sep 17 00:00:00 2001 From: Timo Aaltonen <tjaal...@debian.org> Date: Tue, 14 Mar 2017 17:24:56 +0200 Subject: [PATCH 3/3] ipaplatform/debian/paths: Rename IPA_KEYTAB to OLD_IPA_KEYTAB. --- ipaplatform/debian/paths.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ipaplatform/debian/paths.py b/ipaplatform/debian/paths.py index 1f1b9a7..e661a8d 100644 --- a/ipaplatform/debian/paths.py +++ b/ipaplatform/debian/paths.py @@ -26,7 +26,7 @@ class DebianPathNamespace(BasePathNamespace): HTTPD_IPA_REWRITE_CONF = "/etc/apache2/conf-available/ipa-rewrite.conf" HTTPD_IPA_CONF = "/etc/apache2/conf-enabled/ipa.conf" HTTPD_NSS_CONF = "/etc/apache2/mods-available/nss.conf" - IPA_KEYTAB = "/etc/apache2/ipa.keytab" + OLD_IPA_KEYTAB = "/etc/apache2/ipa.keytab" HTTPD_PASSWORD_CONF = "/etc/apache2/password.conf" NAMED_CONF = "/etc/bind/named.conf" NAMED_VAR_DIR = "/var/cache/bind"
-- 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