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