This is an automated email from the git hooks/post-receive script.
firstyear pushed a change to branch 389-ds-base-1.3.5 in repository 389-ds-base.
from 70084f1 Issue 48989 - Overflow in counters and monitor new ea2adf3 Ticket 49179 - Missing components in 1.3.5 defaults.inf
The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference.
Summary of changes: Makefile.am | 9 +++++++++ ldap/admin/src/defaults.inf.in | 11 ++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-)
This is an automated email from the git hooks/post-receive script.
firstyear pushed a commit to branch 389-ds-base-1.3.5 in repository 389-ds-base.
commit ea2adf31887812aa16862d1601d27fcddae2f11b Author: William Brown firstyear@redhat.com Date: Wed Mar 22 10:21:53 2017 +1000
Ticket 49179 - Missing components in 1.3.5 defaults.inf
Bug Description: A number of components were missing in the defaults.inf of 1.3.5
Fix Description: Add the missing flags from git master, and correct makefile.am to substitute them correctly.
https://pagure.io/389-ds-base/issue/49179
Author: wibrown
Review by: mreynolds (Thanks!) --- Makefile.am | 9 +++++++++ ldap/admin/src/defaults.inf.in | 11 ++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/Makefile.am b/Makefile.am index 01ed664..d54a2cc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -32,6 +32,13 @@ else ASAN_ON = 0 endif
+ +if SYSTEMD +WITH_SYSTEMD = 1 +else +WITH_SYSTEMD = 0 +endif + # these paths are dependent on the settings of prefix and exec_prefix which may be specified # at make time. So we cannot use AC_DEFINE in the configure.ac because that would set the # values prior to their being defined. Defining them here ensures that they are properly @@ -1838,6 +1845,7 @@ fixupcmd = sed \ -e 's,@updatedir@,$(updatedir),g' \ -e 's,@ldaplib@,$(ldaplib),g' \ -e 's,@ldaplib_defs@,$(ldaplib_defs),g' \ + -e 's,@with_systemd@,$(WITH_SYSTEMD),g' \ -e 's,@systemdsystemunitdir@,$(systemdsystemunitdir),g' \ -e 's,@systemdsystemconfdir@,$(systemdsystemconfdir),g' \ -e 's,@systemdgroupname@,$(systemdgroupname),g' \ @@ -1908,6 +1916,7 @@ fixupcmd = sed \ -e 's,@updatedir@,$(updatedir),g' \ -e 's,@ldaplib@,$(ldaplib),g' \ -e 's,@ldaplib_defs@,$(ldaplib_defs),g' \ + -e 's,@with_systemd@,$(WITH_SYSTEMD),g' \ -e 's,@systemdsystemunitdir@,$(systemdsystemunitdir),g' \ -e 's,@systemdsystemconfdir@,$(systemdsystemconfdir),g' \ -e 's,@systemdgroupname@,$(systemdgroupname),g' \ diff --git a/ldap/admin/src/defaults.inf.in b/ldap/admin/src/defaults.inf.in index 2bd94fe..fe4ccda 100644 --- a/ldap/admin/src/defaults.inf.in +++ b/ldap/admin/src/defaults.inf.in @@ -20,6 +20,8 @@ product = @capbrand@ Directory Server version = @PACKAGE_VERSION@ asan_enabled = @enable_asan@ +with_systemd = @with_systemd@ +with_selinux = @with_selinux@ prefix = @prefixdir@ bin_dir = @bindir@ sbin_dir = @sbindir@ @@ -31,7 +33,11 @@ initconfig_dir = @initconfigdir@ config_dir = @instconfigdir@/slapd-{instance_name} local_state_dir = @localstatedir@ run_dir = @localstatedir@/run/dirsrv +pid_file = @localstatedir@/run/dirsrv/slapd-{instance_name}.pid +inst_dir = @serverdir@ plugin_dir = @serverplugindir@ +; This value is not relevant for 1.3.5 and lower. +;system_schema_dir = @systemschemadir@
; These values can be altered in an installation of ds user = dirsrv @@ -43,8 +49,11 @@ cert_dir = @instconfigdir@/slapd-{instance_name}
lock_dir = @localstatedir@/lock/dirsrv/slapd-{instance_name} log_dir = @localstatedir@/log/dirsrv/slapd-{instance_name} -inst_dir = @localstatedir@/lib/dirsrv/slapd-{instance_name} +access_log = @localstatedir@/log/dirsrv/slapd-{instance_name}/access +audit_log = @localstatedir@/log/dirsrv/slapd-{instance_name}/audit +error_log = @localstatedir@/log/dirsrv/slapd-{instance_name}/errors db_dir = @localstatedir@/lib/dirsrv/slapd-{instance_name}/db backup_dir = @localstatedir@/lib/dirsrv/slapd-{instance_name}/bak ldif_dir = @localstatedir@/lib/dirsrv/slapd-{instance_name}/ldif
+
389-commits@lists.fedoraproject.org
-
git repository hosting