diff --git a/configure.ac b/configure.ac index 661be1327c6..ae31b914868 100644 --- a/configure.ac +++ b/configure.ac @@ -208,6 +208,17 @@ AC_ARG_WITH([sysconfenvdir], [sysconfenvdir="${sysconfdir}/sysconfig"]) AC_SUBST([sysconfenvdir]) +dnl --------------------------------------------------------------------------- +dnl - Get /run directory path +dnl - available in autoconf 2.70+ +dnl --------------------------------------------------------------------------- +AC_ARG_WITH([runstatedir], + AS_HELP_STRING([--with-runstatedir=DIR], + [Runtime data directory]), + [runstatedir=$with_runstatedir], + [runstatedir="/run"]) +AC_SUBST([runstatedir]) + dnl --------------------------------------------------------------------------- dnl - Server-only configuration dnl --------------------------------------------------------------------------- diff --git a/daemons/dnssec/Makefile.am b/daemons/dnssec/Makefile.am index 3b37c11a580..a08b164daa1 100644 --- a/daemons/dnssec/Makefile.am +++ b/daemons/dnssec/Makefile.am @@ -29,6 +29,7 @@ CLEANFILES = $(systemdsystemunit_DATA) $(nodist_app_SCRIPTS) -e 's|@libexecdir[@]|$(libexecdir)|g' \ -e 's|@localstatedir[@]|$(localstatedir)|g' \ -e 's|@sysconfenvdir[@]|$(sysconfenvdir)|g' \ + -e 's|@runstatedir[@]|$(runstatedir)|g' \ -e 's|@ODS_USER[@]|$(ODS_USER)|g' \ -e 's|@NAMED_GROUP[@]|$(NAMED_GROUP)|g' \ '$(srcdir)/$@.in' >$@ diff --git a/daemons/dnssec/ipa-ods-exporter.socket.in b/daemons/dnssec/ipa-ods-exporter.socket.in index ec58da97fc2..85a1b7e4c73 100644 --- a/daemons/dnssec/ipa-ods-exporter.socket.in +++ b/daemons/dnssec/ipa-ods-exporter.socket.in @@ -1,5 +1,5 @@ [Socket] -ListenStream=@localstatedir@/run/opendnssec/engine.sock +ListenStream=@runstatedir@/opendnssec/engine.sock [Install] WantedBy=sockets.target diff --git a/daemons/ipa-kdb/Makefile.am b/daemons/ipa-kdb/Makefile.am index 04d647d0a55..e33fedb9035 100644 --- a/daemons/ipa-kdb/Makefile.am +++ b/daemons/ipa-kdb/Makefile.am @@ -11,7 +11,7 @@ AM_CPPFLAGS = \ -DLIBDIR=\""$(libdir)"\" \ -DLIBEXECDIR=\""$(libexecdir)"\" \ -DDATADIR=\""$(datadir)"\" \ - -DLDAPIDIR=\""$(localstatedir)/run"\" \ + -DLDAPIDIR=\""$(runstatedir)"\" \ $(AM_CFLAGS) \ $(LDAP_CFLAGS) \ $(KRB5_CFLAGS) \ diff --git a/daemons/ipa-sam/Makefile.am b/daemons/ipa-sam/Makefile.am index 2f9046777f5..f80455339c6 100644 --- a/daemons/ipa-sam/Makefile.am +++ b/daemons/ipa-sam/Makefile.am @@ -15,7 +15,7 @@ AM_CPPFLAGS = \ -DLIBDIR=\""$(libdir)"\" \ -DLIBEXECDIR=\""$(libexecdir)"\" \ -DDATADIR=\""$(datadir)"\" \ - -DLDAPIDIR=\""$(localstatedir)/run"\" \ + -DLDAPIDIR=\""$(runstatedir)"\" \ -DHAVE_LDAP \ -I$(top_srcdir)/util \ $(CRYPTO_CFLAGS) \ diff --git a/install/oddjob/com.redhat.idm.trust-fetch-domains.in b/install/oddjob/com.redhat.idm.trust-fetch-domains.in index 86143b2e143..c002b1bb3f7 100644 --- a/install/oddjob/com.redhat.idm.trust-fetch-domains.in +++ b/install/oddjob/com.redhat.idm.trust-fetch-domains.in @@ -143,7 +143,7 @@ def generate_krb5_config(realm, server): server, ) - (fd, tcfg) = tempfile.mkstemp(dir="/var/run/ipa", + (fd, tcfg) = tempfile.mkstemp(dir="/run/ipa", prefix="krb5conf", text=True) with io.open(fd, mode='w', encoding='utf-8') as o: o.write(content) @@ -191,8 +191,8 @@ keytab_name = "/etc/samba/samba.keytab" principal = str("cifs/" + api.env.host) -oneway_ccache_name = "/var/run/ipa/krb5cc_oddjob_trusts_fetch" -ccache_name = "/var/run/ipa/krb5cc_oddjob_trusts" +oneway_ccache_name = "/run/ipa/krb5cc_oddjob_trusts_fetch" +ccache_name = "/run/ipa/krb5cc_oddjob_trusts" # Standard sequence: # - check if ccache exists diff --git a/ipaplatform/base/paths.py b/ipaplatform/base/paths.py index 9ab05f7ca40..6ac94317d96 100644 --- a/ipaplatform/base/paths.py +++ b/ipaplatform/base/paths.py @@ -358,15 +358,15 @@ class BasePathNamespace: VAR_OPENDNSSEC_DIR = "/var/opendnssec" OPENDNSSEC_KASP_DB = "/var/opendnssec/kasp.db" IPA_ODS_EXPORTER_CCACHE = "/var/opendnssec/tmp/ipa-ods-exporter.ccache" - VAR_RUN_DIRSRV_DIR = "/var/run/dirsrv" + VAR_RUN_DIRSRV_DIR = "/run/dirsrv" IPA_CCACHES = "/run/ipa/ccaches" HTTP_CCACHE = "/var/lib/ipa/gssproxy/http.ccache" CA_BUNDLE_PEM = "/var/lib/ipa-client/pki/ca-bundle.pem" KDC_CA_BUNDLE_PEM = "/var/lib/ipa-client/pki/kdc-ca-bundle.pem" - IPA_RENEWAL_LOCK = "/var/run/ipa/renewal.lock" - SVC_LIST_FILE = "/var/run/ipa/services.list" - KRB5CC_SAMBA = "/var/run/samba/krb5cc_samba" - SLAPD_INSTANCE_SOCKET_TEMPLATE = "/var/run/slapd-%s.socket" + IPA_RENEWAL_LOCK = "/run/ipa/renewal.lock" + SVC_LIST_FILE = "/run/ipa/services.list" + KRB5CC_SAMBA = "/run/samba/krb5cc_samba" + SLAPD_INSTANCE_SOCKET_TEMPLATE = "/run/slapd-%s.socket" ADMIN_CERT_PATH = '/root/.dogtag/pki-tomcat/ca_admin.cert' ENTROPY_AVAIL = '/proc/sys/kernel/random/entropy_avail' KDCPROXY_CONFIG = '/etc/ipa/kdcproxy/kdcproxy.conf' @@ -404,8 +404,8 @@ class BasePathNamespace: SLAPD_INSTANCE_BACKUP_DIR_TEMPLATE = "/var/lib/dirsrv/slapd-%s/bak/%s" SLAPD_INSTANCE_DB_DIR_TEMPLATE = "/var/lib/dirsrv/slapd-%s/db/%s" SLAPD_INSTANCE_LDIF_DIR_TEMPLATE = "/var/lib/dirsrv/slapd-%s/ldif" - DIRSRV_LOCK_DIR = "/var/lock/dirsrv" - ALL_SLAPD_INSTANCE_SOCKETS = "/var/run/slapd-*.socket" + DIRSRV_LOCK_DIR = "/run/lock/dirsrv" + ALL_SLAPD_INSTANCE_SOCKETS = "/run/slapd-*.socket" VAR_LOG_DIRSRV_INSTANCE_TEMPLATE = "/var/log/dirsrv/slapd-%s" SLAPD_INSTANCE_ACCESS_LOG_TEMPLATE = "/var/log/dirsrv/slapd-%s/access" SLAPD_INSTANCE_ERROR_LOG_TEMPLATE = "/var/log/dirsrv/slapd-%s/errors" diff --git a/ipatests/test_integration/test_commands.py b/ipatests/test_integration/test_commands.py index cdad544f517..7bb1ebcab57 100644 --- a/ipatests/test_integration/test_commands.py +++ b/ipatests/test_integration/test_commands.py @@ -747,7 +747,7 @@ def test_ipa_cacert_manage_install(self): result = self.master.run_command([ paths.IPA_CACERT_MANAGE, 'install', - '/var/run/cert_not_found'], raiseonerr=False) + '/run/cert_not_found'], raiseonerr=False) assert result.returncode == 1 cmd = self.master.run_command(['mktemp']) diff --git a/selinux/ipa.fc b/selinux/ipa.fc index 2d71893444d..a98cc46655e 100644 --- a/selinux/ipa.fc +++ b/selinux/ipa.fc @@ -23,7 +23,7 @@ /var/log/ipareplica-conncheck.log.* -- gen_context(system_u:object_r:ipa_log_t,s0) -/var/run/ipa(/.*)? gen_context(system_u:object_r:ipa_var_run_t,s0) +/run/ipa(/.*)? gen_context(system_u:object_r:ipa_var_run_t,s0) /usr/libexec/ipa/ipa-custodia -- gen_context(system_u:object_r:ipa_custodia_exec_t,s0) /usr/libexec/ipa/custodia/ipa-custodia-dmldap -- gen_context(system_u:object_r:ipa_custodia_dmldap_exec_t,s0) diff --git a/server.m4 b/server.m4 index f3c0007b9d7..ae8dacf9f5d 100644 --- a/server.m4 +++ b/server.m4 @@ -65,7 +65,7 @@ dnl --------------------------------------------------------------------------- AC_CHECK_HEADER(krad.h, [], [AC_MSG_ERROR([krad.h not found])]) AC_CHECK_LIB(krad, main, [ ], [AC_MSG_ERROR([libkrad not found])]) KRAD_LIBS="-lkrad" -krb5rundir="${localstatedir}/run/krb5kdc" +krb5rundir="${runstatedir}/krb5kdc" AC_SUBST(KRAD_LIBS) AC_SUBST(krb5rundir)