EOX GitLab Instance

Skip to content
Snippets Groups Projects
Commit 8416782b authored by Fabian Schindler-Strauss's avatar Fabian Schindler-Strauss
Browse files

Merge branch 'http-access-opensearch' into 'main'

http access links in OpenSearch

See merge request !11
parents ecf59c93 c99fa508
No related branches found
No related tags found
1 merge request!11http access links in OpenSearch
Pipeline #21543 passed
...@@ -37,6 +37,7 @@ htmlcov/* ...@@ -37,6 +37,7 @@ htmlcov/*
junit*.xml junit*.xml
coverage.xml coverage.xml
.pytest_cache/ .pytest_cache/
.mypy_cache
# Build and docs folder/files # Build and docs folder/files
build/* build/*
......
...@@ -25,7 +25,8 @@ ...@@ -25,7 +25,8 @@
# IN THE SOFTWARE. # IN THE SOFTWARE.
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
FROM eoxa/eoxserver:release-1.1.1-dev7 # NOTE: using dev release for now to include browse registration implementation
FROM eoxa/eoxserver:release-1.1.1-dev8
ARG DEBUG="false" ARG DEBUG="false"
......
...@@ -63,10 +63,11 @@ ...@@ -63,10 +63,11 @@
sed -e "s/SECRET_KEY = '.*'/SECRET_KEY = '${DJANGO_SECRET_KEY}'/" -i pvs_instance/settings.py sed -e "s/SECRET_KEY = '.*'/SECRET_KEY = '${DJANGO_SECRET_KEY}'/" -i pvs_instance/settings.py
chmod g+w -R . chmod g+w -R .
chgrp users -R . chgrp users -R .
if [[ "$ENABLE_HTTP_ACCESS" = true ]] ; then if [[ "$ENABLE_HTTP_ACCESS" = true ]] ; then
echo "Installing and enabling http_access" echo "Installing and enabling http_access"
echo "INSTALLED_APPS += ('http_access', )" >> pvs_instance/settings.py echo "INSTALLED_APPS += ('http_access', )" >> pvs_instance/settings.py
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 echo "urlpatterns.append(re_path(r'^http/', include('http_access.urls')))" >> pvs_instance/urls.py
fi fi
...@@ -74,7 +75,7 @@ ...@@ -74,7 +75,7 @@
echo "DEBUG ON Setting functions" echo "DEBUG ON Setting functions"
echo "MIDDLEWARE.append('pyinstrument.middleware.ProfilerMiddleware')" >> pvs_instance/settings.py echo "MIDDLEWARE.append('pyinstrument.middleware.ProfilerMiddleware')" >> pvs_instance/settings.py
sed -e 's/DEBUG = False/DEBUG = True/' -i pvs_instance/settings.py sed -e 's/DEBUG = False/DEBUG = True/' -i pvs_instance/settings.py
var="import os var="import os
import sys import sys
import debugpy import debugpy
......
...@@ -7,4 +7,4 @@ jsonschema<5.0 ...@@ -7,4 +7,4 @@ jsonschema<5.0
boto3<2.0 boto3<2.0
django-cors-headers<4.0 django-cors-headers<4.0
pystac<2.0 pystac<2.0
http-access==0.0.1 http-access==0.1.3
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment