Fix BZ#1295968: start of tomcat@httpfs
This commit is contained in:
Denis Arnaud
parent
116ce6cdee
commit
b0b4a537e7
|
|
@ -1,4 +1,2 @@
|
|||
/hadoop-2.0.5-b92d9bc.tar.gz
|
||||
/hadoop-2.2.0-2e01e27.tar.gz
|
||||
/hadoop-2.4.0-9d04888.tar.gz
|
||||
/hadoop-2.4.1-9e2ef43.tar.gz
|
||||
/tarballs/
|
||||
/clog
|
||||
|
|
|
|||
|
|
@ -1,46 +0,0 @@
|
|||
<?xml version='1.0' encoding='utf-8'?>
|
||||
<!--
|
||||
Licensed to the Apache Software Foundation (ASF) under one or more
|
||||
contributor license agreements. See the NOTICE file distributed with
|
||||
this work for additional information regarding copyright ownership.
|
||||
The ASF licenses this file to You under the Apache License, Version 2.0
|
||||
(the "License"); you may not use this file except in compliance with
|
||||
the License. You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
-->
|
||||
<tomcat-users>
|
||||
<!--
|
||||
NOTE: By default, no user is included in the "manager-gui" role required
|
||||
to operate the "/manager/html" web application. If you wish to use this app,
|
||||
you must define such a user - the username and password are arbitrary.
|
||||
-->
|
||||
<!--
|
||||
NOTE: The sample user and role entries below are wrapped in a comment
|
||||
and thus are ignored when reading this file. Do not forget to remove
|
||||
<!.. ..> that surrounds them.
|
||||
-->
|
||||
<!--
|
||||
<role rolename="tomcat"/>
|
||||
<role rolename="role1"/>
|
||||
<user username="tomcat" password="tomcat" roles="tomcat"/>
|
||||
<user username="both" password="tomcat" roles="tomcat,role1"/>
|
||||
<user username="role1" password="tomcat" roles="role1"/>
|
||||
-->
|
||||
|
||||
<!-- <role rolename="admin"/> -->
|
||||
<!-- <role rolename="admin-gui"/> -->
|
||||
<!-- <role rolename="admin-script"/> -->
|
||||
<!-- <role rolename="manager"/> -->
|
||||
<!-- <role rolename="manager-gui"/> -->
|
||||
<!-- <role rolename="manager-script"/> -->
|
||||
<!-- <role rolename="manager-jmx"/> -->
|
||||
<!-- <role rolename="manager-status"/> -->
|
||||
<!-- <user name="admin" password="adminadmin" roles="admin,manager,admin-gui,admin-script,manager-gui,manager-script,manager-jmx,manager-status" /> -->
|
||||
</tomcat-users>
|
||||
18
hadoop.spec
18
hadoop.spec
|
|
@ -23,7 +23,7 @@
|
|||
|
||||
Name: hadoop
|
||||
Version: 2.4.1
|
||||
Release: 11%{?dist}
|
||||
Release: 12%{?dist}
|
||||
Summary: A software platform for processing vast amounts of data
|
||||
# The BSD license file is missing
|
||||
# https://issues.apache.org/jira/browse/HADOOP-9849
|
||||
|
|
@ -41,7 +41,6 @@ Source10: %{name}-mapred-site.xml
|
|||
Source11: %{name}-yarn-site.xml
|
||||
Source12: %{name}-httpfs.sysconfig
|
||||
Source13: hdfs-create-dirs
|
||||
Source14: %{name}-tomcat-users.xml
|
||||
# This patch includes the following upstream tickets:
|
||||
# https://issues.apache.org/jira/browse/HADOOP-9613
|
||||
# https://issues.apache.org/jira/browse/HDFS-5411
|
||||
|
|
@ -104,6 +103,7 @@ BuildRequires: atinject
|
|||
BuildRequires: avalon-framework
|
||||
BuildRequires: avalon-logkit
|
||||
BuildRequires: avro
|
||||
BuildRequires: avro-maven-plugin
|
||||
BuildRequires: bookkeeper-java
|
||||
BuildRequires: cglib
|
||||
BuildRequires: checkstyle
|
||||
|
|
@ -762,13 +762,18 @@ popd
|
|||
# This is needed so the httpfs instance won't collide with a system running
|
||||
# tomcat
|
||||
for f in catalina.policy catalina.properties context.xml log4j.properties \
|
||||
tomcat.conf web.xml;
|
||||
tomcat.conf web.xml server.xml logging.properties;
|
||||
do
|
||||
cp -a %{_sysconfdir}/tomcat/$f %{buildroot}/%{_sysconfdir}/%{name}/tomcat
|
||||
done
|
||||
|
||||
install -m 660 %{SOURCE14} %{buildroot}/%{_sysconfdir}/%{name}/tomcat/tomcat-users.xml
|
||||
install -m 664 %{name}-hdfs-project/%{name}-hdfs-httpfs/src/main/tomcat/*.* %{buildroot}/%{_sysconfdir}/%{name}/tomcat
|
||||
# Replace, in place, the Tomcat configuration files delivered with the current
|
||||
# Fedora release. See BZ#1295968 for some reason.
|
||||
sed -i -e 's/8005/${httpfs.admin.port}/g' -e 's/8080/${httpfs.http.port}/g' %{buildroot}/%{_sysconfdir}/%{name}/tomcat/server.xml
|
||||
sed -i -e 's/catalina.base/httpfs.log.dir/g' %{buildroot}/%{_sysconfdir}/%{name}/tomcat/logging.properties
|
||||
# No longer needed: see above
|
||||
#install -m 660 %{SOURCE14} %{buildroot}/%{_sysconfdir}/%{name}/tomcat/tomcat-users.xml
|
||||
#install -m 664 %{name}-hdfs-project/%{name}-hdfs-httpfs/src/main/tomcat/ssl-server.xml %{buildroot}/%{_sysconfdir}/%{name}/tomcat
|
||||
|
||||
# Copy the httpfs webapp
|
||||
cp -arf %{name}-hdfs-project/%{name}-hdfs-httpfs/target/webhdfs %{buildroot}/%{_datadir}/%{name}/httpfs/tomcat/webapps
|
||||
|
|
@ -1114,6 +1119,9 @@ fi
|
|||
%attr(6050,root,yarn) %{_bindir}/container-executor
|
||||
|
||||
%changelog
|
||||
* Sat Jan 09 2016 Denis Arnaud <denis.arnaud@fedoraproject.org> 2.4.1-12
|
||||
- Fix BZ#1295968: start of tomcat@httpfs
|
||||
|
||||
* Wed Sep 09 2015 gil cattaneo <puntogil@libero.it> 2.4.1-11
|
||||
- fix FTBFS RHBZ#1239555
|
||||
- remove all BuildRequires which have been istalled by default
|
||||
|
|
|
|||
Loading…
Reference in New Issue