Repository: ambari Updated Branches: refs/heads/trunk 8e7a1db1b -> 70c4f7096
AMBARI-15629. Ambari2400: ambari-server install fails on Rhel7 (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/70c4f709 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/70c4f709 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/70c4f709 Branch: refs/heads/trunk Commit: 70c4f709642829fdcf513a274ccd58b156bea901 Parents: 8e7a1db Author: Andrew Onishuk <[email protected]> Authored: Wed Mar 30 17:05:27 2016 +0300 Committer: Andrew Onishuk <[email protected]> Committed: Wed Mar 30 17:05:27 2016 +0300 ---------------------------------------------------------------------- ambari-agent/pom.xml | 52 +++++++++++++++++++++++++++++++++++++++++----- ambari-server/pom.xml | 49 +++++++++++++++++++++++++++++++++++++++---- 2 files changed, 92 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/70c4f709/ambari-agent/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-agent/pom.xml b/ambari-agent/pom.xml index c2c993f..a8ed7f1 100644 --- a/ambari-agent/pom.xml +++ b/ambari-agent/pom.xml @@ -166,6 +166,7 @@ </execution> </executions> <configuration> + <copyright>2012, Apache Software Foundation</copyright> <group>Development</group> <description>Maven Recipe: RPM Package.</description> @@ -203,23 +204,64 @@ </source> </sources> </mapping> - <mapping> - <directory>/usr</directory> + <mapping> + <directory>/usr/sbin</directory> + <username>root</username> + <groupname>root</groupname> + <directoryIncluded>false</directoryIncluded> <!-- avoid managing /usr/sbin --> + <sources> + <source> + <location>${project.build.directory}${dirsep}${project.artifactId}-${project.version}/usr/sbin</location> + </source> + </sources> + </mapping> + <mapping> + <directory>/usr/lib/ambari-agent</directory> + <username>root</username> + <groupname>root</groupname> + <sources> + <source> + <location>${project.build.directory}${dirsep}${project.artifactId}-${project.version}/usr/lib/ambari-agent</location> + </source> + </sources> + </mapping> + <mapping> + <directory>/usr/lib/python2.6/site-packages</directory> + <username>root</username> + <groupname>root</groupname> + <sources> + <source> + <location>${project.build.directory}${dirsep}${project.artifactId}-${project.version}/usr/lib/python2.6/site-packages</location> + </source> + </sources> + </mapping> + <mapping> + <directory>/var/lib/ambari-agent</directory> + <username>root</username> + <groupname>root</groupname> + <sources> + <source> + <location>${project.build.directory}${dirsep}${project.artifactId}-${project.version}/var/lib/ambari-agent</location> + </source> + </sources> + </mapping> + <mapping> + <directory>/var/log/ambari-agent</directory> <username>root</username> <groupname>root</groupname> <sources> <source> - <location>${project.build.directory}${dirsep}${project.artifactId}-${project.version}/usr</location> + <location>${project.build.directory}${dirsep}${project.artifactId}-${project.version}/var/log/ambari-agent</location> </source> </sources> </mapping> <mapping> - <directory>/var</directory> + <directory>/var/run/ambari-agent</directory> <username>root</username> <groupname>root</groupname> <sources> <source> - <location>${project.build.directory}${dirsep}${project.artifactId}-${project.version}/var</location> + <location>${project.build.directory}${dirsep}${project.artifactId}-${project.version}/var/run/ambari-agent</location> </source> </sources> </mapping> http://git-wip-us.apache.org/repos/asf/ambari/blob/70c4f709/ambari-server/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml index 857e554..07a315d 100644 --- a/ambari-server/pom.xml +++ b/ambari-server/pom.xml @@ -400,23 +400,64 @@ </source> </sources> </mapping> + <mapping> + <directory>/usr/sbin</directory> + <username>root</username> + <groupname>root</groupname> + <directoryIncluded>false</directoryIncluded> <!-- avoid managing /usr/sbin --> + <sources> + <source> + <location>${project.build.directory}${dirsep}${project.artifactId}-${project.version}-dist/usr/sbin</location> + </source> + </sources> + </mapping> <mapping> - <directory>/usr</directory> + <directory>/usr/lib/ambari-server</directory> + <username>root</username> + <groupname>root</groupname> + <sources> + <source> + <location>${project.build.directory}${dirsep}${project.artifactId}-${project.version}-dist/usr/lib/ambari-server</location> + </source> + </sources> + </mapping> + <mapping> + <directory>/var/lib/ambari-server</directory> + <username>root</username> + <groupname>root</groupname> + <sources> + <source> + <location>${project.build.directory}${dirsep}${project.artifactId}-${project.version}-dist/var/lib/ambari-server</location> + </source> + </sources> + </mapping> + <mapping> + <directory>/usr/lib/python2.6/site-packages</directory> + <username>root</username> + <groupname>root</groupname> + <sources> + <source> + <location>${project.build.directory}${dirsep}${project.artifactId}-${project.version}-dist/usr/lib/python2.6/site-packages</location> + </source> + </sources> + </mapping> + <mapping> + <directory>/var/log/ambari-server</directory> <username>root</username> <groupname>root</groupname> <sources> <source> - <location>${project.build.directory}${dirsep}${project.artifactId}-${project.version}-dist/usr</location> + <location>${project.build.directory}${dirsep}${project.artifactId}-${project.version}-dist/var/log/ambari-server</location> </source> </sources> </mapping> <mapping> - <directory>/var</directory> + <directory>/var/run/ambari-server</directory> <username>root</username> <groupname>root</groupname> <sources> <source> - <location>${project.build.directory}${dirsep}${project.artifactId}-${project.version}-dist/var</location> + <location>${project.build.directory}${dirsep}${project.artifactId}-${project.version}-dist/var/run/ambari-server</location> </source> </sources> </mapping>
