Merge pull request #218 from EHDEN/dev

Update master to release 1.2.1
EHDEN · Jan 7, 2022 · 0465a11 · 0465a11
2 parents 643334c + ed88b73
commit 0465a11
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/backups/backup.sh b/backups/backup.sh
@@ -66,16 +66,16 @@ print(settings.MEDIA_ROOT, end=\"\")
         docker cp -a $DASHBOARDS_CONTAINER_ID:$MEDIA_ROOT $TMP_BACKUP_DIRECTORY
 
         echo_step "6" "Compress gathered data"
-        COMPRESSED_FILE_PATH=$TMP_DIRECTORY/${APP_NAME}_$(date +"%Y%m%d%H%M%S").tar.xz
+        COMPRESSED_FILE_PATH=$TMP_DIRECTORY/${APP_NAME}_$(date +"%Y%m%d%H%M%S").zip
         (
             cd $TMP_DIRECTORY
             zip -q -r $COMPRESSED_FILE_PATH $BACKUP_DIRECTORY_NAME
             #tar -C $TMP_DIRECTORY -cJf $COMPRESSED_FILE_PATH $BACKUP_DIRECTORY_NAME
 
             echo_step "7" "Send to $SERVER"
-            #backup_uploader $APP_NAME $SERVER $CREDENTIALS_FILE_PATH $BACKUP_CHAIN_CONFIG $COMPRESSED_FILE_PATH
+            backup_uploader $APP_NAME $SERVER $CREDENTIALS_FILE_PATH $BACKUP_CHAIN_CONFIG $COMPRESSED_FILE_PATH
         ) || EXIT_STATUS=$?
-        #rm -f $COMPRESSED_FILE_PATH
+        rm -f $COMPRESSED_FILE_PATH
 
         exit $EXIT_STATUS
     ) || EXIT_STATUS=$?

diff --git a/dashboard_viewer/uploader/views.py b/dashboard_viewer/uploader/views.py
@@ -6,6 +6,7 @@
 from django.http import JsonResponse
 from django.shortcuts import get_object_or_404, redirect, render
 from django.utils.html import format_html, mark_safe
+from django.views.decorators.clickjacking import xframe_options_exempt
 from rest_framework.response import Response
 from rest_framework.viewsets import GenericViewSet
 
@@ -19,6 +20,7 @@
 
 
 @uploader_decorator
+@xframe_options_exempt
 def upload_achilles_results(request, *args, **kwargs):
     data_source = kwargs.get("data_source")
     try:
@@ -153,6 +155,7 @@ def _leave_valid_fields_values_only(request, initial, aux_form):
 
 
 @uploader_decorator
+@xframe_options_exempt
 def create_data_source(request, *_, **kwargs):
     data_source = kwargs.get("data_source")
     if request.method == "GET":
@@ -234,6 +237,7 @@ def create_data_source(request, *_, **kwargs):
 
 
 @uploader_decorator
+@xframe_options_exempt
 def edit_data_source(request, *_, **kwargs):
     data_source = kwargs.get("data_source")
     try:

diff --git a/docker/.env-example b/docker/.env-example
@@ -26,6 +26,8 @@ POSTGRES_ACHILLES_USER=achilles
 POSTGRES_ACHILLES_PASSWORD=achilles
 POSTGRES_ACHILLES_DB=achilles
 
+VOLUMES_PATH=./volumes
+
 #production or development
 INSTALLATION_ENV=production
 

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -88,7 +88,7 @@ services:
     image: redis:3.2
     restart: unless-stopped
     volumes:
-      - ./volumes/redis:/data
+      - ${VOLUMES_PATH}/redis:/data
 
   postgres:
     image: postgres:10
@@ -102,7 +102,7 @@ services:
       POSTGRES_DBS_USERS: ${POSTGRES_SUPERSET_USER} ${POSTGRES_DASHBOARD_VIEWER_USER} ${POSTGRES_ACHILLES_USER}
       POSTGRES_DBS_PASSWORDS: ${POSTGRES_SUPERSET_PASSWORD} ${POSTGRES_DASHBOARD_VIEWER_PASSWORD} ${POSTGRES_ACHILLES_PASSWORD}
     volumes:
-      - ./volumes/postgres:/var/lib/postgresql/data
+      - ${VOLUMES_PATH}/postgres:/var/lib/postgresql/data
       - ./postgres-entrypoint:/docker-entrypoint-initdb.d
 
   #### DASHBOARD ####