summaryrefslogtreecommitdiffstats
path: root/packaging
diff options
context:
space:
mode:
authorLisa Stillwell <lisa@lisa-VirtualBox.(none)>2012-10-11 22:12:31 (GMT)
committer Lisa Stillwell <lisa@lisa-VirtualBox.(none)>2012-10-11 22:12:31 (GMT)
commit02cf31ebbcf833f141d473f18c7003eb8fd44453 (patch)
tree31f78e5510efda9aee3340f60199cbc7ac49d830 /packaging
parent59edccf89474c201a4210852c53f19a0a5e00006 (diff)
downloadQCG-Data-02cf31ebbcf833f141d473f18c7003eb8fd44453.zip
QCG-Data-02cf31ebbcf833f141d473f18c7003eb8fd44453.tar.gz
QCG-Data-02cf31ebbcf833f141d473f18c7003eb8fd44453.tar.bz2
[#769] change default tomcat version from 7 to 6
Diffstat (limited to 'packaging')
-rw-r--r--packaging/idrop-web.list.template14
1 files changed, 7 insertions, 7 deletions
diff --git a/packaging/idrop-web.list.template b/packaging/idrop-web.list.template
index d30e537..39a3044 100644
--- a/packaging/idrop-web.list.template
+++ b/packaging/idrop-web.list.template
@@ -10,7 +10,7 @@
# %requires httpd 2
%if DEB
-%requires tomcat7
+%requires tomcat6
%requires openjdk-6-jre
%else
%requires java 6
@@ -30,8 +30,8 @@ $TOMCAT_STARTED=false
# these tomcat vars used for tomcat install on rpm systems
$TOMCAT_EXTRACT_DIR=/var/lib
-$TOMCAT_VER=7
-$TOMCAT_VER_DOT=0.29
+$TOMCAT_VER=6
+$TOMCAT_VER_DOT=0.35
$TOMCAT_FILE=apache-tomcat-${TOMCAT_VER}.${TOMCAT_VER_DOT}
$TOMCAT_ARC_FILE=${TOMCAT_FILE}.tar.gz
$TOMCAT_HTTP_HOST=http://apache.mirrors.pair.com/tomcat/tomcat-${TOMCAT_VER}/v${TOMCAT_VER}.${TOMCAT_VER_DOT}/bin/
@@ -40,13 +40,13 @@ $TOMCAT_TMP_LOC=/tmp/tomcat${TOMCAT_VER}.tar.gz
%if DEB
# these tomcat vars used for tomcat install on debian systems
# hopefully everything will migrate to use these vars when centos
-# finally catches up with support for tomcat 7
-$OS_TOMCAT_ACCT=tomcat7
+# finally catches up with support for tomcat 6
+$OS_TOMCAT_ACCT=tomcat6
$TOMCAT_HOME_DIR=/var/lib/${OS_TOMCAT_ACCT}
$DEB=true
%else
$TOMCAT_HOME_DIR=${TOMCAT_EXTRACT_DIR}/idrop-tomcat-${TOMCAT_VER}.${TOMCAT_VER_DOT}
-$OS_TOMCAT_ACCT=idroptc7
+$OS_TOMCAT_ACCT=idroptc6
$RPM=true
%endif
@@ -54,7 +54,7 @@ $RPM=true
# preinstall directives
# =-=-=-=-=-=-=-
-# if this is a centos install, use wget to download tomcat 7
+# if this is a centos install, use wget to download tomcat 6
# and install manually # also add a service account for tomcat
%if RPM
%preinstall << END_PREINSTALL