Commit 9b0ec4c8 authored by Piotr Gawron's avatar Piotr Gawron
Browse files

support for tomcat9 added

parent 2be54c75
......@@ -26,6 +26,7 @@ minerva (14.0.0~alpha.0) unstable; urgency=low
visible in overlay list (#838)
* Small improvement: publication list is resizable (#740)
* Small improvement: user list on project edit dialog is sortable (#808)
* Small improvement: debian package can be installed on debian:buster (#879)
* Bug fix: export to CellDesigner of reaction with two modifiers connected
with boolean operator resulted was skipping some layout information
* Bug fix: reaction in SBGNML file containing two products was improperly
......
/var/log/tomcat7/minerva.txt {
/var/log/tomcat8/minerva.txt {
copytruncate
size 32k
weekly
......@@ -6,5 +6,5 @@
rotate 52
compress
missingok
create 640 tomcat7 adm
create 640 tomcat8 adm
}
......@@ -20,6 +20,7 @@ fi
TOMCAT_PACKAGE="";
TOMCAT7_OK=$(dpkg-query -W --showformat='${Status}\n' tomcat7|grep "install ok installed")
TOMCAT8_OK=$(dpkg-query -W --showformat='${Status}\n' tomcat8|grep "install ok installed")
TOMCAT9_OK=$(dpkg-query -W --showformat='${Status}\n' tomcat9|grep "install ok installed")
if [ "$TOMCAT7_OK" != "" ];
then
TOMCAT_PACKAGE='tomcat7'
......@@ -29,5 +30,10 @@ then
TOMCAT_PACKAGE='tomcat8'
fi
if [ "$TOMCAT9_OK" != "" ];
then
TOMCAT_PACKAGE='tomcat9'
fi
POSTGRES_OK=$(dpkg-query -W --showformat='${Status}\n' postgresql|grep "install ok installed")
......@@ -3,7 +3,7 @@ Priority: optional
Maintainer: Piotr Gawron <piotr.gawron@uni.lu>
Standards-Version: 3.9.7
#Vcs-Git: git://anonscm.debian.org/collab-maint/minerva.git
#Vcs-Browser: http://anonscm.debian.org/?p=collab-maint/minerva.git;a=summary
Vcs-Browser: https://git-r3lab.uni.lu/minerva/core
Package: minerva
Description: Standalone web application for visualization, exploration and
......@@ -15,4 +15,4 @@ Description: Standalone web application for visualization, exploration and
Section: science
Homepage: http://r3lab.uni.lu/web/minerva-website/
Recommends: postgresql (>=9.3)
Depends: ${misc:Depends}, openjdk-8-jre-headless, dbconfig-pgsql | dbconfig-no-thanks, tomcat7 | tomcat8
Depends: ${misc:Depends}, openjdk-8-jre-headless | openjdk-11-jre-headless, dbconfig-pgsql | dbconfig-no-thanks, tomcat7 | tomcat8 |tomcat9
......@@ -50,7 +50,7 @@ man(1), man(7), http://www.tldp.org/HOWTO/Man-Page/
<!-- dhusername could also be set to "&dhfirstname; &dhsurname;". -->
<!ENTITY dhusername "Piotr Gawron">
<!ENTITY dhemail "piotr.gawron@uni.lu">
<!ENTITY dhhomepage "http://r3lab.uni.lu/web/minerva-website/">
<!ENTITY dhhomepage "https://minerva.pages.uni.lu/doc/">
<!-- SECTION should be 1-8, maybe w/ subsection other parameters are
allowed: see man(7), man(1) and
http://www.tldp.org/HOWTO/Man-Page/q2.html. -->
......@@ -135,9 +135,15 @@ man(1), man(7), http://www.tldp.org/HOWTO/Man-Page/
<title>FILES</title>
<variablelist>
<varlistentry>
<term><filename>/var/lib/tomcat7/webapps/minerva.war</filename></term>
<term><filename>/var/lib/tomcat9/webapps/minerva.war</filename></term>
<listitem>
<para>Deployable web application for <application>tomcat7</application>.</para>
<para>Deployable web application for <application>tomcat9</application>.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><filename>/var/lib/tomcat8/webapps/minerva.war</filename></term>
<listitem>
<para>Deployable web application for <application>tomcat8</application>.</para>
</listitem>
</varlistentry>
</variablelist>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment