diff --git a/README.md b/README.md index ea0ecda..b34f9cf 100644 --- a/README.md +++ b/README.md @@ -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 | diff --git a/ckan-datapusher.sh b/ckan-datapusher.sh index 844f99b..b3193a8 100755 --- a/ckan-datapusher.sh +++ b/ckan-datapusher.sh @@ -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 diff --git a/ckan-datapusher/etc/init.d/ckan-datapusher b/ckan-datapusher/etc/init.d/ckan-datapusher index 81cd9d9..694b55e 100755 --- a/ckan-datapusher/etc/init.d/ckan-datapusher +++ b/ckan-datapusher/etc/init.d/ckan-datapusher @@ -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 diff --git a/ckan-datapusher/etc/nginx/conf.d/ckan-datapusher.conf b/ckan-datapusher/etc/nginx/conf.d/ckan-datapusher.conf deleted file mode 100644 index 3825d9f..0000000 --- a/ckan-datapusher/etc/nginx/conf.d/ckan-datapusher.conf +++ /dev/null @@ -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; - } -} diff --git a/ckan/etc/init.d/ckan b/ckan/etc/init.d/ckan index 3a71632..da88da1 100755 --- a/ckan/etc/init.d/ckan +++ b/ckan/etc/init.d/ckan @@ -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 diff --git a/ckan/etc/nginx/conf.d/ckan.conf b/ckan/etc/nginx/conf.d/ckan.conf index d251dd6..5c902b0 100644 --- a/ckan/etc/nginx/conf.d/ckan.conf +++ b/ckan/etc/nginx/conf.d/ckan.conf @@ -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; } } diff --git a/crisiscleanup/etc/init.d/crisiscleanup b/crisiscleanup/etc/init.d/crisiscleanup index 54f06c6..57c02c2 100755 --- a/crisiscleanup/etc/init.d/crisiscleanup +++ b/crisiscleanup/etc/init.d/crisiscleanup @@ -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 } diff --git a/crisiscleanup/etc/nginx/conf.d/crisiscleanup.conf b/crisiscleanup/etc/nginx/conf.d/crisiscleanup.conf index df09e61..2f2586f 100644 --- a/crisiscleanup/etc/nginx/conf.d/crisiscleanup.conf +++ b/crisiscleanup/etc/nginx/conf.d/crisiscleanup.conf @@ -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; } } diff --git a/cts/etc/init.d/cts b/cts/etc/init.d/cts index d68fe30..7907b97 100755 --- a/cts/etc/init.d/cts +++ b/cts/etc/init.d/cts @@ -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 } diff --git a/cts/etc/nginx/conf.d/cts.conf b/cts/etc/nginx/conf.d/cts.conf index 891b4d5..bc09102 100644 --- a/cts/etc/nginx/conf.d/cts.conf +++ b/cts/etc/nginx/conf.d/cts.conf @@ -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; } } diff --git a/gnuhealth/etc/init.d/gnuhealth b/gnuhealth/etc/init.d/gnuhealth index 06eb7c1..a9a6306 100755 --- a/gnuhealth/etc/init.d/gnuhealth +++ b/gnuhealth/etc/init.d/gnuhealth @@ -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 } diff --git a/gnuhealth/etc/nginx/conf.d/gnuhealth.conf b/gnuhealth/etc/nginx/conf.d/gnuhealth.conf index 891c239..8adecb6 100644 --- a/gnuhealth/etc/nginx/conf.d/gnuhealth.conf +++ b/gnuhealth/etc/nginx/conf.d/gnuhealth.conf @@ -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; } } diff --git a/kanboard/etc/init.d/kanboard b/kanboard/etc/init.d/kanboard index 06477cd..818d25c 100755 --- a/kanboard/etc/init.d/kanboard +++ b/kanboard/etc/init.d/kanboard @@ -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 diff --git a/kanboard/etc/nginx/conf.d/kanboard.conf b/kanboard/etc/nginx/conf.d/kanboard.conf index fb71252..e2c4b3a 100644 --- a/kanboard/etc/nginx/conf.d/kanboard.conf +++ b/kanboard/etc/nginx/conf.d/kanboard.conf @@ -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; } } diff --git a/mifosx/etc/init.d/mifosx b/mifosx/etc/init.d/mifosx index b66a3c4..3f6bb63 100755 --- a/mifosx/etc/init.d/mifosx +++ b/mifosx/etc/init.d/mifosx @@ -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 } diff --git a/mifosx/etc/nginx/conf.d/mifosx.conf b/mifosx/etc/nginx/conf.d/mifosx.conf index f61c1ea..57836cc 100644 --- a/mifosx/etc/nginx/conf.d/mifosx.conf +++ b/mifosx/etc/nginx/conf.d/mifosx.conf @@ -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; } } diff --git a/motech.sh b/motech.sh index 0342321..7b669f1 100755 --- a/motech.sh +++ b/motech.sh @@ -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 diff --git a/motech/etc/init.d/motech b/motech/etc/init.d/motech index 6f6f9a4..0a059c9 100755 --- a/motech/etc/init.d/motech +++ b/motech/etc/init.d/motech @@ -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 } diff --git a/motech/etc/nginx/conf.d/motech.conf b/motech/etc/nginx/conf.d/motech.conf index 981c515..f9ec99a 100644 --- a/motech/etc/nginx/conf.d/motech.conf +++ b/motech/etc/nginx/conf.d/motech.conf @@ -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; } } diff --git a/openmapkit/etc/init.d/openmapkit b/openmapkit/etc/init.d/openmapkit index 3a951b1..e407413 100755 --- a/openmapkit/etc/init.d/openmapkit +++ b/openmapkit/etc/init.d/openmapkit @@ -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 diff --git a/openmapkit/etc/nginx/conf.d/openmapkit.conf b/openmapkit/etc/nginx/conf.d/openmapkit.conf index aa14156..6d99c12 100644 --- a/openmapkit/etc/nginx/conf.d/openmapkit.conf +++ b/openmapkit/etc/nginx/conf.d/openmapkit.conf @@ -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; } } diff --git a/pandora/etc/init.d/pandora b/pandora/etc/init.d/pandora index 35d7fcb..9d356d7 100755 --- a/pandora/etc/init.d/pandora +++ b/pandora/etc/init.d/pandora @@ -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 diff --git a/pandora/etc/nginx/conf.d/pandora.conf b/pandora/etc/nginx/conf.d/pandora.conf index 29c1669..de90df6 100644 --- a/pandora/etc/nginx/conf.d/pandora.conf +++ b/pandora/etc/nginx/conf.d/pandora.conf @@ -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; } } diff --git a/sahana/etc/init.d/sahana b/sahana/etc/init.d/sahana index 9955b34..02f64a7 100755 --- a/sahana/etc/init.d/sahana +++ b/sahana/etc/init.d/sahana @@ -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 \ diff --git a/sahana/etc/nginx/conf.d/sahana.conf b/sahana/etc/nginx/conf.d/sahana.conf index a164ac2..3c32ff5 100644 --- a/sahana/etc/nginx/conf.d/sahana.conf +++ b/sahana/etc/nginx/conf.d/sahana.conf @@ -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; } } diff --git a/sambro/etc/init.d/sambro b/sambro/etc/init.d/sambro index 748efef..58bbbd2 100755 --- a/sambro/etc/init.d/sambro +++ b/sambro/etc/init.d/sambro @@ -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 \ diff --git a/sambro/etc/nginx/conf.d/sambro.conf b/sambro/etc/nginx/conf.d/sambro.conf index e358c22..4d2dc88 100644 --- a/sambro/etc/nginx/conf.d/sambro.conf +++ b/sambro/etc/nginx/conf.d/sambro.conf @@ -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; } } diff --git a/seeddms/etc/init.d/seeddms b/seeddms/etc/init.d/seeddms index 354ce3c..4577480 100755 --- a/seeddms/etc/init.d/seeddms +++ b/seeddms/etc/init.d/seeddms @@ -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 diff --git a/seeddms/etc/nginx/conf.d/seeddms.conf b/seeddms/etc/nginx/conf.d/seeddms.conf index 1acb88c..27112f8 100644 --- a/seeddms/etc/nginx/conf.d/seeddms.conf +++ b/seeddms/etc/nginx/conf.d/seeddms.conf @@ -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; } } diff --git a/sigmah/etc/init.d/sigmah b/sigmah/etc/init.d/sigmah index a24911c..dbe357f 100755 --- a/sigmah/etc/init.d/sigmah +++ b/sigmah/etc/init.d/sigmah @@ -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 \ diff --git a/sigmah/etc/nginx/conf.d/sigmah.conf b/sigmah/etc/nginx/conf.d/sigmah.conf index d39e384..6d64b6c 100644 --- a/sigmah/etc/nginx/conf.d/sigmah.conf +++ b/sigmah/etc/nginx/conf.d/sigmah.conf @@ -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; } } diff --git a/ushahidi/etc/init.d/ushahidi b/ushahidi/etc/init.d/ushahidi index 747fef8..39f05e1 100755 --- a/ushahidi/etc/init.d/ushahidi +++ b/ushahidi/etc/init.d/ushahidi @@ -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 } diff --git a/ushahidi/etc/nginx/conf.d/ushahidi.conf b/ushahidi/etc/nginx/conf.d/ushahidi.conf index a3c7d55..652cc53 100644 --- a/ushahidi/etc/nginx/conf.d/ushahidi.conf +++ b/ushahidi/etc/nginx/conf.d/ushahidi.conf @@ -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; } }