Merge branch 'bug_9520/sometime_ppkeys_is_not_700_pr' into branches/r…

…udder/4.0
Normation · Oct 24, 2016 · c334d29 · c334d29
2 parents 7adddcc + b545eef
commit c334d29
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/rudder-agent/SOURCES/rudder-agent-postinst b/rudder-agent/SOURCES/rudder-agent-postinst
@@ -77,6 +77,8 @@ fi
 if [ ! -f ${CFE_DIR}/ppkeys/localhost.priv ]
 then
   echo -n "INFO: Creating keys for CFEngine agent..."
+  # The chmod is a workaround for the limitations of rpm in rhel6 but it could be useful in other situations
+  chmod 700 ${CFE_DIR}/ppkeys
   ${CFE_DIR}/bin/cf-key >> ${LOG_FILE} 2>&1
   echo " Done."
 fi

diff --git a/rudder-agent/SPECS/rudder-agent.spec b/rudder-agent/SPECS/rudder-agent.spec
@@ -460,7 +460,7 @@ rm -f %{_builddir}/file.list.%{name}
 # existing file declared in conffiles
 %ghost %{rudderdir}/etc/uuid.hive
 
-%attr(0700, -, -) %{ruddervardir}/cfengine-community/ppkeys
+%attr(0700, -, -) %dir %{ruddervardir}/cfengine-community/ppkeys
 %dir %{ruddervardir}/cfengine-community/bin
 %dir %{ruddervardir}/cfengine-community/inputs
 %dir %{ruddervardir}/tmp