Skip to content

Commit

Permalink
Merge pull request #39 from ochan1/website-fixes
Browse files Browse the repository at this point in the history
Website fixes - on OCF fixes for static and hosts
  • Loading branch information
ochan1 authored Aug 31, 2022
2 parents 4c71222 + 992954b commit a262e7e
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
9 changes: 3 additions & 6 deletions settings/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -139,12 +139,9 @@
STATIC_URL = '/static/'

# Additional locations of static files
# STATICFILES_DIRS = (
# # Put strings here, like "/home/html/static" or "C:/www/django/static".
# # Always use forward slashes, even on Windows.
# # Don't forget to use absolute paths, not relative paths.
# os.path.join(WORKSPACE_DJANGO_ROOT, 'static/'),
# )
STATICFILES_DIRS = [
os.path.join(WORKSPACE_DJANGO_ROOT, "static"),
]

# List of finder classes that know how to find static files in
# various locations.
Expand Down
4 changes: 3 additions & 1 deletion settings/production.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,9 @@
INDREL_SPAM_TO = 'spam@' + HOSTNAME

ALLOWED_HOSTS = [
'localhost', 'tbp-dev.apphost.ocf.berkeley.edu'
'tbp.apphost.ocf.berkeley.edu',
'tbp-dev.apphost.ocf.berkeley.edu',
'tbp.berkeley.edu'
]

# Static files (CSS, JavaScript, Images)
Expand Down

0 comments on commit a262e7e

Please sign in to comment.