From 9c3071080c178e03a7dd66ae42b3814ae0288ffc Mon Sep 17 00:00:00 2001 From: Christian Heimes Date: Apr 24 2019 11:32:53 +0000 Subject: Reduce startup_timeout to 120sec as documented man(5) default.conf says that startup_timeout has a default value of 120 seconds. Even 120 seconds are not effective unless systemd is also reconfigured to have a larger DefaultTimeoutStartSec. Signed-off-by: Christian Heimes Reviewed-By: Alexander Bokovoy --- diff --git a/ipalib/constants.py b/ipalib/constants.py index 3bb0628..c22dd26 100644 --- a/ipalib/constants.py +++ b/ipalib/constants.py @@ -145,8 +145,10 @@ DEFAULT_CONFIG = ( ('tls_version_min', 'tls1.0'), ('tls_version_max', 'tls1.2'), - # Time to wait for a service to start, in seconds - ('startup_timeout', 300), + # Time to wait for a service to start, in seconds. + # Note that systemd has a DefaultTimeoutStartSec of 90 seconds. Higher + # values are not effective unless systemd is reconfigured, too. + ('startup_timeout', 120), # How long http connection should wait for reply [seconds]. ('http_timeout', 30), # How long to wait for an entry to appear on a replica diff --git a/ipaplatform/debian/paths.py b/ipaplatform/debian/paths.py index 852f309..fbcac10 100644 --- a/ipaplatform/debian/paths.py +++ b/ipaplatform/debian/paths.py @@ -82,6 +82,7 @@ class DebianPathNamespace(BasePathNamespace): IPA_HTTPD_KDCPROXY = "/usr/lib/ipa/ipa-httpd-kdcproxy" IPA_ODS_EXPORTER = "/usr/lib/ipa/ipa-ods-exporter" IPA_HTTPD_PASSWD_READER = "/usr/lib/ipa/ipa-httpd-pwdreader" + IPA_PKI_WAIT_RUNNING = "/usr/lib/ipa/ipa-pki-wait-running" HTTPD = "/usr/sbin/apache2ctl" REMOVE_DS_PL = "/usr/sbin/remove-ds" SETUP_DS_PL = "/usr/sbin/setup-ds"