Juan Hernandez has uploaded a new change for review.
Change subject: packaging: Don't change identity if no ENGINE_USER
......................................................................
packaging: Don't change identity if no ENGINE_USER
Currently the parameters ENGINE_USER and ENGINE_GROUP in
/etc/sysconfig/ovirt-engine are mandatory. In order to simplify use for
developers this patch makes them optional, so if they don't have a value
the engine will start with the identity of the user that is executing
the service script.
Change-Id: I0a56d73ad347011421ddd4f35671f3e39a610aec
Signed-off-by: Juan Hernandez <juan.hernan...@redhat.com>
---
M packaging/fedora/engine-service.py.in
1 file changed, 16 insertions(+), 14 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/61/11161/1
diff --git a/packaging/fedora/engine-service.py.in
b/packaging/fedora/engine-service.py.in
index 278bc25..6033e69 100644
--- a/packaging/fedora/engine-service.py.in
+++ b/packaging/fedora/engine-service.py.in
@@ -47,10 +47,8 @@
engineConfig = None
# The name of the user and group that should run the service:
-engineUser = None
-engineGroup = None
-engineUid = 0
-engineGid = 0
+engineUid = None
+engineGid = None
# Java home directory:
javaHomeDir = None
@@ -150,22 +148,26 @@
engineConfig = Config(engineConfigFiles)
# Get the id of the engine user:
- global engineUser
global engineUid
engineUser = engineConfig.getString("ENGINE_USER")
- try:
- engineUid = pwd.getpwnam(engineUser).pw_uid
- except:
- raise Exception("The engine user \"%s\" doesn't exist." % engineUser)
+ if engineUser:
+ try:
+ engineUid = pwd.getpwnam(engineUser).pw_uid
+ except:
+ raise Exception("The engine user \"%s\" doesn't exist." %
engineUser)
+ else:
+ engineUid = os.getuid()
# Get id of the engine group:
- global engineGroup
global engineGid
engineGroup = engineConfig.getString("ENGINE_GROUP")
- try:
- engineGid = grp.getgrnam(engineGroup).gr_gid
- except:
- raise Exception("The engine group \"%s\" doesn't exist." % engineGroup)
+ if engineGroup:
+ try:
+ engineGid = grp.getgrnam(engineGroup).gr_gid
+ except:
+ raise Exception("The engine group \"%s\" doesn't exist." %
engineGroup)
+ else:
+ engineGid = os.getgid()
# Java home directory:
global javaHomeDir
--
To view, visit http://gerrit.ovirt.org/11161
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0a56d73ad347011421ddd4f35671f3e39a610aec
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Juan Hernandez <juan.hernan...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
