diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 3f404a1e93202ea49a8d36a2863c3030148b6e93..c0f0c7fff6096528573d13eaeec8c426582d9cff 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
[bumpversion]
-current_version = 2.0.49
+current_version = 2.0.51
commit = True
tag = True
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<release>[a-z]+)\.(?P<build>\d+))?
diff --git a/Dockerfile b/Dockerfile
index be424772ea53f6a5f863cc3a14af352608e811f3..589bd5e8f01c9caf437ae395c05aadfc4c0c418d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -63,9 +63,6 @@ ENV INSTANCE_ID="view-server_core" \
DJANGO_MAIL= \
DJANGO_PASSWORD= \
DATA_DIR="/data/" \
- APACHE_CONF="/etc/httpd/conf.d/010_pvs.conf" \
- APACHE_ServerName="pvs_instance" \
- APACHE_ServerAdmin="office@eox.at" \
APACHE_ALIAS="pvs" \
REDIS_HOST="redis" \
REDIS_PORT="6379" \
@@ -91,4 +88,4 @@ EXPOSE 80
ENTRYPOINT ["./entrypoint.sh"]
CMD ["/opt/core/run-httpd.sh"]
-LABEL version="2.0.49"
+LABEL version="2.0.51"
diff --git a/charts/vs-registrar/Chart.yaml b/charts/vs-registrar/Chart.yaml
index 6ec2d948021a12ad23c6b85d47afd3aa0c9685d4..21b941e5e3efff9283166a621d5c4278c1944750 100644
--- a/charts/vs-registrar/Chart.yaml
+++ b/charts/vs-registrar/Chart.yaml
@@ -19,10 +19,10 @@ maintainers:
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: "2.0.49"
+version: "2.0.51"
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes.
-appVersion: "2.0.49"
+appVersion: "2.0.51"
diff --git a/charts/vs-renderer/Chart.yaml b/charts/vs-renderer/Chart.yaml
index de257d6ec43377dcb0385af917ccdd3efdce58f8..67494f9652d697128198e8ec1fffde5bb8fc0fe6 100644
--- a/charts/vs-renderer/Chart.yaml
+++ b/charts/vs-renderer/Chart.yaml
@@ -19,10 +19,10 @@ maintainers:
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: "2.0.49"
+version: "2.0.51"
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes.
-appVersion: "2.0.49"
+appVersion: "2.0.51"
diff --git a/charts/vs-renderer/values.yaml b/charts/vs-renderer/values.yaml
index 195c8622b8b4feacc6927bb8a9f0c0c9452e77d2..fb956545966f30ffb3ca7f1fbab075b365c42486 100644
--- a/charts/vs-renderer/values.yaml
+++ b/charts/vs-renderer/values.yaml
@@ -8,11 +8,8 @@ image:
livenessProbe:
failureThreshold: 3
- exec:
- command:
- - /bin/bash
- - -c
- - "timeout 1 bash -c '</dev/tcp/localhost/80' 2>/dev/null"
+ tcpSocket:
+ port: 80
periodSeconds: 10
successThreshold: 1
timeoutSeconds: 1
diff --git a/configure.sh b/configure.sh
index f42e7b24d1d092966bdfe791477ba37bd1de1178..4ec51716d5d037cba3034ea14ff8982be6ea3006 100755
--- a/configure.sh
+++ b/configure.sh
@@ -79,6 +79,13 @@
echo "EOXS_RESULT_ITEM_FEED_LINK_GENERATORS = ['http_access.opensearch.HttpAccessResultItemFeedLinkGenerator']" >> pvs_instance/settings.py
echo "urlpatterns.append(re_path(r'^http/', include('http_access.urls')))" >> pvs_instance/urls.py
fi
+ if [ ! -z "$EOXS_ERROR_HTML_TEMPLATE" ]; then
+ echo "TEMPLATES[0]['DIRS'].append(os.path.split('$EOXS_ERROR_HTML_TEMPLATE')[0])" >> pvs_instance/settings.py
+ echo "EOXS_ERROR_HTML_TEMPLATE = os.path.split('$EOXS_ERROR_HTML_TEMPLATE')[1]" >> pvs_instance/settings.py
+ fi
+ if [[ "$EOXS_OPENSEARCH_GETCOVERAGE_HTML_EXCEPTION" = true ]] ; then
+ echo "EOXS_OPENSEARCH_GETCOVERAGE_HTML_EXCEPTION = True" >> pvs_instance/settings.py
+ fi
if [[ "$DEBUG" = true ]] ; then
echo "DEBUG ON Setting functions"
diff --git a/entrypoint.sh b/entrypoint.sh
index a0643edbc1990fc2ce2727cb207383825790c200..a259be0a511114003279b5683651d0f6d866d316 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -4,7 +4,7 @@ shopt -s nullglob
SERVICES=${WAIT_SERVICES:=''}
TIMEOUT=${WAIT_TIMEOUT:='15'}
-DEBUG=${DEBUG:="false"}
+DEBUG=${DEVELOPMENT:="false"}
if [[ ! -z $SERVICES ]] ; then
for service in $SERVICES ; do
@@ -12,7 +12,7 @@ if [[ ! -z $SERVICES ]] ; then
done
fi
-if [[ "$DEBUG" = true ]] ; then
+if [[ "$DEVELOPMENT" = true ]] ; then
echo 'Installing debug dependencies'
pip3 install debugpy pyinstrument;
fi
diff --git a/run-httpd.sh b/run-httpd.sh
index 6c5f3b27b1540f1295cce1ea812ac05e1ce157f0..017ef2e564ebde2b9df9448924c4ed8a99ac798e 100755
--- a/run-httpd.sh
+++ b/run-httpd.sh
@@ -1,12 +1,12 @@
#!/bin/bash
-DEBUG=${DEBUG:="false"}
+DEVELOPMENT=${DEVELOPMENT:="false"}
WORKERS=${WORKERS:=8}
WORKER_TIMEOUT=${WORKER_TIMEOUT:=120}
-if [[ "$DEBUG" = true ]] ; then
+if [[ "$DEVELOPMENT" = true ]] ; then
echo "Running manage.py runserver"
python3 "$INSTANCE_DIR"/manage.py runserver 0.0.0.0:80
else
diff --git a/run-registrar.sh b/run-registrar.sh
index c6f51ea479d8153814f01517b5f9a5630cbc35db..b69c27e50ca5bf87f086334b26e9c1c1e96c086d 100755
--- a/run-registrar.sh
+++ b/run-registrar.sh
@@ -6,7 +6,13 @@ if test "$REGISTRAR_REPLACE" = true; then
replace="--replace"
fi
+debug="--no-debug"
+if test "$DEBUG" = true; then
+ debug="--debug"
+fi
+
registrar daemon \
+ ${debug} \
--config-file /config.yaml \
--host ${REDIS_HOST} \
--port ${REDIS_PORT} \
diff --git a/setup.py b/setup.py
index 8160abddae80ab3dc5a23b2dd2e284144ad1316b..d96b8b0879e7242002938630bfe2b8ae533158df 100644
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@ long_description = ""
setup(
name="registrar", # Replace with your own username
- version="2.0.49",
+ version="2.0.51",
author="",
author_email="",
description="registrar for PVS",