Updated Branches:
  refs/heads/branch-1.4.2 a66a3206b -> 71173a313

Revert "AMBARI-3615. Ambari agent creates empty folder /var/ambari-agent (dsen)"

This reverts commit a66a3206b6201710366ec1cbc497fb0e328c3388.


Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/71173a31
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/71173a31
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/71173a31

Branch: refs/heads/branch-1.4.2
Commit: 71173a31326ffbc09e6c4ed701f0adc0370f9637
Parents: a66a320
Author: Dmitry Sen <[email protected]>
Authored: Tue Oct 29 19:50:01 2013 +0200
Committer: Dmitry Sen <[email protected]>
Committed: Tue Oct 29 19:50:01 2013 +0200

----------------------------------------------------------------------
 ambari-agent/conf/unix/ambari-agent.ini | 2 +-
 ambari-agent/pom.xml                    | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/71173a31/ambari-agent/conf/unix/ambari-agent.ini
----------------------------------------------------------------------
diff --git a/ambari-agent/conf/unix/ambari-agent.ini 
b/ambari-agent/conf/unix/ambari-agent.ini
index 249f9d8..ca94ba1 100644
--- a/ambari-agent/conf/unix/ambari-agent.ini
+++ b/ambari-agent/conf/unix/ambari-agent.ini
@@ -27,7 +27,7 @@ ping_port=8670
 cache_dir=/var/lib/ambari-agent/cache
 
 [stack]
-installprefix=/var/run/ambari-agent/
+installprefix=/var/ambari-agent/
 upgradeScriptsDir=/var/lib/ambari-agent/upgrade_stack
 
 [puppet]

http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/71173a31/ambari-agent/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-agent/pom.xml b/ambari-agent/pom.xml
index 41a225f..e05eba4 100644
--- a/ambari-agent/pom.xml
+++ b/ambari-agent/pom.xml
@@ -323,6 +323,12 @@
               <groupname>root</groupname>
             </mapping>
             <mapping>
+              <directory>/var/ambari-agent</directory>
+              <filemode>755</filemode>
+              <username>root</username>
+              <groupname>root</groupname>
+            </mapping>
+            <mapping>
               <directory>/etc/rc.d/init.d</directory>
               <filemode>755</filemode>
               <username>root</username>

Reply via email to