Skip to content
Snippets Groups Projects
Commit 8db4635d authored by Gyan Gupta's avatar Gyan Gupta
Browse files

Make download path hard coded and remove from env

parent 36a6eb6d
No related tags found
1 merge request!296Make download path hard coded and remove from env
Pipeline #13784 failed
......@@ -161,7 +161,6 @@ ARK_NAAN=
# Download
DOWNLOAD_FILES_SIZE_LIMIT=100000000
DOWNLOAD_FILES_COUNT_LIMIT=150
DOWNLOAD_PATH=tmp/downloads
# Admin set titles for the workflows
RUB_ADMIN_SET_TITLE="RUB publication workflow"
......
......@@ -157,7 +157,6 @@ ARK_NAAN=
# Download
DOWNLOAD_FILES_SIZE_LIMIT=100000000
DOWNLOAD_FILES_COUNT_LIMIT=150
DOWNLOAD_PATH=tmp/downloads
# Admin set titles for the workflows
RUB_ADMIN_SET_TITLE="RUB publication workflow"
......
......@@ -104,7 +104,7 @@ services:
FITS_PATH: ${FITS_PATH}
FITS_VERSION: ${FITS_VERSION}
CRC_FOLDER_IMPORT_PATH: ${CRC_FOLDER_IMPORT_PATH}
DOWNLOAD_PATH: ${DOWNLOAD_PATH}
DOWNLOAD_PATH: "/shared/downloads"
env_file:
- .env
networks:
......@@ -138,7 +138,7 @@ services:
- ${HOST_APP_DATA_PATH:-/data/}:/data/data
- ./hyrax:/data:cached
- ${CRC_FOLDER_IMPORT_PATH}:/rub-test-data
- downloads:${DOWNLOAD_PATH}
- downloads:/shared/downloads
workers:
<<: *app
......@@ -156,7 +156,7 @@ services:
- ${HOST_APP_DATA_PATH:-/data/}:/data/data
- ./hyrax:/data:cached
- ${CRC_FOLDER_IMPORT_PATH}:/rub-test-data
- downloads:${DOWNLOAD_PATH}
- downloads:/shared/downloads
redis:
image: redis:6
......
......@@ -93,7 +93,7 @@ services:
DERIVATIVES_PATH: ${DERIVATIVES_PATH}
CACHE_PATH: ${CACHE_PATH}
FITS_VERSION: ${FITS_VERSION}
DOWNLOAD_PATH: ${DOWNLOAD_PATH}
DOWNLOAD_PATH: "/shared/downloads"
env_file:
- .env
volumes:
......@@ -101,7 +101,7 @@ services:
- ${DOCKER_VOLUMES_PATH_PREFIX}derivatives:${DERIVATIVES_PATH}
- ${DOCKER_VOLUMES_PATH_PREFIX}cache:${CACHE_PATH}
- ${CRC_FOLDER_IMPORT_PATH}:/rub-test-data
- ${DOCKER_VOLUMES_PATH_PREFIX}downloads:${DOWNLOAD_PATH}
- ${DOCKER_VOLUMES_PATH_PREFIX}downloads:/shared/downloads
networks:
internal:
......
......@@ -49,15 +49,15 @@ module DownloadHelper
end
def base_download_dir
File.join(ENV.fetch('DOWNLOAD_PATH', 'tmp/downloads'), work.id)
File.join(Rails.configuration.download_path, work.id)
end
def zip_file_path
File.join(ENV.fetch('DOWNLOAD_PATH', "tmp/downloads"), "#{work.id}.zip")
File.join(Rails.configuration.download_path, "#{work.id}.zip")
end
def shell_file_path
File.join(ENV.fetch('DOWNLOAD_PATH', "tmp/downloads"), "#{work.id}.sh")
File.join(Rails.configuration.download_path, "#{work.id}.sh")
end
def cleanup_path(file_path)
......
......@@ -23,7 +23,7 @@ module SearchDownloadHelper
end
def shell_file_path
@shell_file_path ||= File.join(ENV.fetch('DOWNLOAD_PATH', "tmp/downloads"), "users/#{shell_file_name}")
@shell_file_path ||= File.join(Rails.configuration.download_path, "users/#{shell_file_name}")
end
def shell_file_name
......
......@@ -27,5 +27,6 @@ module RDMS
config.i18n.fallbacks = [:en]
config.action_dispatch.default_headers['Referrer-Policy'] = 'strict-origin-when-cross-origin'
config.download_path = "/shared/downloads"
end
end
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment