Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
workspaces
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ssa
workspaces
Commits
bc60ae0c
Commit
bc60ae0c
authored
3 years ago
by
Daniel Lyons
Committed by
Daniel Lyons
3 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Configure the local environment so that files wind up in /var/www and are served properly by nginx
parent
73bd43c5
No related branches found
No related tags found
1 merge request
!176
Delivery rework
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
apps/web/ws-nginx.local.conf
+2
-2
2 additions, 2 deletions
apps/web/ws-nginx.local.conf
docker-compose.yml
+2
-0
2 additions, 0 deletions
docker-compose.yml
docker.properties
+2
-1
2 additions, 1 deletion
docker.properties
with
6 additions
and
3 deletions
apps/web/ws-nginx.local.conf
+
2
−
2
View file @
bc60ae0c
...
...
@@ -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
}
This diff is collapsed.
Click to expand it.
docker-compose.yml
+
2
−
0
View file @
bc60ae0c
...
...
@@ -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
:
...
...
This diff is collapsed.
Click to expand it.
docker.properties
+
2
−
1
View file @
bc60ae0c
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment