From ec74c73eaa56271ce74e985ab6a69b36e98488e4 Mon Sep 17 00:00:00 2001 From: Simon Pichugin Date: Wed, 24 Nov 2021 08:35:17 -0800 Subject: [PATCH] Revert "Issue 2790 - Set db home directory by default" This reverts commit 269f1f8e879a6fc098bb8cff780df6915e8ecb38. --- ldap/admin/src/defaults.inf.in | 2 +- src/lib389/lib389/instance/setup.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ldap/admin/src/defaults.inf.in b/ldap/admin/src/defaults.inf.in index 28f908bcd..96a3b3eb1 100644 --- a/ldap/admin/src/defaults.inf.in +++ b/ldap/admin/src/defaults.inf.in @@ -59,7 +59,7 @@ 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 -db_home_dir = /dev/shm/slapd-{instance_name} +db_home_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 diff --git a/src/lib389/lib389/instance/setup.py b/src/lib389/lib389/instance/setup.py index 0669e5856..4cbdda4fc 100644 --- a/src/lib389/lib389/instance/setup.py +++ b/src/lib389/lib389/instance/setup.py @@ -775,7 +775,7 @@ class SetupDs(object): self.log.info("Create file system structures ...") # Create all the needed paths # we should only need to make bak_dir, cert_dir, config_dir, db_dir, ldif_dir, lock_dir, log_dir, run_dir? - for path in ('backup_dir', 'cert_dir', 'db_dir', 'db_home_dir', 'ldif_dir', 'lock_dir', 'log_dir', 'run_dir'): + for path in ('backup_dir', 'cert_dir', 'db_dir', 'ldif_dir', 'lock_dir', 'log_dir', 'run_dir'): self.log.debug("ACTION: creating %s", slapd[path]) try: os.umask(0o007) # For parent dirs that get created -> sets 770 for perms @@ -912,7 +912,7 @@ class SetupDs(object): if general['selinux']: self.log.info("Perform SELinux labeling ...") selinux_paths = ('backup_dir', 'cert_dir', 'config_dir', 'db_dir', - 'ldif_dir', 'lock_dir', 'log_dir', 'db_home_dir', + 'ldif_dir', 'lock_dir', 'log_dir', 'run_dir', 'schema_dir', 'tmp_dir') for path in selinux_paths: selinux_restorecon(slapd[path]) -- 2.31.1