From a0eb02cfb6635eff82482b297965ff5348c660cd Mon Sep 17 00:00:00 2001 From: Timo Aaltonen Date: Wed, 20 Oct 2021 21:35:58 +0300 Subject: [PATCH] ipaplatform/debian: Fix HTTPD_ALIAS_DIR, and drop some obsolete paths. Signed-off-by: Timo Aaltonen Reviewed-By: Christian Heimes Reviewed-By: Rob Crittenden --- ipaplatform/debian/paths.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/ipaplatform/debian/paths.py b/ipaplatform/debian/paths.py index 7cfed0897..ff235a2e9 100644 --- a/ipaplatform/debian/paths.py +++ b/ipaplatform/debian/paths.py @@ -19,9 +19,7 @@ class DebianPathNamespace(BasePathNamespace): BIN_HOSTNAMECTL = "/usr/bin/hostnamectl" AUTOFS_LDAP_AUTH_CONF = "/etc/autofs_ldap_auth.conf" ETC_HTTPD_DIR = "/etc/apache2" - HTTPD_ALIAS_DIR = "/etc/apache2/nssdb" - ALIAS_CACERT_ASC = "/etc/apache2/nssdb/cacert.asc" - ALIAS_PWDFILE_TXT = "/etc/apache2/nssdb/pwdfile.txt" + HTTPD_ALIAS_DIR = "/etc/apache2/ipa" HTTPD_CONF_D_DIR = "/etc/apache2/conf-enabled/" HTTPD_IPA_KDCPROXY_CONF_SYMLINK = "/etc/apache2/conf-enabled/ipa-kdc-proxy.conf" HTTPD_IPA_PKI_PROXY_CONF = "/etc/apache2/conf-enabled/ipa-pki-proxy.conf" @@ -74,7 +72,7 @@ class DebianPathNamespace(BasePathNamespace): SYSTEMD_SYSTEM_HTTPD_D_DIR = "/etc/systemd/system/apache2.service.d/" SYSTEMD_SYSTEM_HTTPD_IPA_CONF = "/etc/systemd/system/apache2.service.d/ipa.conf" DNSSEC_TRUSTED_KEY = "/etc/bind/trusted-key.key" - GSSAPI_SESSION_KEY = "/etc/apache2/ipasession.key" + GSSAPI_SESSION_KEY = "/etc/apache2/ipa/ipasession.key" OLD_KRA_AGENT_PEM = "/etc/apache2/nssdb/kra-agent.pem" SBIN_SERVICE = "/usr/sbin/service" CERTMONGER_COMMAND_TEMPLATE = "/usr/lib/ipa/certmonger/%s"