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

Fix OpenDataKit URL confusion once more, related to #226 and others

Browse Source 
- Partially revert commit 955a178
 - Move ODK Build to port 8x17
This commit is contained in:
Disassembler 2018-03-17 16:13:16 +01:00
parent b298553bcf
commit f436a00223
Signed by: Disassembler
GPG Key ID: 524BD33A0EE29499
12 changed files with 210 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
README.md
View File

@ -59,28 +59,29 @@ vi 00-install.sh
## Port assignment ## Port assignment
| Application | Internal Port | HTTP Port | HTTPS Port | | Application | Internal Port | HTTP Port | HTTPS Port |
|-----------------|-----------------:|----------:|-----------:| |-----------------|------------------:|----------:|-----------:|
| ActiveMQ | 61616 (ActiveMQ) | N/A | N/A | | ActiveMQ | 61616 (ActiveMQ) | N/A | N/A |
| CKAN | 8003 (HTTP) | 8803 | 8403 | | CKAN | 8003 (HTTP) | 8803 | 8403 |
| CKAN Datapusher | 8004 (HTTP) | N/A | N/A | | CKAN Datapusher | 8004 (HTTP) | N/A | N/A |
| Crisis Cleanup | 8005 (HTTP) | 8805 | 8405 | | Crisis Cleanup | 8005 (HTTP) | 8805 | 8405 |
| CTS | 8006 (HTTP) | 8806 | 8406 | | CTS | 8006 (HTTP) | 8806 | 8406 |
| GNU Health | 8008 (HTTP) | 8808 | 8408 | | GNU Health | 8008 (HTTP) | 8808 | 8408 |
| KanBoard | 8009 (HTTP) | 8809 | 8409 | | KanBoard | 8009 (HTTP) | 8809 | 8409 |
| MariaDB | 3306 (MySQL) | N/A | N/A | | MariaDB | 3306 (MySQL) | N/A | N/A |
| Mifos X | 8012 (HTTP) | 8812 | 8412 | | Mifos X | 8012 (HTTP) | 8812 | 8412 |
| Motech | 8013 (HTTP) | 8813 | 8413 | | Motech | 8013 (HTTP) | 8813 | 8413 |
| OpenDataKit | 8015 (HTTP) | 8815 | 8415 | | ODK Aggregate | 8015, 8016 (HTTP) | 8815 | 8415 |
| OpenMapKit | 8007 (HTTP) | 8807 | 8407 | | ODK Build | 8017 (HTTP) | 8817 | 8417 |
| Pan.do/ra | 8002 (HTTP) | 8802 | 8402 | | OpenMapKit | 8007 (HTTP) | 8807 | 8407 |
| Postfix | 25 (SMTP) | N/A | N/A | | Pan.do/ra | 8002 (HTTP) | 8802 | 8402 |
| Postgres | 5432 (Postgres) | N/A | N/A | | Postfix | 25 (SMTP) | N/A | N/A |
| RabbitMQ | 5672 (AMQP) | N/A | N/A | | Postgres | 5432 (Postgres) | N/A | N/A |
| Redis | 6379 (Redis) | N/A | N/A | | RabbitMQ | 5672 (AMQP) | N/A | N/A |
| Sahana | 8001 (HTTP) | 8801 | 8401 | | Redis | 6379 (Redis) | N/A | N/A |
| SAMBRO | 8001 (HTTP) | 8899 | 8499 | | Sahana | 8001 (HTTP) | 8801 | 8401 |
| SeedDMS | 8010 (HTTP) | 8810 | 8410 | | SAMBRO | 8001 (HTTP) | 8899 | 8499 |
| Sigmah | 8011 (HTTP) | 8811 | 8011 | | SeedDMS | 8010 (HTTP) | 8810 | 8410 |
| Solr | 8983 (HTTP) | N/A | N/A | | Sigmah | 8011 (HTTP) | 8811 | 8011 |
| Ushahidi | 8014 (HTTP) | 8814 | 8414 | | Solr | 8983 (HTTP) | N/A | N/A |
| Ushahidi | 8014 (HTTP) | 8814 | 8414 |

2
opendatakit-build.sh
View File

@ -29,4 +29,4 @@ cp ${SOURCE_DIR}/etc/nginx/conf.d/opendatakit-build.conf /etc/nginx/conf.d/opend
service nginx reload service nginx reload
# Add portal application definition # Add portal application definition
portal-app-manager opendatakit-build "https://{host}:8416/" portal-app-manager opendatakit-build "https://{host}:8417/"

9
opendatakit-build/Dockerfile
View File

@ -18,17 +18,16 @@ RUN \
&& bundle install --without test \ && bundle install --without test \
&& rake deploy:build \ && rake deploy:build \
# Create OS user # Create OS user
&& addgroup -S -g 8016 odkbuild \ && addgroup -S -g 8017 odkbuild \
&& adduser -S -u 8016 -h /srv/odkbuild -s /bin/false -g odkbuild -G odkbuild odkbuild \ && adduser -S -u 8017 -h /srv/odkbuild -s /bin/false -g odkbuild -G odkbuild odkbuild \
&& chown -R odkbuild:odkbuild /srv/odkbuild \ && chown -R odkbuild:odkbuild /srv/odkbuild \
# Cleanup # Cleanup
&& apk --no-cache del .deps \ && apk --no-cache del .deps \
&& find /srv/odkbuild -name '.git*' -exec rm -rf {} + \ && find /srv/odkbuild -name '.git*' -exec rm -rf {} + \
&& rm -rf /root/.bundle && rm -rf /root/.bundle
# VOLUME ["/srv/crisiscleanup/config"] EXPOSE 8017
EXPOSE 8016
USER odkbuild USER odkbuild
WORKDIR /srv/odkbuild WORKDIR /srv/odkbuild
CMD ["bundle", "exec", "rackup", "config.ru", "-o", "0.0.0.0", "-p", "8016"] CMD ["bundle", "exec", "rackup", "config.ru", "-o", "0.0.0.0", "-p", "8017"]

2
opendatakit-build/etc/init.d/opendatakit-build
View File

@ -12,7 +12,7 @@ start() {
--name opendatakit-build \ --name opendatakit-build \
-h opendatakit-build \ -h opendatakit-build \
--link postgres \ --link postgres \
-p 127.0.0.1:8016:8016 \ -p 127.0.0.1:8017:8017 \
-v /srv/opendatakit-build/conf/config.yml:/srv/odkbuild/config.yml \ -v /srv/opendatakit-build/conf/config.yml:/srv/odkbuild/config.yml \
opendatakit-build opendatakit-build
} }

6
opendatakit-build/etc/nginx/conf.d/opendatakit-build.conf
View File

@ -1,11 +1,11 @@
server { server {
listen [::]:8816 ipv6only=off; listen [::]:8817 ipv6only=off;
listen [::]:8416 ssl http2 ipv6only=off; listen [::]:8417 ssl http2 ipv6only=off;
access_log /var/log/nginx/opendatakit-build.access.log; access_log /var/log/nginx/opendatakit-build.access.log;
error_log /var/log/nginx/opendatakit-build.error.log; error_log /var/log/nginx/opendatakit-build.error.log;
location / { location / {
proxy_pass http://127.0.0.1:8016; proxy_pass http://127.0.0.1:8017;
} }
} }

2
opendatakit.sh
View File

@ -20,6 +20,8 @@ export OPENDATAKIT_ADMIN_REALM=spotter
mkdir -p /srv/opendatakit/conf mkdir -p /srv/opendatakit/conf
envsubst <${SOURCE_DIR}/srv/opendatakit/conf/jdbc.properties >/srv/opendatakit/conf/jdbc.properties envsubst <${SOURCE_DIR}/srv/opendatakit/conf/jdbc.properties >/srv/opendatakit/conf/jdbc.properties
envsubst <${SOURCE_DIR}/srv/opendatakit/conf/security.properties >/srv/opendatakit/conf/security.properties envsubst <${SOURCE_DIR}/srv/opendatakit/conf/security.properties >/srv/opendatakit/conf/security.properties
cp ${SOURCE_DIR}/srv/opendatakit/conf/server.xml /srv/opendatakit/conf/server.xml
cp ${SOURCE_DIR}/srv/opendatakit/update-ip.sh /srv/opendatakit/update-ip.sh
chown -R 8015:8015 /srv/opendatakit/conf chown -R 8015:8015 /srv/opendatakit/conf
# Create OpenDataKit service # Create OpenDataKit service

5
opendatakit/Dockerfile
View File

@ -13,8 +13,6 @@ RUN \
# Deploy web archive # Deploy web archive
&& mkdir /srv/tomcat/webapps/aggregate \ && mkdir /srv/tomcat/webapps/aggregate \
&& unzip build/libs/aggregate-*.war -d /srv/tomcat/webapps/aggregate \ && unzip build/libs/aggregate-*.war -d /srv/tomcat/webapps/aggregate \
# Configure Tomcat port
&& sed -i 's/port="8080"/port="8015"/g' /srv/tomcat/conf/server.xml \
# 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 \
@ -23,8 +21,7 @@ RUN \
&& apk --no-cache del .deps \ && apk --no-cache del .deps \
&& rm -rf /root/.gradle /root/.java /srv/odk && rm -rf /root/.gradle /root/.java /srv/odk
# VOLUME ["/srv/tomcat/.motech"] EXPOSE 8015 8016
EXPOSE 8015
USER odk USER odk
WORKDIR /srv/tomcat WORKDIR /srv/tomcat

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

@ -7,6 +7,10 @@ depend() {
use dns logger netmount postfix use dns logger netmount postfix
} }
start_pre() {
/srv/opendatakit/update-ip.sh
}
start() { start() {
/usr/bin/docker run -d --rm \ /usr/bin/docker run -d --rm \
--name opendatakit \ --name opendatakit \
@ -14,6 +18,8 @@ start() {
--link postfix \ --link postfix \
--link postgres \ --link postgres \
-p 127.0.0.1:8015:8015 \ -p 127.0.0.1:8015:8015 \
-p 127.0.0.1:8016:8016 \
-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/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/security.properties:/srv/tomcat/webapps/aggregate/WEB-INF/classes/security.properties \
opendatakit opendatakit

12
opendatakit/etc/nginx/conf.d/opendatakit.conf
View File

@ -1,6 +1,5 @@
server { server {
listen [::]:8815 ipv6only=off; listen [::]:8815 ipv6only=off;
listen [::]:8415 ssl http2 ipv6only=off;
access_log /var/log/nginx/opendatakit.access.log; access_log /var/log/nginx/opendatakit.access.log;
error_log /var/log/nginx/opendatakit.error.log; error_log /var/log/nginx/opendatakit.error.log;
@ -9,3 +8,14 @@ server {
proxy_pass http://127.0.0.1:8015; proxy_pass http://127.0.0.1:8015;
} }
} }
server {
listen [::]:8415 ssl http2 ipv6only=off;
access_log /var/log/nginx/opendatakit.access.log;
error_log /var/log/nginx/opendatakit.error.log;
location / {
proxy_pass http://127.0.0.1:8016;
}
}

2
opendatakit/srv/opendatakit/conf/security.properties
View File

@ -17,7 +17,7 @@ security.server.secureChannelType=REQUIRES_SECURE_CHANNEL
# either REQUIRES_INSECURE_CHANNEL to secure nothing # either REQUIRES_INSECURE_CHANNEL to secure nothing
# or REQUIRES_SECURE_CHANNEL to secure everything # or REQUIRES_SECURE_CHANNEL to secure everything
# or perhaps ANY_CHANNEL when running through a proxy server # or perhaps ANY_CHANNEL when running through a proxy server
security.server.channelType=REQUIRES_INSECURE_CHANNEL security.server.channelType=ANY_CHANNEL
# When running under Tomcat, you need to set the hostname and port for # When running under Tomcat, you need to set the hostname and port for
# the server so that the background tasks can generate properly-constructed # the server so that the background tasks can generate properly-constructed

150
opendatakit/srv/opendatakit/conf/server.xml Normal file
View File

@ -0,0 +1,150 @@
<?xml version='1.0' encoding='utf-8'?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- Note: A "Server" is not itself a "Container", so you may not
define subcomponents such as "Valves" at this level.
Documentation at /docs/config/server.html
-->
<Server port="8005" shutdown="SHUTDOWN">
<Listener className="org.apache.catalina.startup.VersionLoggerListener" />
<!-- Security listener. Documentation at /docs/config/listeners.html
<Listener className="org.apache.catalina.security.SecurityListener" />
-->
<!--APR library loader. Documentation at /docs/apr.html -->
<Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
<!-- Prevent memory leaks due to use of particular java/javax APIs-->
<Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
<Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
<Listener className="org.apache.catalina.core.ThreadLocalLeakPreventionListener" />
<!-- Global JNDI resources
Documentation at /docs/jndi-resources-howto.html
-->
<GlobalNamingResources>
<!-- Editable user database that can also be used by
UserDatabaseRealm to authenticate users
-->
<Resource name="UserDatabase" auth="Container"
type="org.apache.catalina.UserDatabase"
description="User database that can be updated and saved"
factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
pathname="conf/tomcat-users.xml" />
</GlobalNamingResources>
<!-- A "Service" is a collection of one or more "Connectors" that share
a single "Container" Note: A "Service" is not itself a "Container",
so you may not define subcomponents such as "Valves" at this level.
Documentation at /docs/config/service.html
-->
<Service name="Catalina">
<!--The connectors can use a shared executor, you can define one or more named thread pools-->
<!--
<Executor name="tomcatThreadPool" namePrefix="catalina-exec-"
maxThreads="150" minSpareThreads="4"/>
-->
<!-- A "Connector" represents an endpoint by which requests are received
and responses are returned. Documentation at :
Java HTTP Connector: /docs/config/http.html (blocking & non-blocking)
Java AJP Connector: /docs/config/ajp.html
APR (HTTP/AJP) Connector: /docs/apr.html
Define a non-SSL/TLS HTTP/1.1 Connector on port 8080
-->
<Connector port="8015" protocol="HTTP/1.1"
connectionTimeout="20000"
proxyName="127.0.0.1"
proxyPort="8815"
redirectPort="8443" />
<Connector port="8016" protocol="HTTP/1.1"
connectionTimeout="20000"
proxyName="127.0.0.1"
proxyPort="8415"
scheme="https" secure="true"
redirectPort="8443" />
<!-- A "Connector" using the shared thread pool-->
<!--
<Connector executor="tomcatThreadPool"
port="8080" protocol="HTTP/1.1"
connectionTimeout="20000"
redirectPort="8443" />
-->
<!-- Define a SSL/TLS HTTP/1.1 Connector on port 8443
This connector uses the NIO implementation that requires the JSSE
style configuration. When using the APR/native implementation, the
OpenSSL style configuration is required as described in the APR/native
documentation -->
<!--
<Connector port="8443" protocol="org.apache.coyote.http11.Http11NioProtocol"
maxThreads="150" SSLEnabled="true" scheme="https" secure="true"
clientAuth="false" sslProtocol="TLS" />
-->
<!-- Define an AJP 1.3 Connector on port 8009 -->
<Connector port="8009" protocol="AJP/1.3" redirectPort="8443" />
<!-- An Engine represents the entry point (within Catalina) that processes
every request. The Engine implementation for Tomcat stand alone
analyzes the HTTP headers included with the request, and passes them
on to the appropriate Host (virtual host).
Documentation at /docs/config/engine.html -->
<!-- You should set jvmRoute to support load-balancing via AJP ie :
<Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1">
-->
<Engine name="Catalina" defaultHost="localhost">
<!--For clustering, please take a look at documentation at:
/docs/cluster-howto.html (simple how to)
/docs/config/cluster.html (reference documentation) -->
<!--
<Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster"/>
-->
<!-- Use the LockOutRealm to prevent attempts to guess user passwords
via a brute-force attack -->
<Realm className="org.apache.catalina.realm.LockOutRealm">
<!-- This Realm uses the UserDatabase configured in the global JNDI
resources under the key "UserDatabase". Any edits
that are performed against this UserDatabase are immediately
available for use by the Realm. -->
<Realm className="org.apache.catalina.realm.UserDatabaseRealm"
resourceName="UserDatabase"/>
</Realm>
<Host name="localhost" appBase="webapps"
unpackWARs="true" autoDeploy="true">
<!-- SingleSignOn valve, share authentication between web applications
Documentation at: /docs/config/valve.html -->
<!--
<Valve className="org.apache.catalina.authenticator.SingleSignOn" />
-->
<!-- Access log processes all example.
Documentation at: /docs/config/valve.html
Note: The pattern used is equivalent to using pattern="common" -->
<Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs"
prefix="localhost_access_log" suffix=".txt"
pattern="%h %l %u %t &quot;%r&quot; %s %b" />
</Host>
</Engine>
</Service>
</Server>

4
opendatakit/srv/opendatakit/update-ip.sh Executable file
View File

@ -0,0 +1,4 @@
#!/bin/sh
URL=$(ip route get 1 | awk '{print $NF;exit}')
sed -i "s|\(^\s\+proxyName\).*|\1=\"${URL}\"|g" /srv/opendatakit/conf/server.xml