Move ODK Aggregate to Tomcat root context

basic/srv/portal/index.html

@@ -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>
             </p>
             <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>
         </div>
 
         <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>
                 <a href="http://geoodk.com">GeoODK Collect</a> - náhrada papírových dotazníků smartphonem.
             </p>

opendatakit/Dockerfile

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

opendatakit/etc/init.d/opendatakit

@@ -13,8 +13,8 @@ start() {
 	--link postfix \
 	--link postgres \
 	-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/security.properties:/srv/tomcat/webapps/aggregate/WEB-INF/classes/security.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/ROOT/WEB-INF/classes/security.properties \
 	opendatakit
 }