diff options
author | Endi S. Dewata <edewata@redhat.com> | 2015-05-09 03:21:57 -0400 |
---|---|---|
committer | Endi S. Dewata <edewata@redhat.com> | 2015-05-11 10:20:41 -0400 |
commit | f1dec6488cfb1cf883fccd6fd3aa148bb1077776 (patch) | |
tree | 4206f427f9fda48594e8e5d866ad7e4f77746dee /base/server/upgrade/10.2.3 | |
parent | 6ee510efe491b1e2afd7e9901eee690365fd8bbb (diff) | |
download | pki-f1dec6488cfb1cf883fccd6fd3aa148bb1077776.tar.gz pki-f1dec6488cfb1cf883fccd6fd3aa148bb1077776.tar.xz pki-f1dec6488cfb1cf883fccd6fd3aa148bb1077776.zip |
Refactored upgrade scripts.
The upgrade scripts have been modified to use the uid and gid
provided by PKIInstance object.
https://fedorahosted.org/pki/ticket/1341
Diffstat (limited to 'base/server/upgrade/10.2.3')
-rwxr-xr-x | base/server/upgrade/10.2.3/01-FixInstanceWorkFolderOwnership | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/base/server/upgrade/10.2.3/01-FixInstanceWorkFolderOwnership b/base/server/upgrade/10.2.3/01-FixInstanceWorkFolderOwnership index 6872a165a..700aaf3ce 100755 --- a/base/server/upgrade/10.2.3/01-FixInstanceWorkFolderOwnership +++ b/base/server/upgrade/10.2.3/01-FixInstanceWorkFolderOwnership @@ -19,10 +19,7 @@ # All rights reserved. # -import grp import os -import pwd -import re import pki.server.upgrade @@ -32,26 +29,6 @@ class FixInstanceWorkFolderOwnership(pki.server.upgrade.PKIServerUpgradeScriptle self.message = 'Fix instance work folder ownership' def upgrade_instance(self, instance): - registry_file = os.path.join( - pki.server.REGISTRY_DIR, 'tomcat', instance.name, instance.name) - - with open(registry_file, "r") as registry: - lines = registry.readlines() - - user = None - group = None - - for line in lines: - m = re.search('^PKI_USER=(.*)$', line) - if m: - user = m.group(1) - m = re.search('^PKI_GROUP=(.*)$', line) - if m: - group = m.group(1) - - uid = pwd.getpwnam(user).pw_uid - gid = grp.getgrnam(group).gr_gid dir = os.path.join(instance.base_dir, 'work/Catalina/localhost/pki') - - pki.util.chown(dir, uid, gid) + pki.util.chown(dir, instance.uid, instance.gid) |