Disassembler/Spotter-VM
1
0
Fork 0
Code Issues 78 Pull Requests Actions Packages Projects Releases Wiki Activity

Move ODK Aggregate to Tomcat root context

Browse Source
This commit is contained in:
Disassembler 2018-04-24 23:18:39 +02:00
parent 075945a858
commit cb1033fd19
Signed by: Disassembler
GPG Key ID: 524BD33A0EE29499
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
basic/srv/portal/index.html
View File

@ -89,12 +89,12 @@
<a href="https://opendatakit.org/downloads/download-info/odk-briefcase/"><img src="img/java.png" class="ico" alt="ODK Briefcase">ODK Briefcase</a><br> <a href="https://opendatakit.org/downloads/download-info/odk-briefcase/"><img src="img/java.png" class="ico" alt="ODK Briefcase">ODK Briefcase</a><br>
</p> </p>
<ul> <ul>
<li><strong>URL:</strong> <span class="clienturl">https://odk.{host}/aggregate</span></li> <li><strong>URL:</strong> <span class="clienturl">https://odk.{host}</span></li>
</ul> </ul>
</div> </div>
<div class="c" id="opendatakit"> <div class="c" id="opendatakit">
<h2><a href="https://odk.{host}/aggregate/"><img src="img/ODK.png" alt="Open Data Kit" title="Open Data Kit">ODK Aggregate</a></h2> <h2><a href="https://odk.{host}/"><img src="img/ODK.png" alt="Open Data Kit" title="Open Data Kit">ODK Aggregate</a></h2>
<p><strong>Sběr dat s pomocí smartphone</strong>.<br> <p><strong>Sběr dat s pomocí smartphone</strong>.<br>
<a href="http://geoodk.com">GeoODK Collect</a> - náhrada papírových dotazníků smartphonem. <a href="http://geoodk.com">GeoODK Collect</a> - náhrada papírových dotazníků smartphonem.
</p> </p>

4
opendatakit/Dockerfile
View File

@ -11,8 +11,8 @@ RUN \
&& cp gradle.properties.example gradle.properties \ && cp gradle.properties.example gradle.properties \
&& ./gradlew war \ && ./gradlew war \
# Deploy web archive # Deploy web archive
&& mkdir /srv/tomcat/webapps/aggregate \ && mkdir /srv/tomcat/webapps/ROOT \
&& unzip build/libs/aggregate-*.war -d /srv/tomcat/webapps/aggregate \ && unzip build/libs/aggregate-*.war -d /srv/tomcat/webapps/ROOT \
# Create OS user # Create OS user
&& addgroup -S -g 8015 odk \ && addgroup -S -g 8015 odk \
&& adduser -S -u 8015 -h /srv/tomcat -s /bin/false -g odk -G odk odk \ && adduser -S -u 8015 -h /srv/tomcat -s /bin/false -g odk -G odk odk \

4
opendatakit/etc/init.d/opendatakit
View File

@ -13,8 +13,8 @@ start() {
--link postfix \ --link postfix \
--link postgres \ --link postgres \
-v /srv/opendatakit/conf/server.xml:/srv/tomcat/conf/server.xml \ -v /srv/opendatakit/conf/server.xml:/srv/tomcat/conf/server.xml \
-v /srv/opendatakit/conf/jdbc.properties:/srv/tomcat/webapps/aggregate/WEB-INF/classes/jdbc.properties \ -v /srv/opendatakit/conf/jdbc.properties:/srv/tomcat/webapps/ROOT/WEB-INF/classes/jdbc.properties \
-v /srv/opendatakit/conf/security.properties:/srv/tomcat/webapps/aggregate/WEB-INF/classes/security.properties \ -v /srv/opendatakit/conf/security.properties:/srv/tomcat/webapps/ROOT/WEB-INF/classes/security.properties \
opendatakit opendatakit
} }