Unify OMK naming and nginx configuration for spotter-appmgr

This commit is contained in:
Disassembler 2018-03-25 23:17:58 +02:00
parent c0d9204daf
commit 2c33b9a9c6
Signed by: Disassembler
GPG Key ID: 524BD33A0EE29499
5 changed files with 10 additions and 22 deletions

View File

@ -17,11 +17,7 @@ cp ${SOURCE_DIR}/etc/init.d/openmapkit /etc/init.d/openmapkit
rc-update add openmapkit rc-update add openmapkit
service openmapkit start service openmapkit start
# Create nginx app definition # Add application definition
cp ${SOURCE_DIR}/etc/nginx/conf.d/openmapkit.conf /etc/nginx/conf.d/openmapkit.conf spotter-appmgr add-app openmapkit "https://openmapkit.{host}/" admin "${OMK_ADMIN_PWD}"
service nginx reload spotter-appmgr add-app openmapkit-clients -p clienturl "https://openmapkit.{host}"
spotter-appmgr add-app geoodk-clients -p clienturl "https://openmapkit.{host}"
# Add portal application definition
portal-app-manager openmapkit "https://{host}:8407/" admin "${OMK_ADMIN_PWD}"
portal-app-manager openmapkit-clients -p clienturl "http://{host}:8807"
portal-app-manager geoodk-clients -p clienturl "http://{host}:8807"

View File

@ -44,7 +44,7 @@ RUN \
&& rm -rf /root/.cache /root/.config /root/.node-gyp /root/.npm && rm -rf /root/.cache /root/.config /root/.node-gyp /root/.npm
VOLUME ["/srv/openmapkit/data"] VOLUME ["/srv/openmapkit/data"]
EXPOSE 8007 EXPOSE 8080
USER omk USER omk
ENV NODE_ENV production ENV NODE_ENV production

View File

@ -11,12 +11,15 @@ start() {
/usr/bin/docker run -d --rm \ /usr/bin/docker run -d --rm \
--name openmapkit \ --name openmapkit \
-h openmapkit \ -h openmapkit \
-p 127.0.0.1:8007:8007 \
-v /srv/openmapkit/conf/settings.js:/srv/openmapkit/settings.js \ -v /srv/openmapkit/conf/settings.js:/srv/openmapkit/settings.js \
-v /srv/openmapkit/data:/srv/openmapkit/data \ -v /srv/openmapkit/data:/srv/openmapkit/data \
openmapkit openmapkit
} }
start_post() {
/usr/local/bin/spotter-appmgr update-hosts openmapkit
}
stop() { stop() {
/usr/bin/docker stop openmapkit /usr/bin/docker stop openmapkit
} }

View File

@ -1,11 +0,0 @@
server {
listen [::]:8807 ipv6only=off;
listen [::]:8407 ssl http2 ipv6only=off;
access_log /var/log/nginx/openmapkit.access.log;
error_log /var/log/nginx/openmapkit.error.log;
location / {
proxy_pass http://127.0.0.1:8007;
}
}

View File

@ -1,7 +1,7 @@
module.exports = { module.exports = {
name: 'OpenMapKit Server', name: 'OpenMapKit Server',
description: 'OpenMapKit Server is the lightweight server component of OpenMapKit that handles the collection and aggregation of OpenStreetMap and OpenDataKit data.', description: 'OpenMapKit Server is the lightweight server component of OpenMapKit that handles the collection and aggregation of OpenStreetMap and OpenDataKit data.',
port: 8007, port: 8080,
dataDir: __dirname + '/data', dataDir: __dirname + '/data',
pagesDir: __dirname + '/pages', pagesDir: __dirname + '/pages',
hostUrl: 'http://posm.io', hostUrl: 'http://posm.io',