Merge branch 'main' into routes

.bumpversion.cfg

 [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+))?

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"

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"

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"

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

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"

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

run-httpd.sh

 #!/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

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} \

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",