diff --git a/core/configure.sh b/core/configure.sh index adbc5dade19769f530bda038ac0385250fbf350c..943475d4bc273ce64e6f5814babfe8679f9d1d80 100644 --- a/core/configure.sh +++ b/core/configure.sh @@ -1,52 +1,54 @@ #!/bin/bash -echo "Running configure.sh" - -# Configure instance -sed -e "s/'disable_existing_loggers': True,/'disable_existing_loggers': False,/" -i pvs_instance/settings.py -HANDLERS="'handlers': {\n - 'null': {\n - 'level':'DEBUG',\n - 'class':'logging.NullHandler',\n - },\n - 'console': {\n - 'level': 'DEBUG' if DEBUG else 'INFO',\n - 'class': 'logging.StreamHandler',\n - 'formatter': 'verbose' if DEBUG else 'simple',\n - 'filters': [],\n - },\n -}," -LOGGERS="'loggers': {\n - 'eoxserver': {\n - 'handlers': ['console'],\n - 'level': 'DEBUG' if DEBUG else 'INFO',\n - 'propagate': False,\n - }, -}" -sed -e "/^ 'handlers': {$/,/^ },$/c `echo ${HANDLERS}`" -i pvs_instance/settings.py -sed -e "/^ 'loggers': {$/,/^ }$/c `echo ${LOGGERS}`" -i pvs_instance/settings.py - -sed -e "s,http_service_url=http://localhost:8000/ows,http_service_url=${APACHE_ALIAS}/ows," -i pvs_instance/conf/eoxserver.conf -sed -e "s/resampling_method=average/resampling_method=near/" -i pvs_instance/conf/eoxserver.conf -# TODO maxsize... - -echo "EOXS_VALIDATE_IDS_NCNAME = False" >> pvs_instance/settings.py -echo "EOXS_OPENSEARCH_RECORD_MODEL = 'eoxserver.resources.coverages.models.Product'" >> pvs_instance/settings.py - -echo "CACHES = { -'default': { - 'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache', - 'LOCATION': '/var/tmp/django_cache', -} -}" >> pvs_instance/settings.py - -sed -e "/TEMPLATE_DEBUG = DEBUG/d" -i pvs_instance/settings.py - -sed -e 's/DEBUG = True/DEBUG = False/' -i pvs_instance/settings.py - -# Further configuration -echo "ALLOWED_HOSTS = ['*']" >> pvs_instance/settings.py -echo "USE_X_FORWARDED_HOST = True" >> pvs_instance/settings.py -echo "SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')" >> pvs_instance/settings.py - -chmod g+w -R . -chgrp users -R . \ No newline at end of file +{ + echo "Running configure.sh" + + # Configure instance + sed -e "s/'disable_existing_loggers': True,/'disable_existing_loggers': False,/" -i pvs_instance/settings.py + HANDLERS="'handlers': {\n + 'null': {\n + 'level':'DEBUG',\n + 'class':'logging.NullHandler',\n + },\n + 'console': {\n + 'level': 'DEBUG' if DEBUG else 'INFO',\n + 'class': 'logging.StreamHandler',\n + 'formatter': 'verbose' if DEBUG else 'simple',\n + 'filters': [],\n + },\n + }," + LOGGERS="'loggers': {\n + 'eoxserver': {\n + 'handlers': ['console'],\n + 'level': 'DEBUG' if DEBUG else 'INFO',\n + 'propagate': False,\n + }, + }" + sed -e "/^ 'handlers': {$/,/^ },$/c `echo ${HANDLERS}`" -i pvs_instance/settings.py + sed -e "/^ 'loggers': {$/,/^ }$/c `echo ${LOGGERS}`" -i pvs_instance/settings.py + + sed -e "s,http_service_url=http://localhost:8000/ows,http_service_url=${APACHE_ALIAS}/ows," -i pvs_instance/conf/eoxserver.conf + sed -e "s/resampling_method=average/resampling_method=near/" -i pvs_instance/conf/eoxserver.conf + # TODO maxsize... + + echo "EOXS_VALIDATE_IDS_NCNAME = False" >> pvs_instance/settings.py + echo "EOXS_OPENSEARCH_RECORD_MODEL = 'eoxserver.resources.coverages.models.Product'" >> pvs_instance/settings.py + + echo "CACHES = { + 'default': { + 'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache', + 'LOCATION': '/var/tmp/django_cache', + } + }" >> pvs_instance/settings.py + + sed -e "/TEMPLATE_DEBUG = DEBUG/d" -i pvs_instance/settings.py + + sed -e 's/DEBUG = True/DEBUG = False/' -i pvs_instance/settings.py + + # Further configuration + echo "ALLOWED_HOSTS = ['*']" >> pvs_instance/settings.py + echo "USE_X_FORWARDED_HOST = True" >> pvs_instance/settings.py + echo "SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')" >> pvs_instance/settings.py + + chmod g+w -R . + chgrp users -R . +} 1> &2 \ No newline at end of file diff --git a/core/entrypoint.sh b/core/entrypoint.sh index e78b1330d926b5936575619ce36509e11d4d08b3..8d82bbf7d54a26f1e90d89ec61f4beec452e216b 100644 --- a/core/entrypoint.sh +++ b/core/entrypoint.sh @@ -5,7 +5,7 @@ TIMEOUT=${WAIT_TIMEOUT:='15'} if [[ ! -z $SERVICES ]] ; then for service in $SERVICES ; do - wait-for-it -t $TIMEOUT $service + wait-for-it -t $TIMEOUT $service > &2 done fi diff --git a/core/initialized.sh b/core/initialized.sh index 8fc6714bda7f168a3a5807588463805987da1d2e..f0fdcf300b33b7eaf55ee431b0e9120af632b2e7 100644 --- a/core/initialized.sh +++ b/core/initialized.sh @@ -1,4 +1,4 @@ #!/bin/bash -e touch "${INSTANCE_DIR}/.initialized" -echo "Instance ${INSTANCE_ID} is initialized" +echo "Instance ${INSTANCE_ID} is initialized" > &2 diff --git a/core/run-httpd.sh b/core/run-httpd.sh index 876e67b1b681f894bc014c9517e7aa7b3633d492..30f876a5eb22d6b07381e9be28258a79b3b57b65 100644 --- a/core/run-httpd.sh +++ b/core/run-httpd.sh @@ -2,4 +2,4 @@ echo "Running gunicorn" -exec gunicorn --chdir ${INSTALL_DIR}/pvs_instance/ --bind :80 pvs_instance.wsgi:application --workers 8 --max-requests 10 --max-requests-jitter 3 --worker-class sync --timeout 120 --access-logfile - --error-logfile - --log-level warning --disable-redirect-access-to-syslog +exec gunicorn --chdir ${INSTALL_DIR}/pvs_instance/ --bind :80 pvs_instance.wsgi:application --workers 8 --max-requests 10 --max-requests-jitter 3 --worker-class sync --timeout 120 --access-logfile - --error-logfile - --log-level warning --disable-redirect-access-to-syslog 2> &1 diff --git a/core/run-registrar.sh b/core/run-registrar.sh index a1bb5c44f748777615108e349c5832d8c2590303..088f4bfa4b6cefb06e868ae6159021361d1de1bc 100644 --- a/core/run-registrar.sh +++ b/core/run-registrar.sh @@ -1,5 +1,5 @@ #!/bin/sh -echo "Running registrar" +echo "Running registrar" > &2 -python3 /registrar.py --mode redis --redis-host ${REDIS_HOST} --redis-port ${REDIS_PORT} --redis-register-queue-key ${REDIS_REGISTER_QUEUE_KEY} --redis-registered-set-key ${REDIS_REGISTERED_SET_KEY} +python3 /registrar.py --mode redis --redis-host ${REDIS_HOST} --redis-port ${REDIS_PORT} --redis-register-queue-key ${REDIS_REGISTER_QUEUE_KEY} --redis-registered-set-key ${REDIS_REGISTERED_SET_KEY} > &2 diff --git a/core/wait-initialized.sh b/core/wait-initialized.sh index bfefbc12868fcc0b52a52748df694b38961447b5..da9746eeb2f90aec198cb15c97580baa2117421a 100644 --- a/core/wait-initialized.sh +++ b/core/wait-initialized.sh @@ -1,7 +1,7 @@ #!/bin/bash -e until [ -f "${INSTANCE_DIR}/.initialized" ] ; do - echo "Waiting until instance ${INSTANCE_ID} is initialized" + echo "Waiting until instance ${INSTANCE_ID} is initialized" > &2 sleep 3 # TODO: timeout? done