Merge branch 'master' into master

cyverse · Jun 16, 2020 · 0cfa9d6 · 0cfa9d6
2 parents 2b3d74f + d95d397
commit 0cfa9d6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -23,6 +23,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 ### Security
   - <in case of vulnerabilities>
 -->
+
 ## [Unreleased](https://github.com/cyverse/atmosphere/compare/v36-9...HEAD) - YYYY-MM-DD
 
 ## [v36-9](https://github.com/cyverse/atmosphere/compare/v36-8...v36-9) - 2020-06-16

diff --git a/docker/uwsgi.ini b/docker/uwsgi.ini
@@ -4,7 +4,7 @@ chdir = /opt/dev/atmosphere
 home = /opt/env/atmosphere
 module = atmosphere.wsgi
 env = DJANGO_SETTINGS_MODULE=atmosphere.settings
-socket = 0.0.0.0:8000
+socket = atmosphere:8000
 processes = 24
 uid = www-data
 gid = www-data