summaryrefslogtreecommitdiffstats
path: root/base/server/python/pki/server/deployment/scriptlets/initialization.py
diff options
context:
space:
mode:
authorMatthew Harmsen <mharmsen@redhat.com>2014-07-24 11:16:56 -0700
committerMatthew Harmsen <mharmsen@redhat.com>2014-08-04 14:15:36 -0700
commit3cbd3f4fd71bace3e1b5020defba07a3311d082a (patch)
treead1896e2122382b20e1940480a061fa44d58d86f /base/server/python/pki/server/deployment/scriptlets/initialization.py
parent7227047530a5a809299bf3198f6886776af1742e (diff)
downloadpki-3cbd3f4fd71bace3e1b5020defba07a3311d082a.tar.gz
pki-3cbd3f4fd71bace3e1b5020defba07a3311d082a.tar.xz
pki-3cbd3f4fd71bace3e1b5020defba07a3311d082a.zip
Fix independent pkispawn installation and configuration
* PKI TRAC Ticket #905 - 2 Step Configuration of CA instance using pkispawn fails
Diffstat (limited to 'base/server/python/pki/server/deployment/scriptlets/initialization.py')
-rw-r--r--base/server/python/pki/server/deployment/scriptlets/initialization.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/base/server/python/pki/server/deployment/scriptlets/initialization.py b/base/server/python/pki/server/deployment/scriptlets/initialization.py
index a0f1e313a..a555a8938 100644
--- a/base/server/python/pki/server/deployment/scriptlets/initialization.py
+++ b/base/server/python/pki/server/deployment/scriptlets/initialization.py
@@ -36,6 +36,12 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet):
deployer.mdict['pki_subsystem'],
deployer.mdict['pki_instance_name'],
extra=config.PKI_INDENTATION_LEVEL_0)
+ # ALWAYS initialize 'uid' and 'gid'
+ deployer.identity.add_uid_and_gid(deployer.mdict['pki_user'],
+ deployer.mdict['pki_group'])
+ # ALWAYS establish 'uid' and 'gid'
+ deployer.identity.set_uid(deployer.mdict['pki_user'])
+ deployer.identity.set_gid(deployer.mdict['pki_group'])
if config.str2bool(deployer.mdict['pki_skip_installation']):
config.pki_log.info(log.SKIP_INITIALIZATION_SPAWN_1, __name__,
extra=config.PKI_INDENTATION_LEVEL_1)
@@ -56,12 +62,6 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet):
deployer.instance.verify_subsystem_does_not_exist()
# detect and avoid any namespace collisions
deployer.namespace.collision_detection()
- # initialize 'uid' and 'gid'
- deployer.identity.add_uid_and_gid(deployer.mdict['pki_user'],
- deployer.mdict['pki_group'])
- # establish 'uid' and 'gid'
- deployer.identity.set_uid(deployer.mdict['pki_user'])
- deployer.identity.set_gid(deployer.mdict['pki_group'])
# verify existence of SENSITIVE configuration file data
deployer.configuration_file.verify_sensitive_data()
# verify existence of MUTUALLY EXCLUSIVE configuration file data