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

Reorganize HTTP ports to avoid header confusion

Browse Source
This commit is contained in:
Disassembler 2018-02-01 14:55:24 +01:00
parent 086372e065
commit 4451d479a2
No known key found for this signature in database
GPG Key ID: 524BD33A0EE29499
33 changed files with 68 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
README.md
View File

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

4
ckan-datapusher.sh
View File

@ -15,7 +15,3 @@ chown -R 8004:8004 /srv/ckan-datapusher/data
cp ${SOURCE_DIR}/etc/init.d/ckan-datapusher /etc/init.d/ckan-datapusher
rc-update add ckan-datapusher boot
service ckan-datapusher start
# Create nginx app definition
cp ${SOURCE_DIR}/etc/nginx/conf.d/ckan-datapusher.conf /etc/nginx/conf.d/ckan-datapusher.conf
service nginx reload

1
ckan-datapusher/etc/init.d/ckan-datapusher
View File

@ -11,7 +11,6 @@ start() {
/usr/bin/docker run -d --rm \
--name ckan-datapusher \
-h ckan-datapusher \
-p 127.0.0.1:9004:8004 \
-v /srv/ckan-datapusher/conf:/etc/ckan-datapusher \
-v /srv/ckan-datapusher/data:/srv/ckan-datapusher/data \
ckan-datapusher

13
ckan-datapusher/etc/nginx/conf.d/ckan-datapusher.conf
View File

@ -1,13 +0,0 @@
server {
listen [::1]:8004 ipv6only=off;
access_log /var/log/nginx/ckan-datapusher.access.log;
error_log /var/log/nginx/ckan-datapusher.error.log;
location / {
proxy_set_header X-Forwarded-For $remote_addr;
proxy_set_header X-Forwarded-Host $host:$server_port;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_pass http://127.0.0.1:9004;
}
}

2
ckan/etc/init.d/ckan
View File

@ -20,7 +20,7 @@ start() {
--link redis \
--link solr \
--link ckan-datapusher \
-p 127.0.0.1:9003:8003 \
-p 127.0.0.1:8003:8003 \
-v /srv/ckan/conf:/etc/ckan \
-v /srv/ckan/data:/srv/ckan/storage \
ckan

4
ckan/etc/nginx/conf.d/ckan.conf
View File

@ -1,5 +1,5 @@
server {
listen [::]:8003 ipv6only=off;
listen [::]:8803 ipv6only=off;
listen [::]:8403 ssl http2 ipv6only=off;
access_log /var/log/nginx/ckan.access.log;
@ -9,6 +9,6 @@ server {
proxy_set_header X-Forwarded-For $remote_addr;
proxy_set_header X-Forwarded-Host $host:$server_port;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_pass http://127.0.0.1:9003;
proxy_pass http://127.0.0.1:8003;
}
}

2
crisiscleanup/etc/init.d/crisiscleanup
View File

@ -13,7 +13,7 @@ start() {
--name crisiscleanup \
-h crisiscleanup \
--link postgres \
-p 127.0.0.1:9005:8005 \
-p 127.0.0.1:8005:8005 \
-v /srv/crisiscleanup/conf:/srv/crisiscleanup/config \
crisiscleanup
}

4
crisiscleanup/etc/nginx/conf.d/crisiscleanup.conf
View File

@ -1,5 +1,5 @@
server {
listen [::]:8005 ipv6only=off;
listen [::]:8805 ipv6only=off;
listen [::]:8405 ssl http2 ipv6only=off;
access_log /var/log/nginx/crisiscleanup.access.log;
@ -9,6 +9,6 @@ server {
proxy_set_header X-Forwarded-For $remote_addr;
proxy_set_header X-Forwarded-Host $host:$server_port;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_pass http://127.0.0.1:9005;
proxy_pass http://127.0.0.1:8005;
}
}

2
cts/etc/init.d/cts
View File

@ -13,7 +13,7 @@ start() {
--name cts \
-h cts \
--link postgres \
-p 127.0.0.1:9006:8006 \
-p 127.0.0.1:8006:8006 \
-v /srv/cts/conf:/srv/cts/cts/settings \
cts
}

4
cts/etc/nginx/conf.d/cts.conf
View File

@ -1,5 +1,5 @@
server {
listen [::]:8006 ipv6only=off;
listen [::]:8806 ipv6only=off;
listen [::]:8406 ssl http2 ipv6only=off;
access_log /var/log/nginx/cts.access.log;
@ -9,6 +9,6 @@ server {
proxy_set_header X-Forwarded-For $remote_addr;
proxy_set_header X-Forwarded-Host $host:$server_port;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_pass http://127.0.0.1:9006;
proxy_pass http://127.0.0.1:8006;
}
}

2
gnuhealth/etc/init.d/gnuhealth
View File

@ -13,7 +13,7 @@ start() {
--name gnuhealth \
-h gnuhealth \
--link postgres \
-p 127.0.0.1:9008:8008 \
-p 127.0.0.1:8008:8008 \
-v /srv/gnuhealth/conf:/srv/gnuhealth/gnuhealth/tryton/server/config \
gnuhealth
}

4
gnuhealth/etc/nginx/conf.d/gnuhealth.conf
View File

@ -1,5 +1,5 @@
server {
listen [::]:8008 ipv6only=off;
listen [::]:8808 ipv6only=off;
listen [::]:8408 ssl http2 ipv6only=off;
access_log /var/log/nginx/gnuhealth.access.log;
@ -9,6 +9,6 @@ server {
proxy_set_header X-Forwarded-For $remote_addr;
proxy_set_header X-Forwarded-Host $host:$server_port;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_pass http://127.0.0.1:9008;
proxy_pass http://127.0.0.1:8008;
}
}

2
kanboard/etc/init.d/kanboard
View File

@ -13,7 +13,7 @@ start() {
--name kanboard \
-h kanboard \
--link postgres \
-p 127.0.0.1:9009:8009 \
-p 127.0.0.1:8009:8009 \
-v /srv/kanboard/data:/srv/kanboard/data/files \
-v /srv/kanboard/conf/config.php:/srv/kanboard/config.php \
kanboard

4
kanboard/etc/nginx/conf.d/kanboard.conf
View File

@ -1,5 +1,5 @@
server {
listen [::]:8009 ipv6only=off;
listen [::]:8809 ipv6only=off;
listen [::]:8409 ssl http2 ipv6only=off;
access_log /var/log/nginx/kanboard.access.log;
@ -9,6 +9,6 @@ server {
proxy_set_header X-Forwarded-For $remote_addr;
proxy_set_header X-Forwarded-Host $host:$server_port;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_pass http://127.0.0.1:9009;
proxy_pass http://127.0.0.1:8009;
}
}

2
mifosx/etc/init.d/mifosx
View File

@ -13,7 +13,7 @@ start() {
--name mifosx \
-h mifosx \
--link mariadb \
-p 127.0.0.1:9012:8012 \
-p 127.0.0.1:8012:8012 \
-v /srv/mifosx/conf/context.xml:/srv/tomcat/webapps/fineract-provider/META-INF/context.xml \
mifosx
}

4
mifosx/etc/nginx/conf.d/mifosx.conf
View File

@ -1,5 +1,5 @@
server {
listen [::]:8012 ipv6only=off;
listen [::]:8812 ipv6only=off;
listen [::]:8412 ssl http2 ipv6only=off;
access_log /var/log/nginx/mifosx.access.log;
@ -9,6 +9,6 @@ server {
proxy_set_header X-Forwarded-For $remote_addr;
proxy_set_header X-Forwarded-Host $host:$server_port;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_pass http://127.0.0.1:9012;
proxy_pass http://127.0.0.1:8012;
}
}

4
motech.sh
View File

@ -31,13 +31,13 @@ service motech start
# Configure Motech admin
echo `date` '- Waiting for database to be populated. This should take about a minute.'
until curl -s http://127.0.0.1:9013/motech/module/server/startup/ | grep -q adminLogin; do
until curl -s http://127.0.0.1:8013/motech/module/server/startup/ | grep -q adminLogin; do
sleep 1
done
export MOTECH_ADMIN_USER="admin"
export MOTECH_ADMIN_EMAIL="admin@example.com"
export MOTECH_ADMIN_PWD=$(head -c 12 /dev/urandom | base64)
curl -H "Content-Type: application/json" -X POST -d "{\"adminLogin\":\"${MOTECH_ADMIN_USER}\",\"adminEmail\":\"${MOTECH_ADMIN_EMAIL}\",\"adminPassword\":\"${MOTECH_ADMIN_PWD}\",\"adminConfirmPassword\":\"${MOTECH_ADMIN_PWD}\",\"language\":\"cs\",\"providerName\":\"\",\"providerUrl\":\"\",\"schedulerUrl\":\"\"}" http://127.0.0.1:9013/motech/module/server/startup/
curl -H "Content-Type: application/json" -X POST -d "{\"adminLogin\":\"${MOTECH_ADMIN_USER}\",\"adminEmail\":\"${MOTECH_ADMIN_EMAIL}\",\"adminPassword\":\"${MOTECH_ADMIN_PWD}\",\"adminConfirmPassword\":\"${MOTECH_ADMIN_PWD}\",\"language\":\"cs\",\"providerName\":\"\",\"providerUrl\":\"\",\"schedulerUrl\":\"\"}" http://127.0.0.1:8013/motech/module/server/startup/
# Create nginx app definition
cp ${SOURCE_DIR}/etc/nginx/conf.d/motech.conf /etc/nginx/conf.d/motech.conf

2
motech/etc/init.d/motech
View File

@ -14,7 +14,7 @@ start() {
-h motech \
--link activemq \
--link postgres \
-p 127.0.0.1:9013:8013 \
-p 127.0.0.1:8013:8013 \
-v /srv/motech/conf:/srv/tomcat/.motech \
motech
}

4
motech/etc/nginx/conf.d/motech.conf
View File

@ -1,5 +1,5 @@
server {
listen [::]:8013 ipv6only=off;
listen [::]:8813 ipv6only=off;
listen [::]:8413 ssl http2 ipv6only=off;
access_log /var/log/nginx/motech.access.log;
@ -9,6 +9,6 @@ server {
proxy_set_header X-Forwarded-For $remote_addr;
proxy_set_header X-Forwarded-Host $host:$server_port;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_pass http://127.0.0.1:9013;
proxy_pass http://127.0.0.1:8013;
}
}

2
openmapkit/etc/init.d/openmapkit
View File

@ -11,7 +11,7 @@ start() {
/usr/bin/docker run -d --rm \
--name openmapkit \
-h openmapkit \
-p 127.0.0.1:9007:8007 \
-p 127.0.0.1:8007:8007 \
-v /srv/openmapkit/conf/settings.js:/srv/openmapkit/settings.js \
-v /srv/openmapkit/data:/srv/openmapkit/data \
openmapkit

4
openmapkit/etc/nginx/conf.d/openmapkit.conf
View File

@ -1,5 +1,5 @@
server {
listen [::]:8007 ipv6only=off;
listen [::]:8807 ipv6only=off;
listen [::]:8407 ssl http2 ipv6only=off;
access_log /var/log/nginx/openmapkit.access.log;
@ -9,6 +9,6 @@ server {
proxy_set_header X-Forwarded-For $remote_addr;
proxy_set_header X-Forwarded-Host $host:$server_port;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_pass http://127.0.0.1:9007;
proxy_pass http://127.0.0.1:8007;
}
}

2
pandora/etc/init.d/pandora
View File

@ -14,7 +14,7 @@ start() {
-h pandora \
--link postgres \
--link rabbitmq \
-p 127.0.0.1:9011:8002 \
-p 127.0.0.1:8002:8002 \
-v /srv/pandora/conf:/srv/pandora/conf \
-v /srv/pandora/data:/srv/pandora/data \
pandora

4
pandora/etc/nginx/conf.d/pandora.conf
View File

@ -1,5 +1,5 @@
server {
listen [::]:8002 ipv6only=off;
listen [::]:8802 ipv6only=off;
listen [::]:8402 ssl http2 ipv6only=off;
access_log /var/log/nginx/pandora.access.log;
@ -9,6 +9,6 @@ server {
proxy_set_header X-Forwarded-For $remote_addr;
proxy_set_header X-Forwarded-Host $host:$server_port;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_pass http://127.0.0.1:9011;
proxy_pass http://127.0.0.1:8002;
}
}

2
sahana/etc/init.d/sahana
View File

@ -13,7 +13,7 @@ start() {
--name sahana \
-h sahana \
--link postgres \
-p 127.0.0.1:9001:8001 \
-p 127.0.0.1:8001:8001 \
-v /srv/sahana/conf:/srv/web2py/applications/eden/models \
-v /srv/sahana/data/Spotter:/srv/web2py/applications/eden/modules/templates/Spotter \
-v /srv/sahana/data/databases:/srv/web2py/applications/eden/databases \

4
sahana/etc/nginx/conf.d/sahana.conf
View File

@ -1,5 +1,5 @@
server {
listen [::]:8001 ipv6only=off;
listen [::]:8801 ipv6only=off;
listen [::]:8401 ssl http2 ipv6only=off;
access_log /var/log/nginx/sahana.access.log;
@ -9,6 +9,6 @@ server {
proxy_set_header X-Forwarded-For $remote_addr;
proxy_set_header X-Forwarded-Host $host:$server_port;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_pass http://127.0.0.1:9001;
proxy_pass http://127.0.0.1:8001;
}
}

2
sambro/etc/init.d/sambro
View File

@ -13,7 +13,7 @@ start() {
--name sambro \
-h sambro \
--link postgres \
-p 127.0.0.1:9099:8001 \
-p 127.0.0.1:8099:8001 \
-v /srv/sambro/conf:/srv/web2py/applications/eden/models \
-v /srv/sambro/data/SAMBRO:/srv/web2py/applications/eden/modules/templates/SAMBRO \
-v /srv/sambro/data/databases:/srv/web2py/applications/eden/databases \

4
sambro/etc/nginx/conf.d/sambro.conf
View File

@ -1,5 +1,5 @@
server {
listen [::]:8099 ipv6only=off;
listen [::]:8899 ipv6only=off;
listen [::]:8499 ssl http2 ipv6only=off;
access_log /var/log/nginx/sambro.access.log;
@ -9,6 +9,6 @@ server {
proxy_set_header X-Forwarded-For $remote_addr;
proxy_set_header X-Forwarded-Host $host:$server_port;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_pass http://127.0.0.1:9099;
proxy_pass http://127.0.0.1:8099;
}
}

2
seeddms/etc/init.d/seeddms
View File

@ -13,7 +13,7 @@ start() {
--name seeddms \
-h seeddms \
--link postgres \
-p 127.0.0.1:9010:8010 \
-p 127.0.0.1:8010:8010 \
-v /srv/seeddms/data:/srv/seeddms/data \
-v /srv/seeddms/conf:/srv/seeddms/www/conf \
seeddms

4
seeddms/etc/nginx/conf.d/seeddms.conf
View File

@ -1,5 +1,5 @@
server {
listen [::]:8010 ipv6only=off;
listen [::]:8810 ipv6only=off;
listen [::]:8410 ssl http2 ipv6only=off;
access_log /var/log/nginx/seeddms.access.log;
@ -9,6 +9,6 @@ server {
proxy_set_header X-Forwarded-For $remote_addr;
proxy_set_header X-Forwarded-Host $host:$server_port;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_pass http://127.0.0.1:9010;
proxy_pass http://127.0.0.1:8010;
}
}

2
sigmah/etc/init.d/sigmah
View File

@ -13,7 +13,7 @@ start() {
--name sigmah \
-h sigmah \
--link postgres \
-p 127.0.0.1:9015:8011 \
-p 127.0.0.1:8011:8011 \
-v /srv/sigmah/data:/srv/sigmah/data \
-v /srv/sigmah/conf/persistence.xml:/srv/tomcat/webapps/sigmah/WEB-INF/classes/META-INF/persistence.xml \
-v /srv/sigmah/conf/sigmah.properties:/srv/tomcat/webapps/sigmah/WEB-INF/classes/sigmah.properties \

4
sigmah/etc/nginx/conf.d/sigmah.conf
View File

@ -1,5 +1,5 @@
server {
listen [::]:8011 ipv6only=off;
listen [::]:8811 ipv6only=off;
listen [::]:8411 ssl http2 ipv6only=off;
access_log /var/log/nginx/sigmah.access.log;
@ -9,6 +9,6 @@ server {
proxy_set_header X-Forwarded-For $remote_addr;
proxy_set_header X-Forwarded-Host $host:$server_port;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_pass http://127.0.0.1:9015;
proxy_pass http://127.0.0.1:8011;
}
}

2
ushahidi/etc/init.d/ushahidi
View File

@ -13,7 +13,7 @@ start() {
--name ushahidi \
-h ushahidi \
--link mariadb \
-p 127.0.0.1:9014:8014 \
-p 127.0.0.1:8014:8014 \
-v /srv/ushahidi/conf/env:/srv/ushahidi/platform/.env \
ushahidi
}

4
ushahidi/etc/nginx/conf.d/ushahidi.conf
View File

@ -1,5 +1,5 @@
server {
listen [::]:8014 ipv6only=off;
listen [::]:8814 ipv6only=off;
listen [::]:8414 ssl http2 ipv6only=off;
access_log /var/log/nginx/ushahidi.access.log;
@ -9,6 +9,6 @@ server {
proxy_set_header X-Forwarded-For $remote_addr;
proxy_set_header X-Forwarded-Host $host:$server_port;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_pass http://127.0.0.1:9014;
proxy_pass http://127.0.0.1:8014;
}
}