admserv/newinst/src/AdminMigration.pm.in | 3 +++
admserv/newinst/src/AdminServer.pm.in | 6 ++++--
2 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit c3c73792a3ac0c2d72b9e893c2c7ea3c9886f571
Author: Nathan Kinder <nkinder(a)redhat.com>
Date: Tue Jul 5 08:52:19 2011 -0700
Bug 719056 - migrate-ds-admin.pl needs to update SELinux policy
The migrate-ds-admin.pl script currently doesn't update the SELinux
policy. This script needs to label the admin server port and paths
properly to ensure that the process will start correctly.
diff --git a/admserv/newinst/src/AdminMigration.pm.in
b/admserv/newinst/src/AdminMigration.pm.in
index 78c8328..c14678f 100644
--- a/admserv/newinst/src/AdminMigration.pm.in
+++ b/admserv/newinst/src/AdminMigration.pm.in
@@ -547,6 +547,9 @@ sub migrateAdminServer {
return 0;
}
+ # Update selinux policy
+ updateSelinuxPolicy($mig, $configdir, $securitydir, $logdir, $rundir);
+
if (!startAdminServer($mig, $configdir, $logdir, $rundir)) {
return 0;
}
diff --git a/admserv/newinst/src/AdminServer.pm.in
b/admserv/newinst/src/AdminServer.pm.in
index 9cff480..7da6cb7 100644
--- a/admserv/newinst/src/AdminServer.pm.in
+++ b/admserv/newinst/src/AdminServer.pm.in
@@ -21,10 +21,12 @@ require Exporter;
@ISA = qw(Exporter);
@EXPORT = qw(createAdminServer reconfigAdminServer
createASFilesAndDirs setFileOwnerPerms updateHttpConfFiles
- startAdminServer stopAdminServer removeAdminServer setDefaults);
+ startAdminServer stopAdminServer removeAdminServer setDefaults
+ updateSelinuxPolicy);
@EXPORT_OK = qw(createAdminServer reconfigAdminServer
createASFilesAndDirs setFileOwnerPerms updateHttpConfFiles
- startAdminServer stopAdminServer removeAdminServer setDefaults);
+ startAdminServer stopAdminServer removeAdminServer setDefaults
+ updateSelinuxPolicy);
use File::Path;
# tempfiles
Show replies by date