cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not hardcode /{etc,var}/tomcat/

Browse Source 
Fix the host-manager webapp

Fix {v5,v6}/pkg/README-main files
This commit is contained in:
dcoppa 2011-10-17 11:11:46 +00:00
parent c03bdea3e3
commit 8ffea42273
11 changed files with 68 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
www/tomcat/v5/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.22 2011/10/11 10:41:02 dcoppa Exp $
# $OpenBSD: Makefile,v 1.23 2011/10/17 11:11:46 dcoppa Exp $
COMMENT-main= Java servlet 2.4 and Java server pages 2.0 server
COMMENT-admin= administration web application
@ -10,6 +10,7 @@ PKGNAME= tomcat-${V}
PKGNAME-main= tomcat-${V}
PKGNAME-admin= tomcat-admin-${V}
PKGNAME-examples=tomcat-examples-${V}
REVISION-main= 0
CATEGORIES= www
DISTFILES= ${DISTNAME}.tar.gz \
@ -52,7 +53,7 @@ SAMPLEDIR= ${PREFIX}/share/examples/tomcat
SUBST_VARS+= CONFDIR CATALINA_BASE
post-extract:
rm -rf ${WRKDIST}/webapps/tomcat-docs
@rm -rf ${WRKDIST}/webapps/tomcat-docs
mv ${WRKDIR}/tomcat-5.5-doc ${WRKDIST}/webapps/tomcat-docs
do-install:
@ -60,8 +61,11 @@ do-install:
cd ${WRKDIST} && \
tar cf - bin common server `find * -prune -type f` | \
tar -C ${PREFIX}/tomcat -xf -
@rm ${PREFIX}/tomcat/server/webapps/host-manager/host-manager.xml
@rm ${PREFIX}/tomcat/server/webapps/manager/manager.xml
${INSTALL_DATA_DIR} ${SAMPLEDIR}
${INSTALL_DATA} `find ${WRKDIST}/conf/* -prune -type f` ${SAMPLEDIR}
${SUBST_CMD} ${SAMPLEDIR}/server.xml
${INSTALL_DATA} ${WRKDIST}/conf/Catalina/localhost/* \
${SAMPLEDIR}
${INSTALL_DATA_DIR} ${WRKINST}/${CATALINA_BASE}
@ -71,7 +75,7 @@ do-install:
${INSTALL_DATA_DIR} ${WRKINST}/${CONFDIR}/Catalina/localhost
${INSTALL_DATA} ${WRKDIST}/conf/Catalina/localhost/* \
${WRKINST}/${CONFDIR}/Catalina/localhost
rm -r ${PREFIX}/tomcat/bin/[xi]64
@rm -r ${PREFIX}/tomcat/bin/[xi]64
find ${WRKINST} \
-name \*.beforesubst -or \
-name \*.orig -or \

4
www/tomcat/v5/patches/patch-conf_server_xml
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-conf_server_xml,v 1.3 2007/12/11 23:43:03 kurt Exp $
$OpenBSD: patch-conf_server_xml,v 1.4 2011/10/17 11:11:46 dcoppa Exp $
--- conf/server.xml.orig Fri Aug 24 19:35:47 2007
+++ conf/server.xml Tue Dec 11 08:44:27 2007
@@ -91,7 +91,7 @@
@ -40,7 +40,7 @@ $OpenBSD: patch-conf_server_xml,v 1.3 2007/12/11 23:43:03 kurt Exp $
Note: XML Schema validation will not work with Xerces 2.2.
-->
- <Host name="localhost" appBase="webapps"
+ <Host name="localhost" appBase="/var/tomcat/webapps"
+ <Host name="localhost" appBase="${CATALINA_BASE}/webapps"
unpackWARs="true" autoDeploy="true"
xmlValidation="false" xmlNamespaceAware="false">

4
www/tomcat/v5/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.8 2011/07/24 11:11:58 dcoppa Exp $
@comment $OpenBSD: PLIST-main,v 1.9 2011/10/17 11:11:46 dcoppa Exp $
@conflict jakarta-tomcat-*
@pkgpath www/jakarta-tomcat/v5
@pkgpath www/tomcat/v5
@ -138,7 +138,6 @@ tomcat/server/webapps/host-manager/WEB-INF/
tomcat/server/webapps/host-manager/WEB-INF/lib/
tomcat/server/webapps/host-manager/WEB-INF/lib/catalina-host-manager.jar
tomcat/server/webapps/host-manager/WEB-INF/web.xml
tomcat/server/webapps/host-manager/host-manager.xml
tomcat/server/webapps/host-manager/images/
tomcat/server/webapps/host-manager/images/add.gif
tomcat/server/webapps/host-manager/images/asf-logo.gif
@ -169,7 +168,6 @@ tomcat/server/webapps/manager/images/tomcat.gif
tomcat/server/webapps/manager/images/update.gif
tomcat/server/webapps/manager/images/void.gif
tomcat/server/webapps/manager/manager-howto.html
tomcat/server/webapps/manager/manager.xml
tomcat/server/webapps/manager/status.xsd
tomcat/server/webapps/manager/xform.xsl
@rcscript ${RCDIR}/tomcat

16
www/tomcat/v5/pkg/README-main
View File

@ -1,4 +1,4 @@
$OpenBSD: README-main,v 1.5 2011/07/24 11:11:58 dcoppa Exp $
$OpenBSD: README-main,v 1.6 2011/10/17 11:11:46 dcoppa Exp $
+-----------------------------------------------------------------------
| Running ${FULLPKGNAME} on OpenBSD
@ -15,15 +15,16 @@ your own configuration for it or use the tomcat-examples package. A
sample config file can be found in ${TRUEPREFIX}/share/examples/tomcat.
The tomcat-examples package includes the examples, full documentation
and localhost config files for admin, host-manager and manager webapps.
and the localhost config files for the admin, host-manager and manager
webapps.
The packages are structured this way to facilitate maintaining a server
which normally would not contain the examples and documentation webapp
and optionally contain the admin webapp.
Tomcat on OpenBSD uses the `${SYSCONFDIR}/tomcat' directory for its configuration
files. `$CATALINA_BASE' is `${CATALINA_BASE}'. All files contained within
these directories should be owned by the _tomcat user.
Tomcat on OpenBSD uses the `${SYSCONFDIR}/tomcat' directory for its
configuration files. `$CATALINA_BASE' is `${CATALINA_BASE}'. All files
contained within these directories should be owned by the _tomcat user.
If you want Tomcat to serve on privileged ports (e.g. 80), redirect all
tcp traffic to port 80 to Tomcat's default listener port 8080 using a
@ -37,5 +38,6 @@ If you are upgrading and use database drivers, don't forget to copy them
into ${TRUEPREFIX}/tomcat/common/lib. If you use ssi or cgi, remember to
rename to jar the appropriate .renametojar files in
${TRUEPREFIX}/tomcat/server/lib. You must also delete any work files in
`${CATALINA_BASE}/work' unless you are reinstalling the same full version of
Tomcat.
`${CATALINA_BASE}/work' unless you are reinstalling the same full
version of Tomcat. When upgrading from older major versions of Tomcat,
config files in ${SYSCONFDIR}/tomcat should be updated as well.

15
www/tomcat/v6/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.16 2011/10/07 13:54:31 kurt Exp $
# $OpenBSD: Makefile,v 1.17 2011/10/17 11:11:46 dcoppa Exp $
COMMENT-main= Java servlet 2.5 and Java server pages 2.1 server
COMMENT-examples=example applications and full documentation
@ -8,7 +8,8 @@ DISTNAME= apache-tomcat-${V}
PKGNAME= tomcat-${V}
PKGNAME-main= tomcat-${V}
PKGNAME-examples=tomcat-examples-${V}
REVISION-main = 1
REVISION-main= 2
REVISION-examples= 0
CATEGORIES= www
DISTFILES= ${DISTNAME}.tar.gz \
@ -49,7 +50,7 @@ SAMPLEDIR= ${PREFIX}/share/examples/tomcat
SUBST_VARS+= CONFDIR CATALINA_BASE
post-extract:
rm -rf ${WRKDIST}/webapps/docs
@rm -rf ${WRKDIST}/webapps/docs
mv ${WRKDIR}/tomcat-6.0-doc ${WRKDIST}/webapps/docs
do-install:
@ -65,14 +66,22 @@ do-install:
tar cf - host-manager manager | \
tar -C ${PREFIX}/tomcat/webapps -xf -
${INSTALL_DATA} `find ${WRKDIST}/conf/* -prune -type f` ${SAMPLEDIR}
${SUBST_CMD} ${SAMPLEDIR}/server.xml
${INSTALL_DATA} ${WRKDIST}/webapps/host-manager/manager.xml \
${SAMPLEDIR}
${INSTALL_DATA} ${WRKDIST}/webapps/host-manager/manager.xml \
${SAMPLEDIR}/host-manager.xml
@perl -pi -e 's/manager/host-manager/' ${SAMPLEDIR}/host-manager.xml
cd ${WRKDIST}/webapps && \
tar cf - ROOT docs examples | \
tar -C ${WRKINST}/${CATALINA_BASE}/webapps -xf -
${INSTALL_DATA_DIR} ${WRKINST}/${CONFDIR}/Catalina/localhost
${INSTALL_DATA} ${WRKDIST}/webapps/host-manager/manager.xml \
${WRKINST}/${CONFDIR}/Catalina/localhost
${INSTALL_DATA} ${WRKDIST}/webapps/host-manager/manager.xml \
${WRKINST}/${CONFDIR}/Catalina/localhost/host-manager.xml
@perl -pi -e 's/manager/host-manager/' \
${WRKINST}/${CONFDIR}/Catalina/localhost/host-manager.xml
find ${WRKINST} \
-name \*.beforesubst -or \
-name \*.orig -or \

4
www/tomcat/v6/patches/patch-conf_server_xml
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-conf_server_xml,v 1.2 2011/07/04 07:41:37 dcoppa Exp $
$OpenBSD: patch-conf_server_xml,v 1.3 2011/10/17 11:11:46 dcoppa Exp $
--- conf/server.xml.orig Wed Feb 2 20:06:47 2011
+++ conf/server.xml Wed Jun 22 11:03:34 2011
@@ -66,12 +66,12 @@
@ -37,7 +37,7 @@ $OpenBSD: patch-conf_server_xml,v 1.2 2011/07/04 07:41:37 dcoppa Exp $
Note: XML Schema validation will not work with Xerces 2.2.
-->
- <Host name="localhost" appBase="webapps"
+ <Host name="localhost" appBase="/var/tomcat/webapps"
+ <Host name="localhost" appBase="${CATALINA_BASE}/webapps"
unpackWARs="true" autoDeploy="true"
xmlValidation="false" xmlNamespaceAware="false">

13
www/tomcat/v6/patches/patch-webapps_ROOT_index_html Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-webapps_ROOT_index_html,v 1.1 2011/10/17 11:11:46 dcoppa Exp $
--- webapps/ROOT/index.html.orig Tue Aug 16 14:25:24 2011
+++ webapps/ROOT/index.html Mon Oct 17 10:39:10 2011
@@ -115,7 +115,8 @@
<tr>
<td class="menu">
<a href="/manager/status">Status</a><br/>
- <a href="/manager/html">Tomcat&nbsp;Manager</a><br/>
+ <a href="/manager/html">Web&nbsp;Application&nbsp;Manager</a><br/>
+ <a href="/host-manager/html">Virtual&nbsp;Host&nbsp;Manager</a><br/>
&nbsp;
</td>
</tr>

13
www/tomcat/v6/patches/patch-webapps_ROOT_index_jsp Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-webapps_ROOT_index_jsp,v 1.1 2011/10/17 11:11:46 dcoppa Exp $
--- webapps/ROOT/index.jsp.orig Tue Aug 16 14:25:24 2011
+++ webapps/ROOT/index.jsp Mon Oct 17 10:37:08 2011
@@ -117,7 +117,8 @@
<td class="menu">
<a href="manager/status">Status</a><br/>
<!--<a href="admin">Tomcat&nbsp;Administration</a><br/>-->
- <a href="manager/html">Tomcat&nbsp;Manager</a><br/>
+ <a href="manager/html">Web&nbsp;Application&nbsp;Manager</a><br/>
+ <a href="host-manager/html">Virtual&nbsp;Host&nbsp;Manager</a><br/>
&nbsp;
</td>
</tr>

3
www/tomcat/v6/pkg/PLIST-examples
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-examples,v 1.4 2011/07/04 07:41:37 dcoppa Exp $
@comment $OpenBSD: PLIST-examples,v 1.5 2011/10/17 11:11:46 dcoppa Exp $
@conflict jakarta-tomcat-examples-*
@pkgpath www/jakarta-tomcat/v6,-examples
@owner _tomcat
@ -1962,4 +1962,5 @@ webapps/examples/servlets/sessions.html
@cwd ${CONFDIR}
Catalina/
Catalina/localhost/
Catalina/localhost/host-manager.xml
Catalina/localhost/manager.xml

3
www/tomcat/v6/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.4 2011/07/24 11:11:59 dcoppa Exp $
@comment $OpenBSD: PLIST-main,v 1.5 2011/10/17 11:11:46 dcoppa Exp $
@conflict jakarta-tomcat-*
@pkgpath www/tomcat/v6
@newgroup _tomcat:526
@ -28,6 +28,7 @@ share/examples/tomcat/context.xml
@sample ${SYSCONFDIR}/tomcat/context.xml
@owner
@group
share/examples/tomcat/host-manager.xml
share/examples/tomcat/logging.properties
@owner _tomcat
@group _tomcat

10
www/tomcat/v6/pkg/README-main
View File

@ -1,4 +1,4 @@
$OpenBSD: README-main,v 1.4 2011/07/24 11:11:59 dcoppa Exp $
$OpenBSD: README-main,v 1.5 2011/10/17 11:11:46 dcoppa Exp $
+-----------------------------------------------------------------------
| Running ${FULLPKGNAME} on OpenBSD
@ -7,11 +7,11 @@ $OpenBSD: README-main,v 1.4 2011/07/24 11:11:59 dcoppa Exp $
The tomcat package does not install the example webapps and
documentation. You must supply your own webapps and configuration or
install the tomcat-examples package for the example webapps and
documentation. Sample config files for the manager webapp can be found
in ${TRUEPREFIX}/share/examples/tomcat.
documentation. Sample config files for the host-manager and manager
webapps can be found in ${TRUEPREFIX}/share/examples/tomcat.
The tomcat-examples package includes the examples, full documentation
and the localhost config file for the manager webapp.
and the localhost config files for the host-manager and manager webapps.
The packages are structured this way to facilitate maintaining a server
which normally would not contain the examples and documentation webapp.
@ -32,4 +32,4 @@ If you are upgrading and use database drivers, don't forget to copy them
into ${TRUEPREFIX}/tomcat/lib. You must also delete any work files in
`${CATALINA_BASE}/work' unless you are reinstalling the same full
version of Tomcat. When upgrading from older major versions of Tomcat,
config files in /etc/tomcat should be updated as well.
config files in ${SYSCONFDIR}/tomcat should be updated as well.