Alon Bar-Lev has uploaded a new change for review.

Change subject: packaging: setup: trust pki scripts file mode
......................................................................

packaging: setup: trust pki scripts file mode

new pki scripts can be trusted to produce proper file modes.

Change-Id: If5fa87a1e0c14370ea6c6b0ce98ea3bd78a2b0bb
Signed-off-by: Alon Bar-Lev <alo...@redhat.com>
---
M packaging/setup/plugins/ovirt-engine-setup/pki/ca.py
1 file changed, 9 insertions(+), 26 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/97/17897/1

diff --git a/packaging/setup/plugins/ovirt-engine-setup/pki/ca.py 
b/packaging/setup/plugins/ovirt-engine-setup/pki/ca.py
index eb59c7c..68dfe57 100644
--- a/packaging/setup/plugins/ovirt-engine-setup/pki/ca.py
+++ b/packaging/setup/plugins/ovirt-engine-setup/pki/ca.py
@@ -282,33 +282,16 @@
             )
 
         for f in (
-            {
-                'name': (
-                    osetupcons.FileLocations.
-                    OVIRT_ENGINE_PKI_ENGINE_STORE
-                ),
-                'owner': self.environment[osetupcons.SystemEnv.USER_ENGINE],
-            },
-            {
-                'name': osetupcons.FileLocations.OVIRT_ENGINE_PKI_APACHE_STORE,
-                'owner': None,
-            },
-            {
-                'name': osetupcons.FileLocations.OVIRT_ENGINE_PKI_APACHE_KEY,
-                'owner': None,
-            },
-            {
-                'name': osetupcons.FileLocations.OVIRT_ENGINE_PKI_JBOSS_STORE,
-                'owner': self.environment[osetupcons.SystemEnv.USER_ENGINE],
-            },
+            osetupcons.FileLocations.OVIRT_ENGINE_PKI_ENGINE_STORE,
+            osetupcons.FileLocations.OVIRT_ENGINE_PKI_JBOSS_STORE,
         ):
-            os.chmod(f['name'], 0o600)
-            if f['owner'] is not None:
-                os.chown(
-                    f['name'],
-                    osetuputil.getUid(f['owner']),
-                    -1
-                )
+            os.chown(
+                f,
+                osetuputil.getUid(
+                    self.environment[osetupcons.SystemEnv.USER_ENGINE]
+                ),
+                -1,
+            )
 
     @plugin.event(
         stage=plugin.Stages.STAGE_MISC,


-- 
To view, visit http://gerrit.ovirt.org/17897
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If5fa87a1e0c14370ea6c6b0ce98ea3bd78a2b0bb
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.3
Gerrit-Owner: Alon Bar-Lev <alo...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches

Reply via email to