diff --git a/apps/web/ws-nginx.local.conf b/apps/web/ws-nginx.local.conf index 05c4f3edbc6a0d0f2a9e4e71f5880a7cb4b9342f..fe2bce14d9b34fdde61b603cf0f72217c219d61c 100644 --- a/apps/web/ws-nginx.local.conf +++ b/apps/web/ws-nginx.local.conf @@ -20,10 +20,10 @@ server { } location ~ ^/dl/(?:(.*))/(?:(.*)) { - alias /tmp/workspaces_tmp/$1/$2; + alias /var/www/$1/$2; autoindex on; autoindex_exact_size off; autoindex_format html; autoindex_localtime on; } -} \ No newline at end of file +} diff --git a/docker-compose.yml b/docker-compose.yml index 37bb75a8731d9153e96ba1452523395a0d5e8197..a62adda7b2c643407de13a2b08127c5f3c5439c4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,6 +11,7 @@ services: volumes: - ./apps/web/ws-nginx.local.conf:/etc/nginx/conf.d/default.conf - ./tmp/:/tmp/workspaces_tmp + - ./delivery_root:/var/www db: image: marconi.aoc.nrao.edu/ops/ci/db:workspaces restart: always @@ -50,6 +51,7 @@ services: - ./apps:/packages/apps - ./testing:/packages/testing - ./tmp/:/tmp/workspaces_tmp + - ./delivery_root:/var/www capability: build: diff --git a/docker.properties b/docker.properties index 2fdd1798fb4bc862bd6eb4981208a99daf29a8ac..2cf9667e0a62725055cac85ba3721d104e52d21a 100644 --- a/docker.properties +++ b/docker.properties @@ -23,7 +23,8 @@ edu.nrao.archive.workspaces.ProcessingSettings.useCondor = false # # Delivery settings # -edu.nrao.archive.workflow.config.DeliverySettings.nraoDownloadDirectory = /root/downloads +edu.nrao.archive.workflow.config.DeliverySettings.nraoDownloadDirectory = /var/www +edu.nrao.archive.workflow.config.DeliverySettings.nraoDownloadUrl = http://localhost:4444/dl # # Data fetcher settings