Merge pull request #436 from nperron/bug_5220/dev/use_more_precsise_m…

…ode_under_configuration_repository Fixes #5220 - Add more precise modes under configuration-repository
Normation · Jul 4, 2014 · b33f4de · b33f4de
2 parents df5e229 + e515339
commit b33f4de
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/rudder-webapp/SPECS/rudder-webapp.spec b/rudder-webapp/SPECS/rudder-webapp.spec
@@ -391,7 +391,10 @@ fi
 
 # Adjust permissions on /var/rudder/configuration-repository
 chgrp -R %{config_repository_group} /var/rudder/configuration-repository
-chmod -R 2770 /var/rudder/configuration-repository
+## Add execution permission for ncf-api only on directories and files with user execution permission
+chmod -R u+rwX,g+rwsX %{ruddervardir}/configuration-repository/{ncf,techniques}
+## Add execution permission for ncf-apo on pre/post-hooks
+chmod -R 2770 %{ruddervardir}/configuration-repository/ncf/ncf-hooks.d/
 
 # Create a symlink to the Jetty context if necessary
 if [ -d "%{rudderdir}/jetty7/contexts" ]; then

diff --git a/rudder-webapp/debian/postinst b/rudder-webapp/debian/postinst
@@ -127,7 +127,11 @@ case "$1" in
 
   # Adjust permissions on /var/rudder/configuration-repository
   chgrp -R rudder /var/rudder/configuration-repository
-  chmod -R 2770 /var/rudder/configuration-repository
+  ## Add execution permission for ncf-api only on directories and files with user execution permission
+  chmod -R u+rwX,g+rwsX /var/rudder/configuration-repository/{ncf,techniques}
+  ## Add execution permission for ncf-apo on pre/post-hooks
+  chmod -R 2770 /var/rudder/configuration-repository/ncf/ncf-hooks.d/
+
 
 	# Only for Ubuntu:
 	## Change rsyslog port number since Ubuntu 12.04 doesn't allow to use standard